[webbeans-commits] Webbeans SVN: r2926 - in ri/trunk/spi/src/main/java/org/jboss/webbeans: ejb/spi and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-29 10:09:05 -0400 (Mon, 29 Jun 2009)
New Revision: 2926
Added:
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/BeanDeploymentArchive.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EJBModule.java
Modified:
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/WebBeanDiscovery.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/BusinessInterfaceDescriptor.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbDescriptor.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwadingBusinessInterfaceDescriptor.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java
Log:
Add BeanDeploymentArchive SPI
Added: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/BeanDeploymentArchive.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/BeanDeploymentArchive.java (rev 0)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/BeanDeploymentArchive.java 2009-06-29 14:09:05 UTC (rev 2926)
@@ -0,0 +1,68 @@
+/*
+ * 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.bootstrap.spi;
+
+import java.net.URL;
+import java.util.List;
+
+/**
+ * Represents a CDI bean deployment archive.
+ *
+ * A bean deployment archive is any library jar, EJB jar or rar archive with a
+ * META-INF/beans.xml file, any WEB-INF/classes directory in war with a
+ * WEB-INF/beans.xml, or any directory in the classpath with a
+ * META-INF/beans.xml.
+ *
+ * For an application deployed as an ear, all library jars, EJB jars, rars and
+ * war WEB-INF/classes directories should be searched.
+ *
+ * For an application deployed as a war, all library jars and the
+ * WEB-INF/classes directory should be searched.
+ *
+ * @see
+ *
+ * @author Pete Muir
+ *
+ */
+public interface BeanDeploymentArchive
+{
+
+ /**
+ * Get the ordered transitive closure of modules which are accessible to this
+ * module. The order will be used both in bean discovery and resolution.
+ *
+ * Circular dependencies will be detected and ignored by the container
+ *
+ * @return the ordered transitive closure
+ */
+ public List<BeanDeploymentArchive> getBeanDeploymentArchiveClosure();
+
+ /**
+ * Gets all classes in the bean deployment archive
+ *
+ * @return an iteration over the classes
+ */
+ public Iterable<Class<?>> getBeanClasses();
+
+ /**
+ * Get the deployment descriptor
+ *
+ * @return a URL pointing to the deployment descriptor
+ */
+ public URL getBeansXml();
+
+}
Property changes on: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/BeanDeploymentArchive.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/WebBeanDiscovery.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/WebBeanDiscovery.java 2009-06-29 11:35:57 UTC (rev 2925)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/WebBeanDiscovery.java 2009-06-29 14:09:05 UTC (rev 2926)
@@ -26,8 +26,10 @@
* discover the beans to deploy
*
* @author Pete Muir
+ * @deprecated now encapsulated by {@link BeanDeploymentArchive}
*
*/
+@Deprecated
public interface WebBeanDiscovery extends Service
{
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/BusinessInterfaceDescriptor.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/BusinessInterfaceDescriptor.java 2009-06-29 11:35:57 UTC (rev 2925)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/BusinessInterfaceDescriptor.java 2009-06-29 14:09:05 UTC (rev 2926)
@@ -31,12 +31,5 @@
* Gets the business interface class
*/
public Class<T> getInterface();
-
- /**
- * Gets the JNDI name under which the EJB is registered
- *
- * @return The JNDI name
- */
- public String getJndiName();
}
\ No newline at end of file
Added: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EJBModule.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EJBModule.java (rev 0)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EJBModule.java 2009-06-29 14:09:05 UTC (rev 2926)
@@ -0,0 +1,42 @@
+/*
+ * 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.ejb.spi;
+
+import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
+
+/**
+ * Represents an EJB bean deployment archive.
+ *
+ * If a bean deployment archive is identified as an EJB bean deployment, an
+ * instance of {@link EJBModule} should be returned instead of
+ * {@link BeanDeploymentArchive}; the Java EE container is responsible for
+ * identifying EJB bean deployment archives.
+ *
+ * @author Pete Muir
+ *
+ */
+public interface EJBModule extends BeanDeploymentArchive
+{
+
+ /**
+ * Get all the EJBs in the deployment archive
+ *
+ * @return
+ */
+ public Iterable<EjbDescriptor<?>> getEjbs();
+
+}
Property changes on: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EJBModule.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbDescriptor.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbDescriptor.java 2009-06-29 11:35:57 UTC (rev 2925)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbDescriptor.java 2009-06-29 14:09:05 UTC (rev 2926)
@@ -35,7 +35,7 @@
*
* @return The EJB Bean class
*/
- public Class<T> getType();
+ public Class<T> getBeanClass();
/**
* Gets the local business interfaces of the EJB
@@ -45,13 +45,6 @@
public Iterable<BusinessInterfaceDescriptor<?>> getLocalBusinessInterfaces();
/**
- * Gets the remote business interfaces of the EJB
- *
- * @return An iterator over the remote business interfaces
- */
- public Iterable<BusinessInterfaceDescriptor<?>> getRemoteBusinessInterfaces();
-
- /**
* Get the remove methods of the EJB
*
* @return An iterator over the remove methods
@@ -59,38 +52,31 @@
public Iterable<Method> getRemoveMethods();
/**
- * Indicates if the bean is stateless
+ * Indicates if the bean is a stateless session bean
*
* @return True if stateless, false otherwise
*/
public boolean isStateless();
/**
- * Indicates if the bean is a EJB 3.1 Singleton
+ * Indicates if the bean is a EJB 3.1 Singleton session bean
*
* @return True if the bean is a singleton, false otherwise
*/
public boolean isSingleton();
/**
- * Indicates if the EJB is stateful
+ * Indicates if the EJB is a stateful session bean
*
* @return True if the bean is stateful, false otherwise
*/
public boolean isStateful();
/**
- * Indicates if the EJB is and MDB
+ * Indicates if the EJB is an MDB
*
* @return True if the bean is an MDB, false otherwise
*/
public boolean isMessageDriven();
-
- /**
- * Gets the EJB name
- *
- * @return The name
- */
- public String getEjbName();
}
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java 2009-06-29 11:35:57 UTC (rev 2925)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java 2009-06-29 14:09:05 UTC (rev 2926)
@@ -74,8 +74,10 @@
/**
* Gets a descriptor for each EJB in the application
*
+ * @deprecated an {@link EJBModule} should be used to represent all EJBs
* @return the EJB descriptors
*/
+ @Deprecated
public Iterable<EjbDescriptor<?>> discoverEjbs();
}
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwadingBusinessInterfaceDescriptor.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwadingBusinessInterfaceDescriptor.java 2009-06-29 11:35:57 UTC (rev 2925)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwadingBusinessInterfaceDescriptor.java 2009-06-29 14:09:05 UTC (rev 2926)
@@ -23,11 +23,6 @@
return delegate().getInterface();
}
- public String getJndiName()
- {
- return delegate().getJndiName();
- }
-
@Override
public boolean equals(Object obj)
{
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java 2009-06-29 11:35:57 UTC (rev 2925)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java 2009-06-29 14:09:05 UTC (rev 2926)
@@ -20,31 +20,20 @@
{
protected abstract EjbDescriptor<T> delegate();
-
-
- public String getEjbName()
- {
- return delegate().getEjbName();
- }
-
+
public Iterable<BusinessInterfaceDescriptor<?>> getLocalBusinessInterfaces()
{
return delegate().getLocalBusinessInterfaces();
}
- public Iterable<BusinessInterfaceDescriptor<?>> getRemoteBusinessInterfaces()
- {
- return delegate().getRemoteBusinessInterfaces();
- }
-
public Iterable<Method> getRemoveMethods()
{
return delegate().getRemoveMethods();
}
- public Class<T> getType()
+ public Class<T> getBeanClass()
{
- return delegate().getType();
+ return delegate().getBeanClass();
}
public boolean isMessageDriven()
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2925 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation: disposal/method/definition and 31 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-06-29 07:35:57 -0400 (Mon, 29 Jun 2009)
New Revision: 2925
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/Spider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/Spider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/Spider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/Spider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingType_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/WrappedEnterpriseBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/Husky_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/Greyhound_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/DachshundLocal_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/Dachshund_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/BoxerLocal_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/Boxer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/BeagleLocal_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/Beagle_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/BullmastiffLocal_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/Bullmastiff_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ChickenHutch.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/DangerCall.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/FunnelWeaver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/Spider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/Spider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/Spider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/Spider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingType_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/WrappedEnterpriseBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/Husky_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/Greyhound_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/DachshundLocal_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/Dachshund_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/BoxerLocal_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/Boxer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/BeagleLocal_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/Beagle_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/BullmastiffLocal_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/Bullmastiff_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ChickenHutch.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/DangerCall.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/jms/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/FunnelWeaver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/Apple.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/AppleTree.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/AppleTreeLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/Cat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/Spider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
Log:
Additional implementation test aligned with the 20090519 version of the spec
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken3;
-
-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 AnotherDeploymentType
-{
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/AnotherDeploymentType.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed;
+
+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 AnotherDeploymentType
+{
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,27 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken3;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.testng.annotations.Test;
-
-/**
- * Spec version: 20090519
- */
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-@BeansXml("beans.xml")
-public class InitializerUnallowedDefinitionTest extends AbstractJSR299Test
-{
- @Test
- @SpecAssertion(section = "3.4.7", id = "da")
- public void testInitializerUnallowed()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,27 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * Spec version: 20090519
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+@BeansXml("beans.xml")
+public class InitializerUnallowedDefinitionTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertion(section = "3.4.7", id = "da")
+ public void testInitializerUnallowed()
+ {
+ assert false;
+ }
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/Spider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/Spider.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/Spider.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,5 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken3;
-
-class Spider
-{
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/Spider.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/Spider.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/Spider.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/Spider.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed;
+
+class Spider
+{
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,22 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken3;
-
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Initializer;
-import javax.enterprise.inject.Produces;
-
-@AnotherDeploymentType
-class SpiderProducer_Broken
-{
-
- @Produces
- public static Spider getSpider()
- {
- return new Spider();
- }
-
- @Initializer
- public static void destorySpider(@Disposes Spider spider)
- {
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed;
+
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Produces;
+
+@AnotherDeploymentType
+class SpiderProducer_Broken
+{
+
+ @Produces
+ public static Spider getSpider()
+ {
+ return new Spider();
+ }
+
+ @Initializer
+ public static void destorySpider(@Disposes Spider spider)
+ {
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/Apple.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/Apple.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/Apple.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6;
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.methodOnSessionBean;
class Apple
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/AppleTree.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/AppleTree.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6;
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.methodOnSessionBean;
import javax.ejb.Stateless;
import javax.enterprise.inject.Disposes;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/AppleTreeLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTreeLocal.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/AppleTreeLocal.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6;
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.methodOnSessionBean;
import javax.ejb.Local;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6;
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.methodOnSessionBean;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/AnotherDeploymentType.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken1;
-
-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 AnotherDeploymentType
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/AnotherDeploymentType.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/AnotherDeploymentType.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.multiParams;
+
+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 AnotherDeploymentType
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,31 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken1;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.hibernate.tck.annotations.SpecAssertions;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.testng.annotations.Test;
-
-/**
- * Spec version: 20090519
- */
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-@BeansXml("beans.xml")
-public class MultipleDisposeParametersDefinitionTest extends AbstractJSR299Test
-{
- @Test
- @SpecAssertions({
- @SpecAssertion(section = "3.4.6", id = "a"),
- @SpecAssertion(section = "3.4.7", id = "ba")
- })
- public void testMultipleDisposeParameters()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,31 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.multiParams;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * Spec version: 20090519
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+@BeansXml("beans.xml")
+public class MultipleDisposeParametersDefinitionTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4.6", id = "a"),
+ @SpecAssertion(section = "3.4.7", id = "ba")
+ })
+ public void testMultipleDisposeParameters()
+ {
+ assert false;
+ }
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/Spider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/Spider.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/Spider.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,5 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken1;
-
-class Spider
-{
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/Spider.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/Spider.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/Spider.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/Spider.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.multiParams;
+
+class Spider
+{
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,18 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken1;
-
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-
-@AnotherDeploymentType
-class SpiderProducer_Broken
-{
- @Produces
- public static Spider getSpider()
- {
- return new Spider();
- }
-
- public static void destorySpider(@Disposes Spider spider, @Disposes Spider another)
- {
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,18 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.multiParams;
+
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+
+@AnotherDeploymentType
+class SpiderProducer_Broken
+{
+ @Produces
+ public static Spider getSpider()
+ {
+ return new Spider();
+ }
+
+ public static void destorySpider(@Disposes Spider spider, @Disposes Spider another)
+ {
+ }
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/AnotherDeploymentType.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4;
-
-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 AnotherDeploymentType
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/AnotherDeploymentType.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/AnotherDeploymentType.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed;
+
+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 AnotherDeploymentType
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,26 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.testng.annotations.Test;
-
-/**
- * Spec version: 20090519
- */
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-@BeansXml("beans.xml")
-public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test
-{
- @Test
- @SpecAssertion(section = "3.4.7", id = "ea")
- public void testObserverParameterUnallowed()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * Spec version: 20090519
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+@BeansXml("beans.xml")
+public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertion(section = "3.4.7", id = "ea")
+ public void testObserverParameterUnallowed()
+ {
+ assert false;
+ }
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/Spider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/Spider.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/Spider.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,5 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4;
-
-class Spider
-{
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/Spider.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/Spider.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/Spider.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/Spider.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed;
+
+class Spider
+{
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-
-@AnotherDeploymentType
-class SpiderProducer_Broken
-{
-
- @Produces
- public static Spider getSpider()
- {
- return new Spider();
- }
-
- public static void destorySpider(@Disposes @Observes Spider spider)
- {
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/SpiderProducer_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+
+@AnotherDeploymentType
+class SpiderProducer_Broken
+{
+
+ @Produces
+ public static Spider getSpider()
+ {
+ return new Spider();
+ }
+
+ public static void destorySpider(@Disposes @Observes Spider spider)
+ {
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/AnotherDeploymentType.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken2;
-
-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 AnotherDeploymentType
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/AnotherDeploymentType.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/AnotherDeploymentType.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed;
+
+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 AnotherDeploymentType
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,25 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken2;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-/**
- * Spec version: 20090519
- */
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-public class ProducesUnallowedDefinitionTest extends AbstractJSR299Test
-{
- @Test
- @SpecAssertion(section = "3.4.7", id = "ca")
- public void testProducesUnallowed()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,25 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Spec version: 20090519
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+public class ProducesUnallowedDefinitionTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertion(section = "3.4.7", id = "ca")
+ public void testProducesUnallowed()
+ {
+ assert false;
+ }
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/Spider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/Spider.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/Spider.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,5 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken2;
-
-class Spider
-{
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/Spider.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/Spider.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/Spider.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/Spider.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed;
+
+class Spider
+{
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken2;
-
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-
-@AnotherDeploymentType
-class SpiderProducer_Broken
-{
- @Produces
- public static Spider getSpider()
- {
- return new Spider();
- }
-
- @Produces
- public static void destorySpider(@Disposes Spider spider)
- {
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed;
+
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+
+@AnotherDeploymentType
+class SpiderProducer_Broken
+{
+ @Produces
+ public static Spider getSpider()
+ {
+ return new Spider();
+ }
+
+ @Produces
+ public static void destorySpider(@Disposes Spider spider)
+ {
+ }
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/AnotherDeploymentType.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/AnotherDeploymentType.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5;
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod;
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/implementation/disposal/method/definition/broken/unresolvedMethod/Cat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Cat.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/Cat.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5;
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod;
class Cat
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/Spider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Spider.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/Spider.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5;
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod;
class Spider
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5;
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5;
+package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,31 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.newAndOtherBinding;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-public class NewAndOtherBindingTest extends AbstractJSR299Test
-{
-
-
- /**
- * If the @New binding type appears in conjunction with some other binding
- * type, or is specified for a field or parameter of a type which does not
- * satisfy the definition of a simple Web Bean implementation class or
- * enterprise Web Bean implementation class, a DefinitionException is thrown
- * by the container at deployment time.
- */
- @Test(groups = { "new" })
- @SpecAssertion(section = "review", id = "review")
- public void testNewAnnotationCannotAppearInConjunctionWithOtherBindingType()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,32 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.newAndOtherBinding;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+public class NewAndOtherBindingTest extends AbstractJSR299Test
+{
+
+
+ /**
+ * If the @New binding type appears in conjunction with some other binding
+ * type, or is specified for a field or parameter of a type which does not
+ * satisfy the definition of a simple Web Bean implementation class or
+ * enterprise Web Bean implementation class, a DefinitionException is thrown
+ * by the container at deployment time.
+ */
+ @Test(groups = { "new", "stub" })
+ //Remove from stub group if this test must be executed; otherwise, we should not be running it
+ @SpecAssertion(section = "review", id = "review")
+ public void testNewAnnotationCannotAppearInConjunctionWithOtherBindingType()
+ {
+ assert false;
+ }
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingType_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingType_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.newAndOtherBinding;
-
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.New;
-
-class NewAndOtherBindingType_Broken
-{
- public @New @Current WrappedEnterpriseBean violation;
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingType_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingType_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/NewAndOtherBindingType_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.newAndOtherBinding;
+
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.New;
+
+class NewAndOtherBindingType_Broken
+{
+ public @New @Current WrappedEnterpriseBean violation;
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/WrappedEnterpriseBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/WrappedEnterpriseBean.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,16 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.newAndOtherBinding;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Named;
-
-@SessionScoped
-@Stateful
-@Named("John")
-class WrappedEnterpriseBean
-{
- @Remove
- public void bye() {
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/WrappedEnterpriseBean.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/WrappedEnterpriseBean.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/WrappedEnterpriseBean.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.newAndOtherBinding;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Named;
+
+@SessionScoped
+@Stateful
+@Named("John")
+class WrappedEnterpriseBean
+{
+ @Remove
+ public void bye() {
+ }
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/Husky_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/Husky_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithConversationScope;
-
-import javax.enterprise.context.ConversationScoped;
-
-
-//@Singleton
-@ConversationScoped
-class Husky_Broken
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/Husky_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/Husky_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/Husky_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithConversationScope;
+
+import javax.ejb.Singleton;
+import javax.enterprise.context.ConversationScoped;
+
+
+@Singleton
+@ConversationScoped
+class Husky_Broken
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,27 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithConversationScope;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.testng.annotations.Test;
-
-(a)ExpectedDeploymentException(DefinitionError.class)
-@Artifact
-(a)Packaging(PackagingType.EAR)
-public class SingletonWithConversationScopeTest extends AbstractJSR299Test
-{
-
-
- @Test(groups = { "enterpriseBeans" })
- @SpecAssertion(section = "3.3", id = "d")
- public void testSingletonWithConversationScopeFails()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,31 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithConversationScope;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: 20090519
+ */
+(a)ExpectedDeploymentException(DefinitionError.class)
+@Artifact
+(a)Packaging(PackagingType.EAR)
+public class SingletonWithConversationScopeTest extends AbstractJSR299Test
+{
+
+
+ @Test(groups = { "enterpriseBeans" })
+ @SpecAssertion(section = "3.3", id = "da")
+ public void testSingletonWithConversationScopeFails()
+ {
+ assert false;
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/Greyhound_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/Greyhound_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithRequestScope;
-
-import javax.ejb.Singleton;
-import javax.enterprise.context.RequestScoped;
-
-@Singleton
-@RequestScoped
-class Greyhound_Broken
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/Greyhound_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/Greyhound_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/Greyhound_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithRequestScope;
+
+import javax.ejb.Singleton;
+import javax.enterprise.context.RequestScoped;
+
+@Singleton
+@RequestScoped
+class Greyhound_Broken
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,27 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithRequestScope;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-(a)Packaging(PackagingType.EAR)
-public class SingletonWithRequestScopeTest extends AbstractJSR299Test
-{
-
-
- @Test(groups = { "enterpriseBeans", "stub" })
- @SpecAssertion(section = "3.3", id = "d")
- public void testSingletonWithRequestScopeFails()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,31 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithRequestScope;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: 20090519
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+(a)Packaging(PackagingType.EAR)
+public class SingletonWithRequestScopeTest extends AbstractJSR299Test
+{
+
+
+ @Test(groups = { "enterpriseBeans" })
+ @SpecAssertion(section = "3.3", id = "da")
+ public void testSingletonWithRequestScopeFails()
+ {
+ assert false;
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,13 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithSessionScope;
-
-import java.io.Serializable;
-
-import javax.ejb.Singleton;
-import javax.enterprise.context.SessionScoped;
-
-@Singleton
-@SessionScoped
-class IrishTerrier_Broken implements Serializable
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,13 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithSessionScope;
+
+import java.io.Serializable;
+
+import javax.ejb.Singleton;
+import javax.enterprise.context.SessionScoped;
+
+@Singleton
+@SessionScoped
+class IrishTerrier_Broken implements Serializable
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,26 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithSessionScope;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-(a)Packaging(PackagingType.EAR)
-public class SingletonWithSessionScopeTest extends AbstractJSR299Test
-{
-
- @Test(groups = { "enterpriseBeans", "stub" })
- @SpecAssertion(section = "3.3", id = "d")
- public void testSingletonWithSessionScopeFails()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,30 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithSessionScope;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: 20090519
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+(a)Packaging(PackagingType.EAR)
+public class SingletonWithSessionScopeTest extends AbstractJSR299Test
+{
+
+ @Test(groups = { "enterpriseBeans" })
+ @SpecAssertion(section = "3.3", id = "da")
+ public void testSingletonWithSessionScopeFails()
+ {
+ assert false;
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/DachshundLocal_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/DachshundLocal_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/DachshundLocal_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithApplicationScope;
-
-import javax.ejb.Local;
-
-@Local
-public interface DachshundLocal_Broken
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/DachshundLocal_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/DachshundLocal_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/DachshundLocal_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/DachshundLocal_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithApplicationScope;
+
+import javax.ejb.Local;
+
+@Local
+public interface DachshundLocal_Broken
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/Dachshund_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/Dachshund_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithApplicationScope;
-
-import javax.ejb.Stateless;
-import javax.enterprise.context.ApplicationScoped;
-
-@Stateless
-@ApplicationScoped
-class Dachshund_Broken implements DachshundLocal_Broken
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/Dachshund_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/Dachshund_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/Dachshund_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithApplicationScope;
+
+import javax.ejb.Stateless;
+import javax.enterprise.context.ApplicationScoped;
+
+@Stateless
+@ApplicationScoped
+class Dachshund_Broken implements DachshundLocal_Broken
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,27 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithApplicationScope;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-(a)Packaging(PackagingType.EAR)
-public class StatelessWithApplicationScopeTest extends AbstractJSR299Test
-{
-
- @Test(groups = { "enterpriseBeans" })
- @SpecAssertion(section = "3.3", id = "d")
- public void testStatelessWithSessionScopeFails()
- {
- assert false;
- }
-
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,31 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithApplicationScope;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: 20090519
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+(a)Packaging(PackagingType.EAR)
+public class StatelessWithApplicationScopeTest extends AbstractJSR299Test
+{
+
+ @Test(groups = { "enterpriseBeans" })
+ @SpecAssertion(section = "3.3", id = "da")
+ public void testStatelessWithSessionScopeFails()
+ {
+ assert false;
+ }
+
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/BoxerLocal_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/BoxerLocal_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/BoxerLocal_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithConversationScope;
-
-import javax.ejb.Local;
-
-@Local
-public interface BoxerLocal_Broken
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/BoxerLocal_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/BoxerLocal_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/BoxerLocal_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/BoxerLocal_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithConversationScope;
+
+import javax.ejb.Local;
+
+@Local
+public interface BoxerLocal_Broken
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/Boxer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/Boxer_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithConversationScope;
-
-import javax.ejb.Stateless;
-import javax.enterprise.context.ConversationScoped;
-
-@Stateless
-@ConversationScoped
-class Boxer_Broken implements BoxerLocal_Broken
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/Boxer_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/Boxer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/Boxer_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithConversationScope;
+
+import javax.ejb.Stateless;
+import javax.enterprise.context.ConversationScoped;
+
+@Stateless
+@ConversationScoped
+class Boxer_Broken implements BoxerLocal_Broken
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,27 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithConversationScope;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-(a)Packaging(PackagingType.EAR)
-public class StatelessWithConversationScopeTest extends AbstractJSR299Test
-{
-
-
- @Test(groups = { "enterpriseBeans" })
- @SpecAssertion(section = "3.3", id = "d")
- public void testStatelessWithConversationScopeFails()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,31 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithConversationScope;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: 20090519
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+(a)Packaging(PackagingType.EAR)
+public class StatelessWithConversationScopeTest extends AbstractJSR299Test
+{
+
+
+ @Test(groups = { "enterpriseBeans" })
+ @SpecAssertion(section = "3.3", id = "da")
+ public void testStatelessWithConversationScopeFails()
+ {
+ assert false;
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/BeagleLocal_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/BeagleLocal_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/BeagleLocal_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithRequestScope;
-
-import javax.ejb.Local;
-
-@Local
-public interface BeagleLocal_Broken
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/BeagleLocal_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/BeagleLocal_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/BeagleLocal_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/BeagleLocal_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithRequestScope;
+
+import javax.ejb.Local;
+
+@Local
+public interface BeagleLocal_Broken
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/Beagle_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/Beagle_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithRequestScope;
-
-import javax.ejb.Stateless;
-import javax.enterprise.context.RequestScoped;
-
-@Stateless
-@RequestScoped
-class Beagle_Broken implements BeagleLocal_Broken
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/Beagle_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/Beagle_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/Beagle_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithRequestScope;
+
+import javax.ejb.Stateless;
+import javax.enterprise.context.RequestScoped;
+
+@Stateless
+@RequestScoped
+class Beagle_Broken implements BeagleLocal_Broken
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,27 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithRequestScope;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-(a)Packaging(PackagingType.EAR)
-public class StatelessWithRequestScopeTest extends AbstractJSR299Test
-{
-
-
- @Test(groups = { "enterpriseBeans" })
- @SpecAssertion(section = "3.3", id = "d")
- public void testStatelessWithRequestScopeFails()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,31 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithRequestScope;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: 20090519
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+(a)Packaging(PackagingType.EAR)
+public class StatelessWithRequestScopeTest extends AbstractJSR299Test
+{
+
+
+ @Test(groups = { "enterpriseBeans" })
+ @SpecAssertion(section = "3.3", id = "da")
+ public void testStatelessWithRequestScopeFails()
+ {
+ assert false;
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/BullmastiffLocal_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/BullmastiffLocal_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/BullmastiffLocal_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithSessionScope;
-
-import javax.ejb.Local;
-
-@Local
-public interface BullmastiffLocal_Broken
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/BullmastiffLocal_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/BullmastiffLocal_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/BullmastiffLocal_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/BullmastiffLocal_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithSessionScope;
+
+import javax.ejb.Local;
+
+@Local
+public interface BullmastiffLocal_Broken
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/Bullmastiff_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/Bullmastiff_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithSessionScope;
-
-import javax.ejb.Stateless;
-import javax.enterprise.context.SessionScoped;
-
-@Stateless
-@SessionScoped
-class Bullmastiff_Broken implements BullmastiffLocal_Broken
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/Bullmastiff_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/Bullmastiff_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/Bullmastiff_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithSessionScope;
+
+import javax.ejb.Stateless;
+import javax.enterprise.context.SessionScoped;
+
+@Stateless
+@SessionScoped
+class Bullmastiff_Broken implements BullmastiffLocal_Broken
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,27 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithSessionScope;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-(a)Packaging(PackagingType.EAR)
-public class StatelessWithSessionScopeTest extends AbstractJSR299Test
-{
-
- @Test(groups = { "enterpriseBeans" })
- @SpecAssertion(section = "3.3", id = "d")
- public void testStatelessWithSessionScopeFails()
- {
- assert false;
- }
-
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,31 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithSessionScope;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: 20090519
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+(a)Packaging(PackagingType.EAR)
+public class StatelessWithSessionScopeTest extends AbstractJSR299Test
+{
+
+ @Test(groups = { "enterpriseBeans" })
+ @SpecAssertion(section = "3.3", id = "da")
+ public void testStatelessWithSessionScopeFails()
+ {
+ assert false;
+ }
+
+
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -19,7 +19,7 @@
/**
* @author Nicklas Karlsson
*
- * Spec version: PRD2
+ * Spec version: 20090519
*/
@Artifact
@Packaging(PackagingType.EAR)
@@ -51,8 +51,8 @@
@Test(groups = { "enterpriseBeans" })
@SpecAssertions( {
@SpecAssertion(section = "3.2.1", id = "f"),
- @SpecAssertion(section = "3.3.3", id = "a"),
- @SpecAssertion(section = "3.3.4", id = "c") } )
+ @SpecAssertion(section = "3.3.2", id = "aa"),
+ @SpecAssertion(section = "3.3.3", id = "c") } )
public void testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces()
{
Bean<DogLocal> dogBean = getBeans(DogLocal.class).iterator().next();
@@ -67,7 +67,7 @@
* superclasses.
*/
@Test(groups = { "ejb 3.1", "ri-broken" })
- @SpecAssertion(section = "3.3.3", id = "b")
+ @SpecAssertion(section = "3.3.2", id = "ba")
public void testEnterpriseBeanWithLocalViewAndNotParameterizedTypeHasClassAndSuperclassesAsBeanTypes()
{
//TODO We need a 3.1 compliant container for this test
@@ -77,8 +77,8 @@
@Test(groups = "enterpriseBeans")
@SpecAssertions({
- @SpecAssertion(section = "3.3.3", id = "c"),
- @SpecAssertion(section = "3.3.4", id = "a"),
+ @SpecAssertion(section = "3.3.2", id = "c"),
+ @SpecAssertion(section = "3.3.3", id = "a"),
@SpecAssertion(section = "2.2", id = "l")
})
public void testObjectIsInAPITypes()
@@ -88,7 +88,7 @@
}
@Test(groups = { "enterpriseBeans" })
- @SpecAssertion(section = "3.3.3", id = "d")
+ @SpecAssertion(section = "3.3.2", id = "d")
public void testRemoteInterfacesAreNotInAPITypes()
{
Bean<DogLocal> dogBean = getBeans(DogLocal.class).iterator().next();
@@ -96,7 +96,7 @@
}
@Test(groups = "enterpriseBeans")
- @SpecAssertion(section = "3.3.4", id = "ba")
+ @SpecAssertion(section = "3.3.3", id = "ba")
public void testBeanWithScopeAnnotation()
{
Bean<LionLocal> lionBean = getBeans(LionLocal.class).iterator().next();
@@ -104,7 +104,7 @@
}
@Test(groups = "enterpriseBeans")
- @SpecAssertion(section = "3.3.4", id = "bb")
+ @SpecAssertion(section = "3.3.3", id = "bb")
public void testBeanWithNamedAnnotation()
{
Bean<MonkeyLocal> monkeyBean = getBeans(MonkeyLocal.class).iterator().next();
@@ -112,7 +112,7 @@
}
@Test(groups = "enterpriseBeans")
- @SpecAssertion(section = "3.3.4", id = "bc")
+ @SpecAssertion(section = "3.3.3", id = "bc")
public void testBeanWithDeploymentType()
{
Bean<MonkeyLocal> monkeyBean = getBeans(MonkeyLocal.class).iterator().next();
@@ -120,7 +120,7 @@
}
@Test(groups = "enterpriseBeans")
- @SpecAssertion(section = "3.3.4", id = "bd")
+ @SpecAssertion(section = "3.3.3", id = "bd")
public void testBeanWithStereotype()
{
Bean<PolarBearLocal> polarBearBean = getBeans(PolarBearLocal.class).iterator().next();
@@ -130,7 +130,7 @@
}
@Test(groups = "enterpriseBeans")
- @SpecAssertion(section = "3.3.4", id = "be")
+ @SpecAssertion(section = "3.3.3", id = "be")
public void testBeanWithBindings()
{
Annotation tame = new AnnotationLiteral<Tame>(){};
@@ -139,7 +139,7 @@
}
@Test(groups = "enterpriseBeans")
- @SpecAssertion(section = "3.3.8", id = "a")
+ @SpecAssertion(section = "3.3.5", id = "a")
public void testDefaultName()
{
assert getBeans(PitbullLocal.class).size() == 1;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -33,6 +33,8 @@
* These tests are any that involve ejb-jar.xml resources.
*
* @author David Allen
+ *
+ * Spec version: 20090519
*/
@Artifact
@Packaging(PackagingType.EAR)
@@ -44,7 +46,7 @@
@Test(groups = { "enterpriseBeans", "ejbjarxml" })
@SpecAssertions( {
@SpecAssertion(section = "3.2.1", id = "n"),
- @SpecAssertion(section = "3.3.2", id = "b")
+ @SpecAssertion(section = "3.3.2", id = "ba")
})
public void testEjbDeclaredInXmlNotSimpleBean()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -30,7 +30,7 @@
* @author Nicklas Karlsson
* @author David Allen
*
- * Spec version: Public Release Draft 2
+ * Spec version: 20090519
*
*/
@Artifact
@@ -41,10 +41,10 @@
@Test(groups = {"enterpriseBeans", "clientProxy", "lifecycle", "integration" })
@SpecAssertions( {
- @SpecAssertion(section = "3.3.8", id = "a"),
- @SpecAssertion(section = "3.3.9", id = "a"),
- @SpecAssertion(section = "6", id = "a"),
- @SpecAssertion(section = "6.5", id = "a") })
+ @SpecAssertion(section = "3.3.5", id = "a"),
+ @SpecAssertion(section = "7.3", id = "aa"),
+ @SpecAssertion(section = "7.3", id = "bb")
+ })
public void testCreateSFSB() throws Exception
{
GrossStadt frankfurt = getInstanceByType(GrossStadt.class);
@@ -70,7 +70,7 @@
@Test(groups = { "ri-broken", "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
@SpecAssertions( {
- @SpecAssertion(section = "3.3.9", id = "b")
+ @SpecAssertion(section = "6.6.2", id = "a")
})
public void testSerializeSFSB() throws Exception
{
@@ -85,8 +85,7 @@
@Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
@SpecAssertions({
- @SpecAssertion(section = "6.5", id = "b"),
- @SpecAssertion(section = "6", id = "e")
+ @SpecAssertion(section = "7.3", id = "bc")
})
public void testDestroyRemovesSFSB() throws Exception
{
@@ -106,8 +105,8 @@
@Test(groups = { "enterpriseBeans", "lifecycle", "integration" })
@SpecAssertions({
- @SpecAssertion(section = "6.5", id = "c"),
- @SpecAssertion(section = "3.3.1", id = "db")
+ @SpecAssertion(section = "7.3", id = "bc"),
+ @SpecAssertion(section = "3.3.1", id = "dba")
})
public void testRemovedEjbIgnored()
{
@@ -123,7 +122,7 @@
}
@Test(groups = { "enterpriseBeans", "lifecycle", "integration" })
- @SpecAssertion(section = "6.6", id = "a")
+ @SpecAssertion(section = "7.4", id = "a")
public void testCreateSLSB()
{
Bean<NeueStadt> stadtBean = getBeans(NeueStadt.class).iterator().next();
@@ -138,16 +137,7 @@
}
@Test(groups = { "enterpriseBeans", "lifecycle", "integration" })
- @SpecAssertion(section = "6.11", id = "a")
- public void testFieldInjectionsOnNonContextualEjbs()
- {
- AlteStadt alteStadt = this.getCurrentConfiguration().getBeans().getEnterpriseBean(Mainz.class, AlteStadt.class);
- assert alteStadt != null : "Could not find the AlteStadt EJB";
- assert alteStadt.getPlaceOfInterest().equals(RoemerPassage.name);
- }
-
- @Test(groups = { "enterpriseBeans", "lifecycle", "integration" })
- @SpecAssertion(section = "6.11", id = "c")
+ @SpecAssertion(section = "3.9.2", id = "b")
public void testInitializerMethodsCalledWithCurrentParameterValues()
{
AlteStadt alteStadt = this.getCurrentConfiguration().getBeans().getEnterpriseBean(Mainz.class, AlteStadt.class);
@@ -155,18 +145,6 @@
assert alteStadt.getAnotherPlaceOfInterest() != null;
}
- @Test(groups = { "enterpriseBeans", "lifecycle", "ri-broken" })
- @SpecAssertion(section = "6.11", id = "f")
- public void testDependentObjectsDestroyed()
- {
- UniStadt marburg = getInstanceByType(UniStadt.class);
- assert marburg != null : "Couldn't find the main SFSB";
- Bean<UniStadt> uniStadtBean = getBeans(UniStadt.class).iterator().next();
- destroyAndRemoveBeanInstance(uniStadtBean, marburg);
- GrossStadt frankfurt = getInstanceByType(GrossStadt.class);
- assert frankfurt.isSchlossDestroyed();
- }
-
@Test
@SpecAssertion(section = "4.2", id = "bab")
public void testDirectSubClassInheritsPostConstructOnSuperclass() throws Exception
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -12,6 +12,10 @@
import org.jboss.testharness.impl.packaging.PackagingType;
import org.testng.annotations.Test;
+/**
+ *
+ * Spec version: 20090519
+ */
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
@@ -19,7 +23,7 @@
{
@Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "b")
+ @SpecAssertion(section = "3.11", id = "m")
public void testNewBeanHasSameInitializers()
{
InitializerSimpleBeanLocal bean = getInstanceByType(InitializerSimpleBeanLocal.class);
@@ -35,7 +39,7 @@
* @throws Exception
*/
@Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "j")
+ @SpecAssertion(section = "3.11", id = "v")
public void testNewBeanHasNoProducerMethods() throws Exception
{
new RunInDependentContext()
@@ -61,7 +65,7 @@
* @throws Exception
*/
@Test(groups = { "new", "ri-broken" })
- @SpecAssertion(section = "3.3.6", id = "k")
+ @SpecAssertion(section = "3.11", id = "w")
public void testNewBeanHasNoProducerFields() throws Exception
{
new RunInDependentContext()
@@ -81,7 +85,7 @@
}
@Test(groups = { "new", "ri-broken", "disposal" })
- @SpecAssertion(section = "3.3.6", id = "l")
+ @SpecAssertion(section = "3.11", id = "x")
public void testNewBeanHasNoDisposalMethods() throws Exception
{
new RunInDependentContext()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -23,7 +23,7 @@
/**
*
- * Spec version: PRD2
+ * Spec version: 20090519
*
*/
@Artifact
@@ -35,7 +35,7 @@
private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {};
@Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "d")
+ @SpecAssertion(section = "3.11", id = "p")
public void testNewBeanIsDependentScoped()
{
Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral());
@@ -45,7 +45,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "e")
+ @SpecAssertion(section = "3.11", id = "q")
public void testNewBeanIsOfStandardDeploymentType()
{
Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral());
@@ -55,7 +55,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "f")
+ @SpecAssertion(section = "3.11", id = "r")
public void testNewBeanIsHasOnlyNewBinding()
{
Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral());
@@ -66,7 +66,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "g")
+ @SpecAssertion(section = "3.11", id = "s")
public void testNewBeanHasNoWebBeanName()
{
Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral());
@@ -76,7 +76,7 @@
}
@Test(groups = { "new"})
- @SpecAssertion(section = "3.3.6", id = "h")
+ @SpecAssertion(section = "3.11", id = "t")
public void testNewBeanHasNoStereotypes()
{
Bean<MonkeyLocal> monkeyBean = getBeans(MonkeyLocal.class).iterator().next();
@@ -88,7 +88,7 @@
}
@Test(groups = {"new" })
- @SpecAssertion(section = "3.3.6", id = "i")
+ @SpecAssertion(section = "3.11", id = "u")
public void testNewBeanHasNoObservers()
{
// Should just be 1 observer from bean, not new bean
@@ -97,8 +97,7 @@
@Test
@SpecAssertions({
- @SpecAssertion(section="3.3.6", id = "aa"),
- @SpecAssertion(section="3.3.6", id="a")
+ @SpecAssertion(section="3.11", id = "j")
})
public void testForEachEnterpriseBeanANewBeanExists()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -9,6 +9,11 @@
import org.jboss.testharness.impl.packaging.PackagingType;
import org.testng.annotations.Test;
+/**
+ *
+ * Spec version: 20090519
+ *
+ */
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
@@ -18,7 +23,7 @@
@Test(groups = { "initializerMethod", "ejb3" })
@SpecAssertions({
@SpecAssertion(section = "3.9", id = "e"),
- @SpecAssertion(section = "3.9", id = "c")
+ @SpecAssertion(section = "3.9", id = "ca")
})
public void testInitializerMethodNotABusinessMethod()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -10,7 +10,7 @@
/**
*
- * Spec version: PRD2
+ * Spec version: 20090519
*/
@Artifact
@Packaging(PackagingType.EAR)
@@ -19,8 +19,7 @@
@Test(groups = { "initializerMethod" })
@SpecAssertions({
- @SpecAssertion(section = "2.3.6", id = "b"),
- @SpecAssertion(section = "3.9", id = "d")
+ @SpecAssertion(section = "3.9.2", id = "b")
})
public void testBindingTypeOnInitializerParameter()
{
@@ -30,34 +29,6 @@
assert anotherHutch.getChicken().getName().equals("Standard");
}
- @Test(groups = { "stub", "initializerMethod", "servlet", "integration" })
- @SpecAssertion(section = "3.9", id = "d")
- public void testInitializerMethodCalledOnServlet()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "initializerMethod", "ejb3", "integration" })
- @SpecAssertion(section = "3.9", id = "d")
- public void testInitializerMethodCalledOnEJBSessionBean()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "initializerMethod", "ejb3", "integration" })
- @SpecAssertion(section = "3.9", id = "d")
- public void testInitializerMethodCalledOnEJBMDB()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "initializerMethod", "ejb3", "singletons", "integration" })
- @SpecAssertion(section = "3.9", id = "d")
- public void testInitializerMethodCalledOnEJBSingleton()
- {
- assert false;
- }
-
@Test(groups = { "stub", "initializerMethod", "interceptors" })
@SpecAssertion(section = "3.9", id = "f")
public void testMethodInterceptorNotCalledOnInitializerMethod()
@@ -70,7 +41,7 @@
@SpecAssertion(section = "3.9", id = "g"),
@SpecAssertion(section = "5.3", id = "b"),
@SpecAssertion(section = "3.9.1", id = "a"),
- @SpecAssertion(section = "3.9.3", id = "a")
+ @SpecAssertion(section = "3.9.2", id = "aa")
})
public void testMultipleInitializerMethodsAreCalled()
{
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,24 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.initializer.methodAnnotatedProduces;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.hibernate.tck.annotations.SpecAssertions;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-public class MethodAnnotatedProducesTest extends AbstractJSR299Test
-{
-
- @Test(groups = "initializerMethod")
- @SpecAssertions( { @SpecAssertion(section = "3.9.1", id = "b"), @SpecAssertion(section = "3.4.2", id = "c") })
- public void testInitializerMethodAnnotatedProduces()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,28 @@
+package org.jboss.jsr299.tck.tests.implementation.initializer.broken.methodAnnotatedProduces;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: 20090519
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+public class MethodAnnotatedProducesTest extends AbstractJSR299Test
+{
+
+ @Test(groups = "initializerMethod")
+ @SpecAssertions( { @SpecAssertion(section = "3.9.1", id = "ba"), @SpecAssertion(section = "3.4.2", id = "c") })
+ public void testInitializerMethodAnnotatedProduces()
+ {
+ assert false;
+ }
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,16 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.initializer.methodAnnotatedProduces;
-
-import javax.enterprise.inject.Initializer;
-import javax.enterprise.inject.Produces;
-
-class Pheasant_Broken
-{
-
- @Initializer
- @Produces
- public void setName(String name)
- {
- // No-op
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.implementation.initializer.broken.methodAnnotatedProduces;
+
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Produces;
+
+class Pheasant_Broken
+{
+
+ @Initializer
+ @Produces
+ public void setName(String name)
+ {
+ // No-op
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,15 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedDisposes;
-
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Initializer;
-
-class Capercaillie_Broken
-{
-
- @Initializer
- public void setName(String name, @Disposes ChickenHutch chickenHutch)
- {
- // No-op
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedDisposes;
+
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Initializer;
+
+class Capercaillie_Broken
+{
+
+ @Initializer
+ public void setName(String name, @Disposes ChickenHutch chickenHutch)
+ {
+ // No-op
+ }
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ChickenHutch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ChickenHutch.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ChickenHutch.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,7 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedDisposes;
-
-
-class ChickenHutch
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ChickenHutch.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ChickenHutch.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ChickenHutch.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ChickenHutch.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,7 @@
+package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedDisposes;
+
+
+class ChickenHutch
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,24 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedDisposes;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test
-{
-
-
- @Test(groups = "initializerMethod")
- @SpecAssertion(section = "3.9.1", id = "c")
- public void testInitializerMethodHasParameterAnnotatedDisposes()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,28 @@
+package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedDisposes;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: 20090519
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test
+{
+
+
+ @Test(groups = "initializerMethod")
+ @SpecAssertion(section = "3.9.1", id = "ca")
+ public void testInitializerMethodHasParameterAnnotatedDisposes()
+ {
+ assert false;
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/DangerCall.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/DangerCall.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/DangerCall.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedObserves;
-
-import javax.enterprise.inject.deployment.Production;
-
-@Production
-class DangerCall
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/DangerCall.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/DangerCall.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/DangerCall.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/DangerCall.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves;
+
+import javax.enterprise.inject.deployment.Production;
+
+@Production
+class DangerCall
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,16 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedObserves;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Initializer;
-
-
-class Grouse_Broken
-{
-
- @Initializer
- public void setName(String name, @Observes DangerCall dangerCall)
- {
- // No-op
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Initializer;
+
+
+class Grouse_Broken
+{
+
+ @Initializer
+ public void setName(String name, @Observes DangerCall dangerCall)
+ {
+ // No-op
+ }
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,24 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedObserves;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-public class ParameterAnnotatedObservesTest extends AbstractJSR299Test
-{
-
-
- @Test(groups = "initializerMethod")
- @SpecAssertion(section = "3.9.1", id = "d")
- public void testInitializerMethodHasParameterAnnotatedObserves()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+public class ParameterAnnotatedObservesTest extends AbstractJSR299Test
+{
+
+
+ @Test(groups = "initializerMethod")
+ @SpecAssertion(section = "3.9.1", id = "d")
+ public void testInitializerMethodHasParameterAnnotatedObserves()
+ {
+ assert false;
+ }
+
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -8,6 +8,10 @@
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
+/**
+ *
+ * Spec version: 20090519
+ */
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class StaticInitializerTest extends AbstractJSR299Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -18,7 +18,7 @@
/**
*
- * Spec version: PRD2
+ * Spec version: 20090519
*
*/
@Artifact
@@ -40,7 +40,7 @@
}
@Test(groups = "producerField")
- @SpecAssertion(section = "3.5", id = "f")
+ @SpecAssertion(section = "3.5", id = "fa")
public void testParameterizedReturnType() throws Exception
{
new RunInDependentContext()
@@ -71,7 +71,7 @@
@Test(groups = "producerField")
@SpecAssertions({
- @SpecAssertion(section = "2.3.1", id = "a")
+ @SpecAssertion(section = "2.3.1", id = "aa")
})
public void testDefaultBindingType()
{
@@ -123,7 +123,7 @@
@Test(groups = { "producerField" })
@SpecAssertions({
@SpecAssertion(section = "3.5.1", id = "b"),
- @SpecAssertion(section = "2.2", id = "j")
+ @SpecAssertion(section = "2.2.1", id = "i")
})
public void testApiTypeForArrayTypeReturn()
{
@@ -186,7 +186,7 @@
@Test(groups = { "producerField" })
@SpecAssertions({
- @SpecAssertion(section = "2.6.3", id = "b"),
+ @SpecAssertion(section = "2.6.3", id = "a"),
@SpecAssertion(section = "3.5.4", id = "a"),
@SpecAssertion(section = "2.6.1", id = "d")
})
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard (from rev 2911, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard)
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/FunnelWeaver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/FunnelWeaver.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/FunnelWeaver.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,6 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard;
-
-class FunnelWeaver<T>
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/FunnelWeaver.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/FunnelWeaver.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/FunnelWeaver.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/FunnelWeaver.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.broken.parameterizedReturnTypeWithWildcard;
+
+class FunnelWeaver<T>
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,25 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-public class ParameterizedReturnTypeWithWildcardTest extends AbstractJSR299Test
-{
-
-
- @Test(groups = "producerField")
- @SpecAssertion(section = "3.5", id = "g")
- public void testParameterizedReturnTypeWithWildcard()
- {
- assert false;
- }
-
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,30 @@
+package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.broken.parameterizedReturnTypeWithWildcard;
+
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: 20090519
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+public class ParameterizedReturnTypeWithWildcardTest extends AbstractJSR299Test
+{
+
+
+ @Test(groups = "producerField")
+ @SpecAssertion(section = "3.5", id = "ga")
+ public void testParameterizedReturnTypeWithWildcard()
+ {
+ assert false;
+ }
+
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java 2009-06-27 16:30:31 UTC (rev 2911)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard;
-
-import javax.enterprise.inject.Produces;
-
-public class SpiderProducerWildCardType_Broken
-{
- @Produces public FunnelWeaver<?> getAnotherFunnelWeaver = new FunnelWeaver<Object>();
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java (from rev 2924, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.broken.parameterizedReturnTypeWithWildcard;
+
+import javax.enterprise.inject.Produces;
+
+public class SpiderProducerWildCardType_Broken
+{
+ @Produces public FunnelWeaver<?> getAnotherFunnelWeaver = new FunnelWeaver<Object>();
+
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -13,6 +13,11 @@
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
+/**
+ *
+ * Spec version: 20090519
+ *
+ */
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-06-29 10:09:46 UTC (rev 2924)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-06-29 11:35:57 UTC (rev 2925)
@@ -11,7 +11,7 @@
/**
*
- * Spec version: PRD2
+ * Spec version: 20090519
*
*/
@Artifact
@@ -21,7 +21,7 @@
@Test(groups = { "producerField" })
@SpecAssertions({
- @SpecAssertion(section = "6.8", id = "b")
+ @SpecAssertion(section = "7.6", id = "b")
})
public void testProducerFieldNotAnotherBean()
{
@@ -38,7 +38,7 @@
@Test(groups = { "producerField" })
@SpecAssertions({
- @SpecAssertion(section = "6.8", id = "h"),
+ @SpecAssertion(section = "5.4.7", id = "a"),
@SpecAssertion(section = "3.5", id = "b")
})
public void testProducerStaticFieldBean()
@@ -57,11 +57,10 @@
@Test(groups = { "producerField" })
@SpecAssertions({
- @SpecAssertion(section = "6.8", id = "k"),
- @SpecAssertion(section = "6.8", id = "l"),
- @SpecAssertion(section = "6", id = "c"),
- @SpecAssertion(section = "6.8", id = "a"),
- @SpecAssertion(section = "6.8", id = "g")
+ @SpecAssertion(section = "4.3.2", id = "a"),
+ @SpecAssertion(section = "5.4.7", id = "b"),
+ @SpecAssertion(section = "7.6", id = "ga"),
+ @SpecAssertion(section = "7.6", id = "a")
})
public void testProducerFieldBeanCreate() throws Exception
{
@@ -78,8 +77,7 @@
@Test(groups = { "producerField", "specialization" })
@SpecAssertions({
- @SpecAssertion(section = "6.8", id = "i"),
- @SpecAssertion(section = "4.3.2", id = "d")
+ @SpecAssertion(section = "4.3.2", id = "a")
})
public void testSpecializedBeanAlwaysUsed() throws Exception
{
@@ -98,7 +96,7 @@
@Test(groups = { "producerField" })
@SpecAssertions({
@SpecAssertion(section = "3.5", id = "d"),
- @SpecAssertion(section = "6.8", id = "m")
+ @SpecAssertion(section = "7.6", id = "m")
})
public void testProducerFieldReturnsNullIsDependent() throws Exception
{
@@ -116,7 +114,7 @@
@Test(groups = { "producerField" }, expectedExceptions = IllegalProductException.class)
@SpecAssertions({
@SpecAssertion(section = "3.5", id = "e"),
- @SpecAssertion(section = "6.8", id = "n")
+ @SpecAssertion(section = "7.6", id = "n")
})
public void testProducerFieldReturnsNullIsNotDependent() throws Exception
{
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2924 - in tck/trunk: impl/src/main/java/org/jboss/jsr299/tck and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-29 06:09:46 -0400 (Mon, 29 Jun 2009)
New Revision: 2924
Modified:
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
Log:
mark destroy method @Deprecated
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2009-06-28 21:39:24 UTC (rev 2923)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2009-06-29 10:09:46 UTC (rev 2924)
@@ -72,6 +72,7 @@
*/
public <T> T getEnterpriseBean(Class<? extends T> beanType, Class<T> localInterface);
+ @Deprecated
public <T> void destroyAndRemoveBeanInstance(Bean<T> bean, T instance);
public <T> T createBeanInstance(Bean<T> bean);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-28 21:39:24 UTC (rev 2923)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-29 10:09:46 UTC (rev 2924)
@@ -191,6 +191,7 @@
* @param bean the bean
* @param instance the instance to destroy
*/
+ @Deprecated
public <T> void destroyAndRemoveBeanInstance(Bean<T> bean, T instance)
{
getCurrentConfiguration().getBeans().destroyAndRemoveBeanInstance(bean, instance);
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2923 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: bootstrap and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-28 17:39:24 -0400 (Sun, 28 Jun 2009)
New Revision: 2923
Added:
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeforeShutdownImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/ProcessAnnotatedTypeImpl.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterBeanDiscoveryImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
Log:
A bit more of chapter 11
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-06-28 21:25:03 UTC (rev 2922)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-06-28 21:39:24 UTC (rev 2923)
@@ -326,15 +326,6 @@
}
}
- /**
- * Registers a bean with the manager
- *
- * @param bean The bean to register
- * @return A reference to manager
- *
- * @see javax.enterprise.inject.spi.BeanManager#addBean(javax.inject.manager.Bean)
- */
- @Deprecated
public void addBean(Bean<?> bean)
{
synchronized (bean)
@@ -576,15 +567,6 @@
return Collections.unmodifiableMap(riBeans);
}
- /**
- * Registers a context with the manager
- *
- * @param context The context to add
- * @return A reference to the manager
- *
- * @see javax.enterprise.inject.spi.BeanManager#addContext(javax.enterprise.context.spi.Context)
- */
- @Deprecated
public void addContext(Context context)
{
contexts.put(context.getScopeType(), context);
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterBeanDiscoveryImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterBeanDiscoveryImpl.java 2009-06-28 21:25:03 UTC (rev 2922)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterBeanDiscoveryImpl.java 2009-06-28 21:39:24 UTC (rev 2923)
@@ -1,6 +1,7 @@
package org.jboss.webbeans.bootstrap;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import javax.enterprise.context.spi.Context;
@@ -8,10 +9,19 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.ObserverMethod;
+import org.jboss.webbeans.BeanManagerImpl;
+
public class AfterBeanDiscoveryImpl implements AfterBeanDiscovery
{
- private List<Throwable> definitionErrors = new ArrayList<Throwable>();
+ private final List<Throwable> definitionErrors = new ArrayList<Throwable>();
+ private final BeanManagerImpl beanManager;
+
+ public AfterBeanDiscoveryImpl(BeanManagerImpl beanManager)
+ {
+ this.beanManager = beanManager;
+ }
+
public void addDefinitionError(Throwable t)
{
definitionErrors.add(t);
@@ -19,17 +29,17 @@
public List<Throwable> getDefinitionErrors()
{
- return definitionErrors;
+ return Collections.unmodifiableList(definitionErrors);
}
-
+
public void addBean(Bean<?> bean)
{
- throw new UnsupportedOperationException();
+ beanManager.addBean(bean);
}
public void addContext(Context context)
{
- throw new UnsupportedOperationException();
+ beanManager.addContext(context);
}
public void addObserverMethod(ObserverMethod<?, ?> observerMethod)
Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeforeShutdownImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeforeShutdownImpl.java (rev 0)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeforeShutdownImpl.java 2009-06-28 21:39:24 UTC (rev 2923)
@@ -0,0 +1,28 @@
+/*
+ * 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.bootstrap;
+
+import javax.enterprise.inject.spi.BeforeShutdown;
+
+/**
+ * @author pmuir
+ *
+ */
+public class BeforeShutdownImpl implements BeforeShutdown
+{
+
+}
Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeforeShutdownImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/ProcessAnnotatedTypeImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/ProcessAnnotatedTypeImpl.java (rev 0)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/ProcessAnnotatedTypeImpl.java 2009-06-28 21:39:24 UTC (rev 2923)
@@ -0,0 +1,61 @@
+/*
+ * 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.bootstrap;
+
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+
+/**
+ * @author pmuir
+ *
+ */
+public class ProcessAnnotatedTypeImpl<X> implements ProcessAnnotatedType<X>
+{
+
+ private AnnotatedType<X> annotatedType;
+ private boolean veto;
+
+ public ProcessAnnotatedTypeImpl(AnnotatedType<X> annotatedType)
+ {
+ this.annotatedType = annotatedType;
+ }
+
+ public AnnotatedType<X> getAnnotatedType()
+ {
+ return annotatedType;
+ }
+
+ public void setAnnotatedType(AnnotatedType<X> type)
+ {
+ if (type == null)
+ {
+ throw new IllegalArgumentException("Cannot set the type to null (if you want to stop the type being used, call veto()) " + this);
+ }
+ this.annotatedType = type;
+ }
+
+ public void veto()
+ {
+ this.veto = true;
+ }
+
+ public boolean isVeto()
+ {
+ return veto;
+ }
+
+}
Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/ProcessAnnotatedTypeImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-06-28 21:25:03 UTC (rev 2922)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-06-28 21:39:24 UTC (rev 2923)
@@ -16,6 +16,7 @@
*/
package org.jboss.webbeans.bootstrap;
+import javax.enterprise.inject.spi.BeforeShutdown;
import javax.enterprise.inject.spi.Extension;
import org.jboss.webbeans.BeanManagerImpl;
@@ -256,16 +257,29 @@
}
}
- protected void fireAfterBeanDiscoveryEvent()
+ private void fireBeforeShutdownEvent()
{
- AfterBeanDiscoveryImpl event = new AfterBeanDiscoveryImpl();
+ BeforeShutdown event = new BeforeShutdownImpl();
try
{
+ getManager().fireEvent(event);
+ }
+ catch (Exception e)
+ {
+ throw new DeploymentException(e);
+ }
+ }
+
+ private void fireAfterBeanDiscoveryEvent()
+ {
+ AfterBeanDiscoveryImpl event = new AfterBeanDiscoveryImpl(getManager());
+ try
+ {
manager.fireEvent(event);
}
catch (Exception e)
{
- throw new DefinitionException(e);
+ event.addDefinitionError(e);
}
if (event.getDefinitionErrors().size() > 0)
@@ -275,7 +289,7 @@
}
}
- protected void fireAfterDeploymentValidationEvent()
+ private void fireAfterDeploymentValidationEvent()
{
AfterDeploymentValidationImpl event = new AfterDeploymentValidationImpl();
@@ -285,7 +299,7 @@
}
catch (Exception e)
{
- throw new DeploymentException(e);
+ event.addDeploymentProblem(e);
}
if (event.getDeploymentProblems().size() > 0)
@@ -347,7 +361,14 @@
public void shutdown()
{
- manager.shutdown();
+ try
+ {
+ fireBeforeShutdownEvent();
+ }
+ finally
+ {
+ manager.shutdown();
+ }
}
}
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2922 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-28 17:25:03 -0400 (Sun, 28 Jun 2009)
New Revision: 2922
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/javax.enterprise.inject.spi.Extension
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanDiscoveryObserver.java
Log:
More chapter 11 tests
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-06-28 18:15:29 UTC (rev 2921)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-06-28 21:25:03 UTC (rev 2922)
@@ -20,12 +20,14 @@
@ExpectedDeploymentException(DefinitionError.class)
public class AddDefinitionErrorTest extends AbstractJSR299Test
{
- @Test(groups="incontainer-ri-broken")
+ @Test(groups="broken")
@SpecAssertion(section = "11.5.2", id = "c")
public void testObserverDefinitionErrorTreatedAsDefinitionError()
{
assert false;
}
+
+ // TODO make this an integration test using Extension
// FIXME need to communicate state of container at the time of failure
// @Override
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryObserver.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryObserver.java 2009-06-28 21:25:03 UTC (rev 2922)
@@ -0,0 +1,35 @@
+/*
+ * 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.deployment.lifecycle.broken.beanDiscoveryMethodThrowsException;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+
+/**
+ * @author pmuir
+ *
+ */
+public class BeforeBeanDiscoveryObserver implements Extension
+{
+
+ public void observe(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
+ {
+ throw new RuntimeException();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryObserver.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-06-28 21:25:03 UTC (rev 2922)
@@ -0,0 +1,49 @@
+/*
+ * 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.deployment.lifecycle.broken.beanDiscoveryMethodThrowsException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.testng.annotations.Test;
+
+/**
+ * @author pmuir
+ *
+ */
+@Artifact
+@Resources({
+ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
+})
+@IntegrationTest
+(a)ExpectedDeploymentException(DefinitionError.class)
+public class BeforeBeanDiscoveryThrowsExceptionTest extends AbstractJSR299Test
+{
+
+ @Test(groups="incontainer-ri-broken")
+ @SpecAssertion(section="11.5.1", id="c")
+ public void testThrowsException()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-06-28 18:15:29 UTC (rev 2921)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-06-28 21:25:03 UTC (rev 2922)
@@ -18,6 +18,8 @@
@ExpectedDeploymentException(DefinitionError.class)
public class DeploymentFailureTest extends AbstractJSR299Test
{
+
+ // TODO make this an integration test using Extension
@Test
@SpecAssertions({
@SpecAssertion(section = "10.5.2", id = "e"),
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-06-28 18:15:29 UTC (rev 2921)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-06-28 21:25:03 UTC (rev 2922)
@@ -40,6 +40,9 @@
@ExpectedDeploymentException(UnsatisfiedResolutionException.class)
public class AfterBeanDiscoveryFailureTest extends AbstractJSR299Test
{
+
+ // TODO make this an integration test using Extension
+
@Test
@SpecAssertions({
@SpecAssertion(section = "11.5.2", id = "a"),
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanDiscoveryObserver.java 2009-06-28 18:15:29 UTC (rev 2921)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/BeanDiscoveryObserver.java 2009-06-28 21:25:03 UTC (rev 2922)
@@ -6,11 +6,11 @@
class BeanDiscoveryObserver
{
- private static boolean managerInitialized;
+ private static boolean afterBeanDiscovery;
public void afterBeanDiscovery(@Observes AfterBeanDiscovery event)
{
- managerInitialized = true;
+ afterBeanDiscovery = true;
}
public void afterDeploymentValidation(@Observes AfterDeploymentValidation event)
@@ -18,13 +18,13 @@
assert false : "Deployment should have already failed because of the presence of an unsatisfied dependency";
}
- public static boolean isManagerInitialized()
+ public static boolean isAfterBeanDiscovery()
{
- return managerInitialized;
+ return afterBeanDiscovery;
}
- public static void setManagerInitialized(boolean managerInitialized)
+ public static void setAfterBeanDiscovery(boolean managerInitialized)
{
- BeanDiscoveryObserver.managerInitialized = managerInitialized;
+ BeanDiscoveryObserver.afterBeanDiscovery = managerInitialized;
}
}
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/javax.enterprise.inject.spi.Extension
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/javax.enterprise.inject.spi.Extension (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/javax.enterprise.inject.spi.Extension 2009-06-28 21:25:03 UTC (rev 2922)
@@ -0,0 +1 @@
+org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.beanDiscoveryMethodThrowsException.BeforeBeanDiscoveryObserver
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2921 - ri/trunk/impl/src/main/java/org/jboss/webbeans/bean.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-28 14:15:29 -0400 (Sun, 28 Jun 2009)
New Revision: 2921
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
Log:
minor
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-06-28 17:38:18 UTC (rev 2920)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-06-28 18:15:29 UTC (rev 2921)
@@ -324,7 +324,7 @@
return creationalContextImpl.getIncompleteInstance(getDeclaringBean());
}
}
- return manager.getReference(getDeclaringBean(), getDeclaringBean().getType(), creationalContext);
+ return manager.getReference(getDeclaringBean(), Object.class, creationalContext);
}
}
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2920 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: definition/deployment and 11 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-28 13:38:18 -0400 (Sun, 28 Jun 2009)
New Revision: 2920
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/stereotypeEnforcesRequiredTypes/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java
Log:
Cleanup stereotype tests
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -11,7 +11,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@RequestScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -10,7 +10,7 @@
import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
@ApplicationScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -10,7 +10,7 @@
import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
@ApplicationScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -8,7 +8,7 @@
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
@HornedAnimalDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -8,7 +8,7 @@
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
@AnotherDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -8,7 +8,7 @@
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
@HornedAnimalDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -10,7 +10,7 @@
import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
@ApplicationScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -11,7 +11,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@RequestScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -10,7 +10,7 @@
import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
@ApplicationScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -9,7 +9,7 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
@ApplicationScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -12,7 +12,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@RequestScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -10,7 +10,7 @@
import javax.enterprise.inject.stereotype.Stereotype;
@ApplicationScoped
-(a)Stereotype(supportedScopes=ApplicationScoped.class)
+@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
@HornedAnimalDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -8,7 +8,7 @@
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
@HornedAnimalDeploymentType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -12,7 +12,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@RequestScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -37,7 +37,7 @@
* @author David Allen
*
*/
-(a)Stereotype(requiredTypes=Spider.class)
+@Stereotype
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@RequestScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -37,7 +37,7 @@
* @author David Allen
*
*/
-(a)Stereotype(requiredTypes=Spider.class)
+@Stereotype
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@RequestScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -11,7 +11,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@RequestScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -10,7 +10,7 @@
import javax.enterprise.inject.Named;
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
@ApplicationScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -6,10 +6,9 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class)
+@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
@interface RequestScopedAnimalStereotype
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java 2009-06-28 17:34:44 UTC (rev 2919)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java 2009-06-28 17:38:18 UTC (rev 2920)
@@ -11,7 +11,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.stereotype.Stereotype;
-(a)Stereotype(requiredTypes=Animal.class)
+@Stereotype
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@RequestScoped
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2919 - ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr and 9 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-28 13:34:44 -0400 (Sun, 28 Jun 2009)
New Revision: 2919
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/Alligator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/EpochScoped.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/RomanEmpire.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/BeforeBeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/EpochScoped.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/RomanEmpire.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/BeforeBeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/EpochScoped.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/RomanEmpire.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/javax.enterprise.inject.spi.Extension
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/javax.enterprise.inject.spi.Extension
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/BeforeBeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Add tests for scope types
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-06-28 17:32:47 UTC (rev 2918)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -87,6 +87,19 @@
return new AnnotationStore(buildAnnotationMap(annotatedElement.getAnnotations()), buildAnnotationMap(annotatedElement.getDeclaredAnnotations()), typeStore);
}
+ public static AnnotationStore of(AnnotatedElement annotatedElement, Set<Annotation> extraAnnotations, Set<Annotation> extraDeclaredAnnotations, TypeStore typeStore)
+ {
+ Map<Class<? extends Annotation>, Annotation> annotationMap = new HashMap<Class<? extends Annotation>, Annotation>();
+ annotationMap.putAll(buildAnnotationMap(annotatedElement.getAnnotations()));
+ annotationMap.putAll(buildAnnotationMap(extraAnnotations));
+
+ Map<Class<? extends Annotation>, Annotation> declaredAnnotationMap = new HashMap<Class<? extends Annotation>, Annotation>();
+ declaredAnnotationMap.putAll(buildAnnotationMap(annotatedElement.getDeclaredAnnotations()));
+ declaredAnnotationMap.putAll(buildAnnotationMap(extraDeclaredAnnotations));
+
+ return new AnnotationStore(annotationMap, declaredAnnotationMap, typeStore);
+ }
+
public static AnnotationStore of(Annotation[] annotations, Annotation[] declaredAnnotations, TypeStore typeStore)
{
return new AnnotationStore(buildAnnotationMap(annotations), buildAnnotationMap(declaredAnnotations), typeStore);
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java 2009-06-28 17:32:47 UTC (rev 2918)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -70,7 +70,7 @@
*/
protected WBAnnotationImpl(Class<T> annotationType, ClassTransformer classTransformer)
{
- super(AnnotationStore.of(annotationType, classTransformer.getTypeStore()), annotationType, annotationType, classTransformer);
+ super(AnnotationStore.of(annotationType, classTransformer.getTypeStore().get(annotationType), classTransformer.getTypeStore().get(annotationType), classTransformer.getTypeStore()), annotationType, annotationType, classTransformer);
this.clazz = annotationType;
members = new HashSet<WBMethod<?>>();
annotatedMembers = new SetHashMultiMap<Class<? extends Annotation>, WBMethod<?>>();
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/Alligator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/Alligator.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/Alligator.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1,27 @@
+/*
+ * 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.deployment.lifecycle;
+
+/**
+ * @author pmuir
+ *
+ */
+@Tame
+public class Alligator
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/Alligator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/BeforeBeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/BeforeBeanDiscoveryObserver.java 2009-06-28 17:32:47 UTC (rev 2918)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/BeforeBeanDiscoveryObserver.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -22,13 +22,13 @@
/**
* @author pmuir
- *
+ *
*/
public class BeforeBeanDiscoveryObserver implements Extension
{
-
+
private static boolean observed;
-
+
/**
* @return the observed
*/
@@ -36,7 +36,7 @@
{
return observed;
}
-
+
/**
* @param observed the observed to set
*/
@@ -44,11 +44,12 @@
{
BeforeBeanDiscoveryObserver.observed = observed;
}
-
public void observe(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
{
setObserved(true);
+ beforeBeanDiscovery.addBindingType(Tame.class);
+ beforeBeanDiscovery.addScopeType(EpochScoped.class, false, false);
}
-
+
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/EpochScoped.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/EpochScoped.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/EpochScoped.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1,35 @@
+/*
+* 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.deployment.lifecycle;
+
+import static java.lang.annotation.ElementType.FIELD;
+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;
+
+
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface EpochScoped
+{
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/EpochScoped.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-06-28 17:32:47 UTC (rev 2918)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -16,6 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.deployment.lifecycle;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.Bean;
+
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
@@ -36,9 +40,29 @@
{
@Test
+ @SpecAssertion(section="11.5.1", id="a")
public void testBeforeBeanDiscoveryEventIsCalled()
{
assert BeforeBeanDiscoveryObserver.isObserved();
}
+
+ @Test
+ @SpecAssertion(section="11.5.1", id="ba")
+ public void testAddingBindingType()
+ {
+ assert BeforeBeanDiscoveryObserver.isObserved();
+ assert getBeans(Alligator.class).size() == 0;
+ assert getBeans(Alligator.class, new AnnotationLiteral<Tame>() {}).size() == 1;
+ }
+
+ @Test
+ @SpecAssertion(section="11.5.1", id="bb")
+ public void testAddingScopeType()
+ {
+ assert BeforeBeanDiscoveryObserver.isObserved();
+ assert getBeans(RomanEmpire.class).size() == 1;
+ Bean<RomanEmpire> bean = getBeans(RomanEmpire.class).iterator().next();
+ assert bean.getScopeType().equals(EpochScoped.class);
+ }
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/RomanEmpire.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/RomanEmpire.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/RomanEmpire.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1,27 @@
+/*
+ * 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.deployment.lifecycle;
+
+/**
+ * @author pmuir
+ *
+ */
+@EpochScoped
+public class RomanEmpire
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/RomanEmpire.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/Tame.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/Tame.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.deployment.lifecycle;
+
+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;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@interface Tame
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/Tame.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1,49 @@
+/*
+ * 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.deployment.lifecycle.broken.normalScope;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.testng.annotations.Test;
+
+/**
+ * @author pmuir
+ *
+ */
+@Artifact
+@Resources({
+ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
+})
+@IntegrationTest
+(a)ExpectedDeploymentException(DeploymentError.class)
+public class AddingNormalScopeTest extends AbstractJSR299Test
+{
+
+ @Test
+ @SpecAssertion(section="11.5.1", id="bb")
+ public void testAddingScopeType()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/BeforeBeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/BeforeBeanDiscoveryObserver.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/BeforeBeanDiscoveryObserver.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1,35 @@
+/*
+ * 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.deployment.lifecycle.broken.normalScope;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+
+/**
+ * @author pmuir
+ *
+ */
+public class BeforeBeanDiscoveryObserver implements Extension
+{
+
+ public void observe(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
+ {
+ beforeBeanDiscovery.addScopeType(EpochScoped.class, true, false);
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/BeforeBeanDiscoveryObserver.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/EpochScoped.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/EpochScoped.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/EpochScoped.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1,35 @@
+/*
+* 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.deployment.lifecycle.broken.normalScope;
+
+import static java.lang.annotation.ElementType.FIELD;
+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;
+
+
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface EpochScoped
+{
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/EpochScoped.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/RomanEmpire.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/RomanEmpire.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/RomanEmpire.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1,27 @@
+/*
+ * 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.deployment.lifecycle.broken.normalScope;
+
+/**
+ * @author pmuir
+ *
+ */
+@EpochScoped
+public final class RomanEmpire
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/RomanEmpire.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1,50 @@
+/*
+ * 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.deployment.lifecycle.broken.passivatingScope;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.testng.annotations.Test;
+
+/**
+ * @author pmuir
+ *
+ */
+@Artifact
+@Resources({
+ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
+})
+@IntegrationTest
+// TODO This *should be* DeploymentError
+(a)ExpectedDeploymentException(DefinitionError.class)
+public class AddingPassivatingScopeTest extends AbstractJSR299Test
+{
+
+ @Test
+ @SpecAssertion(section="11.5.1", id="bb")
+ public void testAddingScopeType()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/BeforeBeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/BeforeBeanDiscoveryObserver.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/BeforeBeanDiscoveryObserver.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1,35 @@
+/*
+ * 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.deployment.lifecycle.broken.passivatingScope;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+
+/**
+ * @author pmuir
+ *
+ */
+public class BeforeBeanDiscoveryObserver implements Extension
+{
+
+ public void observe(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
+ {
+ beforeBeanDiscovery.addScopeType(EpochScoped.class, false, true);
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/BeforeBeanDiscoveryObserver.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/EpochScoped.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/EpochScoped.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/EpochScoped.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1,35 @@
+/*
+* 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.deployment.lifecycle.broken.passivatingScope;
+
+import static java.lang.annotation.ElementType.FIELD;
+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;
+
+
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface EpochScoped
+{
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/EpochScoped.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/RomanEmpire.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/RomanEmpire.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/RomanEmpire.java 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1,27 @@
+/*
+ * 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.deployment.lifecycle.broken.passivatingScope;
+
+/**
+ * @author pmuir
+ *
+ */
+@EpochScoped
+public class RomanEmpire
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/RomanEmpire.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/javax.enterprise.inject.spi.Extension
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/javax.enterprise.inject.spi.Extension (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/javax.enterprise.inject.spi.Extension 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1 @@
+org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.normalScope.BeforeBeanDiscoveryObserver
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/javax.enterprise.inject.spi.Extension
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/javax.enterprise.inject.spi.Extension (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/javax.enterprise.inject.spi.Extension 2009-06-28 17:34:44 UTC (rev 2919)
@@ -0,0 +1 @@
+org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.passivatingScope.BeforeBeanDiscoveryObserver
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-28 17:32:47 UTC (rev 2918)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-28 17:34:44 UTC (rev 2919)
@@ -4731,10 +4731,22 @@
<text>The container must fire an event before it begins the bean discovery process. The event object must be of type |javax.enterprise.inject.spi.BeforeBeanDiscovery|.</text>
</assertion>
- <assertion id="b">
- <text>The operations of the |BeforeBeanDiscovery| instance allow a portable extension to declare that any annotation as a binding type, scope type, stereotype or interceptor binding type.</text>
+ <assertion id="ba">
+ <text>The operations of the |BeforeBeanDiscovery| instance allow a portable extension to declare that any annotation as a _binding type_, scope type, stereotype or interceptor binding type.</text>
</assertion>
+ <assertion id="bb">
+ <text>The operations of the |BeforeBeanDiscovery| instance allow a portable extension to declare that any annotation as a binding type, _scope type_, stereotype or interceptor binding type.</text>
+ </assertion>
+
+ <assertion id="bc">
+ <text>The operations of the |BeforeBeanDiscovery| instance allow a portable extension to declare that any annotation as a binding type, scope type, _stereotype_ or interceptor binding type.</text>
+ </assertion>
+
+ <assertion id="bd">
+ <text>The operations of the |BeforeBeanDiscovery| instance allow a portable extension to declare that any annotation as a binding type, scope type, stereotype or _interceptor binding type_.</text>
+ </assertion>
+
<assertion id="c">
<text>If any observer method of the |BeforeBeanDiscovery| event throws an exception, the exception is treated as a definition error by the container.</text>
</assertion>
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2918 - ri/trunk/impl/src/main/java/org/jboss/webbeans/literal.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-28 13:32:47 -0400 (Sun, 28 Jun 2009)
New Revision: 2918
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java
Log:
oops
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java 2009-06-28 17:32:11 UTC (rev 2917)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ScopeTypeLiteral.java 2009-06-28 17:32:47 UTC (rev 2918)
@@ -19,7 +19,7 @@
import javax.enterprise.context.ScopeType;
import javax.enterprise.inject.AnnotationLiteral;
-public class ScopeTypeLiteral extends AnnotationLiteral<ScopeTypeLiteral> implements ScopeType
+public class ScopeTypeLiteral extends AnnotationLiteral<ScopeType> implements ScopeType
{
private final boolean normal;
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2917 - ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-28 13:32:11 -0400 (Sun, 28 Jun 2009)
New Revision: 2917
Modified:
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java
Log:
Add a deployment exception
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-28 17:31:37 UTC (rev 2916)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java 2009-06-28 17:32:11 UTC (rev 2917)
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.List;
+import javax.enterprise.inject.UnproxyableResolutionException;
import javax.enterprise.inject.spi.BeanManager;
import org.jboss.jsr299.tck.spi.Managers;
@@ -68,6 +69,10 @@
{
return true;
}
+ else if (UnproxyableResolutionException.class.isAssignableFrom(t.getClass()))
+ {
+ return true;
+ }
else
{
return isDeploymentException(t.getCause());
14 years, 10 months
- 1
- 0