weld-commits June 2009

weld-commits@lists.jboss.org

1 participants
201 discussions

[webbeans-commits] Webbeans SVN: r2876 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-23 19:17:35 -0400 (Tue, 23 Jun 2009) New Revision: 2876 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/TooManyDeployElementsTest.java Log: OOps Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/TooManyDeployElementsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/TooManyDeployElementsTest.java 2009-06-23 23:13:17 UTC (rev 2875) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/TooManyDeployElementsTest.java 2009-06-23 23:17:35 UTC (rev 2876) @@ -3,6 +3,7 @@ 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.Packaging; @@ -11,6 +12,7 @@ import org.jboss.testharness.impl.packaging.Resources; import org.testng.annotations.Test; +@Artifact @IntegrationTest @Packaging(PackagingType.WAR) @Resources({

14 years, 10 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2875 - ri/trunk/api/src/main/java/javax/enterprise/inject and 36 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-23 19:13:17 -0400 (Tue, 23 Jun 2009) New Revision: 2875 Added: ri/trunk/api/src/main/java/javax/enterprise/inject/InjectionException.java ri/trunk/api/src/main/java/javax/enterprise/inject/ResolutionException.java ri/trunk/impl/src/main/java/org/jboss/webbeans/InconsistentSpecializationException.java ri/trunk/impl/src/main/java/org/jboss/webbeans/NullableDependencyException.java ri/trunk/impl/src/main/java/org/jboss/webbeans/UnserializableDependencyException.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/Logger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/MockLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TimestampLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TooManyDecoratorElementsTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/beans.xml Removed: ri/trunk/api/src/main/java/javax/inject/DeploymentException.java ri/trunk/api/src/main/java/javax/inject/DuplicateBindingTypeException.java ri/trunk/api/src/main/java/javax/inject/ExecutionException.java ri/trunk/api/src/main/java/javax/inject/InconsistentSpecializationException.java ri/trunk/api/src/main/java/javax/inject/NullableDependencyException.java ri/trunk/api/src/main/java/javax/inject/UnserializableDependencyException.java Modified: ri/trunk/api/src/main/java/javax/enterprise/context/ContextNotActiveException.java ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java ri/trunk/api/src/main/java/javax/event/ObserverException.java ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/FacadeImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/ConnectionContextual.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsQueueMethodHandler.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsTopicMethodHandler.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageConsumerContextual.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageProducerContextual.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/SessionContextual.java ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Exceptions.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/AnnotationImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/BeansXmlParser.java ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceLoadingException.java ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/AbstractResourceServices.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/DependentInterceptorSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/DependentDecoratorSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/DependentInterceptorSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/DependentDecoratorSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/TooManyDeployElementsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java Log: Fix up the exceptions a bit, test for duplicate <decorators> elements Modified: ri/trunk/api/src/main/java/javax/enterprise/context/ContextNotActiveException.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/ContextNotActiveException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/enterprise/context/ContextNotActiveException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -17,7 +17,6 @@ package javax.enterprise.context; -import javax.inject.ExecutionException; /** * A ContextNotActiveException is thrown if at a particular point in the @@ -30,7 +29,7 @@ * @author Shane Bryzak */ -public class ContextNotActiveException extends ExecutionException +public class ContextNotActiveException extends RuntimeException { private static final long serialVersionUID = -3599813072560026919L; Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -17,7 +17,6 @@ package javax.enterprise.inject; -import javax.inject.DeploymentException; /** * An AmbiguousDependencyException is thrown when within the set of enabled @@ -27,7 +26,7 @@ * * @author Pete Muir */ -public class AmbiguousResolutionException extends DeploymentException +public class AmbiguousResolutionException extends ResolutionException { private static final long serialVersionUID = -2132733164534544788L; Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -23,9 +23,7 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import javax.inject.ExecutionException; - /** * Supports inline instantiation of annotation type instances. * @@ -159,15 +157,15 @@ } catch (IllegalArgumentException e) { - throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); } catch (IllegalAccessException e) { - throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); } catch (InvocationTargetException e) { - throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); } } } Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -17,14 +17,13 @@ package javax.enterprise.inject; -import javax.inject.ExecutionException; /** * Wraps any checked exceptions which occur during creation of an bean * * @author Pete Muir */ -public class CreationException extends ExecutionException +public class CreationException extends InjectionException { private static final long serialVersionUID = 1002854668862145298L; Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -16,13 +16,12 @@ */ package javax.enterprise.inject; -import javax.inject.ExecutionException; /** * Thrown if a producer method returns a null value or a producer field contains * a null value, and the scope of the method or field is not @Dependent */ -public class IllegalProductException extends ExecutionException +public class IllegalProductException extends InjectionException { private static final long serialVersionUID = -6280627846071966243L; Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/InjectionException.java (from rev 2862, ri/trunk/api/src/main/java/javax/inject/DeploymentException.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/InjectionException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/InjectionException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject; + + +/** + * An AmbiguousDependencyException is thrown when within the set of enabled + * beans with the API type and bind- ing types declared there exists no unique + * Web Bean with a higher precedence than all other beans in the set. + * + * + * @author Pete Muir + */ +public class InjectionException extends RuntimeException +{ + + private static final long serialVersionUID = -2132733164534544788L; + + public InjectionException() + { + } + + public InjectionException(String message, Throwable throwable) + { + super(message, throwable); + } + + public InjectionException(String message) + { + super(message); + } + + public InjectionException(Throwable throwable) + { + super(throwable); + } + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/InjectionException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -19,9 +19,7 @@ import java.lang.annotation.Annotation; -import javax.inject.DuplicateBindingTypeException; - /** * An interface for looking up beans of a particular type. * @@ -41,7 +39,7 @@ * @param bindings * Additional binding types * @return an instance of a bean of the specified type - * @throws DuplicateBindingTypeException + * @throws IllegalArgumentException * if two instances of the same binding type are passed * @throws IllegalArgumentException * if an instance of an annotation that is not a binding type is Added: ri/trunk/api/src/main/java/javax/enterprise/inject/ResolutionException.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/ResolutionException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/ResolutionException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -0,0 +1,48 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package javax.enterprise.inject; + + +/** + * Thrown if resolution fails + */ +public class ResolutionException extends InjectionException +{ + + private static final long serialVersionUID = -6280627846071966243L; + + public ResolutionException() + { + super(); + } + + public ResolutionException(String message, Throwable cause) + { + super(message, cause); + } + + public ResolutionException(String message) + { + super(message); + } + + public ResolutionException(Throwable cause) + { + super(cause); + } + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/ResolutionException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -18,7 +18,6 @@ package javax.enterprise.inject; -import javax.inject.DeploymentException; /** * Thrown if a bean has normal scope and the type cannot be proxied by the @@ -26,7 +25,7 @@ * * @author Pete Muir */ -public class UnproxyableResolutionException extends DeploymentException +public class UnproxyableResolutionException extends ResolutionException { private static final long serialVersionUID = 1667539354548135465L; Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -18,14 +18,13 @@ package javax.enterprise.inject; -import javax.inject.DeploymentException; /** * Thrown if no beans can be resolved * * @author Pete Muir */ -public class UnsatisfiedResolutionException extends DeploymentException +public class UnsatisfiedResolutionException extends ResolutionException { private static final long serialVersionUID = 5350603312442756709L; Modified: ri/trunk/api/src/main/java/javax/event/ObserverException.java =================================================================== --- ri/trunk/api/src/main/java/javax/event/ObserverException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/event/ObserverException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -17,7 +17,6 @@ package javax.event; -import javax.inject.ExecutionException; /** * Wraps any checked exceptions which occur during the notification of an @@ -26,7 +25,7 @@ * @author Pete Muir */ -public class ObserverException extends ExecutionException +public class ObserverException extends RuntimeException { private static final long serialVersionUID = -801836224808304381L; Deleted: ri/trunk/api/src/main/java/javax/inject/DeploymentException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/DeploymentException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/inject/DeploymentException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package javax.inject; - -/** - * Thrown if an error occurs during bean deployment - * - * @author Pete Muir - */ -public class DeploymentException extends RuntimeException -{ - - private static final long serialVersionUID = -332013557319725211L; - - public DeploymentException() - { - super(); - } - - public DeploymentException(String message, Throwable throwable) - { - super(message, throwable); - } - - public DeploymentException(String message) - { - super(message); - } - - public DeploymentException(Throwable throwable) - { - super(throwable); - } - - - -} Deleted: ri/trunk/api/src/main/java/javax/inject/DuplicateBindingTypeException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/DuplicateBindingTypeException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/inject/DuplicateBindingTypeException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,50 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package javax.inject; - -/** - * This exception is thrown whenever more than one binding type instance of the - * same type is used with the API. - * - * @author David Allen - */ -public class DuplicateBindingTypeException extends ExecutionException -{ - - private static final long serialVersionUID = 4194175477451120383L; - - public DuplicateBindingTypeException() - { - super(); - } - - public DuplicateBindingTypeException(String message, Throwable cause) - { - super(message, cause); - } - - public DuplicateBindingTypeException(String message) - { - super(message); - } - - public DuplicateBindingTypeException(Throwable cause) - { - super(cause); - } - -} Deleted: ri/trunk/api/src/main/java/javax/inject/ExecutionException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/ExecutionException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/inject/ExecutionException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package javax.inject; - -/** - * Thrown if an exception occurs during execution - * - * @author Pete Muir - */ -public class ExecutionException extends RuntimeException -{ - - private static final long serialVersionUID = -4418792077313780514L; - - public ExecutionException() - { - super(); - } - - public ExecutionException(String message, Throwable throwable) - { - super(message, throwable); - } - - public ExecutionException(String message) - { - super(message); - } - - public ExecutionException(Throwable throwable) - { - super(throwable); - } - -} Deleted: ri/trunk/api/src/main/java/javax/inject/InconsistentSpecializationException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/InconsistentSpecializationException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/inject/InconsistentSpecializationException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package javax.inject; - -/** - * - * @author Pete Muir - */ -public class InconsistentSpecializationException extends DeploymentException -{ - - private static final long serialVersionUID = 4359656880524913555L; - - public InconsistentSpecializationException() - { - super(); - } - - public InconsistentSpecializationException(String message, Throwable throwable) - { - super(message, throwable); - } - - public InconsistentSpecializationException(String message) - { - super(message); - } - - public InconsistentSpecializationException(Throwable throwable) - { - super(throwable); - } - - - -} Deleted: ri/trunk/api/src/main/java/javax/inject/NullableDependencyException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/NullableDependencyException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/inject/NullableDependencyException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package javax.inject; - -/** - * Thrown if an injection point of primitive type resolves to a bean which may - * be null - * - * @author Pete Muir - */ -public class NullableDependencyException extends DeploymentException -{ - - private static final long serialVersionUID = 6877485218767005761L; - - public NullableDependencyException() - { - super(); - } - - public NullableDependencyException(String message, Throwable throwable) - { - super(message, throwable); - } - - public NullableDependencyException(String message) - { - super(message); - } - - public NullableDependencyException(Throwable throwable) - { - super(throwable); - } - - - -} Deleted: ri/trunk/api/src/main/java/javax/inject/UnserializableDependencyException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/UnserializableDependencyException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/api/src/main/java/javax/inject/UnserializableDependencyException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,56 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package javax.inject; - -/** - * Thrown if a simple bean is dependent scoped and injected into a stateful - * session bean, into a non-transient field, bean constructor parameter or - * initializer method parameter of a bean which declares a passivating scope, or - * into a parameter of a producer method which declares a passivating scope - * - * @author Pete Muir - */ -public class UnserializableDependencyException extends DeploymentException -{ - - private static final long serialVersionUID = -6287506607413810688L; - - public UnserializableDependencyException() - { - super(); - } - - public UnserializableDependencyException(String message, Throwable throwable) - { - super(message, throwable); - } - - public UnserializableDependencyException(String message) - { - super(message); - } - - public UnserializableDependencyException(Throwable throwable) - { - super(throwable); - } - - - -} 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-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -49,6 +49,7 @@ import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.AmbiguousResolutionException; import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.InjectionException; import javax.enterprise.inject.UnproxyableResolutionException; import javax.enterprise.inject.UnsatisfiedResolutionException; import javax.enterprise.inject.deployment.Production; @@ -63,8 +64,6 @@ import javax.enterprise.inject.spi.ManagedBean; import javax.enterprise.inject.spi.ObserverMethod; import javax.event.Observer; -import javax.inject.DeploymentException; -import javax.inject.DuplicateBindingTypeException; import org.jboss.webbeans.bean.DecoratorBean; import org.jboss.webbeans.bean.EnterpriseBean; @@ -318,7 +317,7 @@ { if (!this.enabledDeploymentTypes.get(0).equals(Standard.class)) { - throw new DeploymentException("@Standard must be the lowest precedence deployment type"); + throw new InjectionException("@Standard must be the lowest precedence deployment type"); } } @@ -367,7 +366,7 @@ HashSet<Annotation> bindingAnnotations = new HashSet<Annotation>(Arrays.asList(bindings)); if (bindingAnnotations.size() < bindings.length) { - throw new DuplicateBindingTypeException("Duplicate binding types: " + bindings); + throw new IllegalArgumentException("Duplicate binding types: " + bindings); } checkEventType(clazz); return eventManager.getObservers(event, bindings); @@ -468,7 +467,7 @@ } if (bindings != null && bindings.length > element.getMetaAnnotations(BindingType.class).size()) { - throw new DuplicateBindingTypeException("Duplicate bindings (" + Arrays.asList(bindings) + ") type passed " + element.toString()); + throw new IllegalArgumentException("Duplicate bindings (" + Arrays.asList(bindings) + ") type passed " + element.toString()); } return resolver.get(ResolvableFactory.of(element)); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -37,10 +37,7 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; import javax.event.Event; -import javax.inject.InconsistentSpecializationException; -import javax.inject.NullableDependencyException; import javax.inject.Obtains; -import javax.inject.UnserializableDependencyException; import org.jboss.webbeans.bean.DecoratorBean; import org.jboss.webbeans.bean.NewEnterpriseBean; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/FacadeImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/FacadeImpl.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/FacadeImpl.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -24,8 +24,6 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.DuplicateBindingTypeException; - import org.jboss.webbeans.metadata.MetaDataCache; /** @@ -85,7 +83,7 @@ } if (result.contains(newAnnotation)) { - throw new DuplicateBindingTypeException(newAnnotation + " is already present in the bindings list for " + this); + throw new IllegalArgumentException(newAnnotation + " is already present in the bindings list for " + this); } result.add(newAnnotation); } Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/InconsistentSpecializationException.java (from rev 2862, ri/trunk/api/src/main/java/javax/inject/InconsistentSpecializationException.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/InconsistentSpecializationException.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/InconsistentSpecializationException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.jboss.webbeans; + +/** + * + * @author Pete Muir + */ +public class InconsistentSpecializationException extends DeploymentException +{ + + private static final long serialVersionUID = 4359656880524913555L; + + public InconsistentSpecializationException() + { + super(); + } + + public InconsistentSpecializationException(String message, Throwable throwable) + { + super(message, throwable); + } + + public InconsistentSpecializationException(String message) + { + super(message); + } + + public InconsistentSpecializationException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/InconsistentSpecializationException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/NullableDependencyException.java (from rev 2862, ri/trunk/api/src/main/java/javax/inject/NullableDependencyException.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/NullableDependencyException.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/NullableDependencyException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -0,0 +1,54 @@ +/* + * 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; + +/** + * Thrown if an injection point of primitive type resolves to a bean which may + * be null + * + * @author Pete Muir + */ +public class NullableDependencyException extends DeploymentException +{ + + private static final long serialVersionUID = 6877485218767005761L; + + public NullableDependencyException() + { + super(); + } + + public NullableDependencyException(String message, Throwable throwable) + { + super(message, throwable); + } + + public NullableDependencyException(String message) + { + super(message); + } + + public NullableDependencyException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/NullableDependencyException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/UnserializableDependencyException.java (from rev 2862, ri/trunk/api/src/main/java/javax/inject/UnserializableDependencyException.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/UnserializableDependencyException.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/UnserializableDependencyException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -0,0 +1,57 @@ +/* + * 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; + + +/** + * Thrown if a simple bean is dependent scoped and injected into a stateful + * session bean, into a non-transient field, bean constructor parameter or + * initializer method parameter of a bean which declares a passivating scope, or + * into a parameter of a producer method which declares a passivating scope + * + * @author Pete Muir + */ +public class UnserializableDependencyException extends DeploymentException +{ + + private static final long serialVersionUID = -6287506607413810688L; + + public UnserializableDependencyException() + { + super(); + } + + public UnserializableDependencyException(String message, Throwable throwable) + { + super(message, throwable); + } + + public UnserializableDependencyException(String message) + { + super(message); + } + + public UnserializableDependencyException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/UnserializableDependencyException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/ConnectionContextual.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/ConnectionContextual.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/ConnectionContextual.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -20,7 +20,6 @@ import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; -import javax.inject.ExecutionException; import javax.jms.Connection; import javax.jms.JMSException; @@ -43,7 +42,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating connection ", e); + throw new RuntimeException("Error creating connection ", e); } } @@ -57,7 +56,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating connection ", e); + throw new RuntimeException("Error creating connection ", e); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsQueueMethodHandler.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsQueueMethodHandler.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsQueueMethodHandler.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -17,7 +17,6 @@ package org.jboss.webbeans.bean.ee.jms; import javax.enterprise.context.spi.CreationalContext; -import javax.inject.ExecutionException; import javax.jms.JMSException; import javax.jms.Queue; import javax.jms.QueueConnection; @@ -91,7 +90,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating QueueSender", e); + throw new RuntimeException("Error creating QueueSender", e); } } @@ -116,7 +115,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating QueueReceiver", e); + throw new RuntimeException("Error creating QueueReceiver", e); } } @@ -137,7 +136,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating session", e); + throw new RuntimeException("Error creating session", e); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsTopicMethodHandler.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsTopicMethodHandler.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsTopicMethodHandler.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -17,7 +17,6 @@ package org.jboss.webbeans.bean.ee.jms; import javax.enterprise.context.spi.CreationalContext; -import javax.inject.ExecutionException; import javax.jms.JMSException; import javax.jms.Session; import javax.jms.Topic; @@ -95,7 +94,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating TopicPublisher", e); + throw new RuntimeException("Error creating TopicPublisher", e); } } @@ -120,7 +119,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating TopicSubscriber", e); + throw new RuntimeException("Error creating TopicSubscriber", e); } } @@ -141,7 +140,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating session", e); + throw new RuntimeException("Error creating session", e); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageConsumerContextual.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageConsumerContextual.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageConsumerContextual.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -20,7 +20,6 @@ import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; -import javax.inject.ExecutionException; import javax.jms.JMSException; import javax.jms.MessageConsumer; @@ -37,7 +36,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating connection ", e); + throw new RuntimeException("Error creating connection ", e); } } @@ -51,7 +50,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating connection ", e); + throw new RuntimeException("Error creating connection ", e); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageProducerContextual.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageProducerContextual.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageProducerContextual.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -20,7 +20,6 @@ import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; -import javax.inject.ExecutionException; import javax.jms.JMSException; import javax.jms.MessageProducer; @@ -37,7 +36,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating connection ", e); + throw new RuntimeException("Error creating connection ", e); } } @@ -51,7 +50,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating connection ", e); + throw new RuntimeException("Error creating connection ", e); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/SessionContextual.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/SessionContextual.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/SessionContextual.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -20,7 +20,6 @@ import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; -import javax.inject.ExecutionException; import javax.jms.JMSException; import javax.jms.Session; @@ -37,7 +36,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating connection ", e); + throw new RuntimeException("Error creating connection ", e); } } @@ -51,7 +50,7 @@ } catch (JMSException e) { - throw new ExecutionException("Error creating connection ", e); + throw new RuntimeException("Error creating connection ", e); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -22,7 +22,6 @@ import javax.el.ELContext; import javax.el.ELResolver; import javax.enterprise.inject.spi.Bean; -import javax.inject.ExecutionException; import org.jboss.webbeans.BeanManagerImpl; @@ -149,7 +148,7 @@ } catch (Exception e) { - throw new ExecutionException("Error resolving property " + propertyString + " against base " + base, e); + throw new RuntimeException("Error resolving property " + propertyString + " against base " + base, e); } if (holder.getValue() != null) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -23,7 +23,6 @@ import javax.enterprise.inject.Current; import javax.event.Observer; -import javax.inject.DuplicateBindingTypeException; import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.metadata.MetaDataCache; @@ -84,7 +83,7 @@ } if (eventBindings.contains(annotation)) { - throw new DuplicateBindingTypeException(annotation + " is already present in the bindings list for " + this); + throw new IllegalArgumentException(annotation + " is already present in the bindings list for " + this); } if (!annotation.annotationType().equals(Current.class)) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Exceptions.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Exceptions.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Exceptions.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -19,7 +19,6 @@ import java.lang.reflect.InvocationTargetException; import javax.enterprise.inject.CreationException; -import javax.inject.ExecutionException; class Exceptions { @@ -39,11 +38,11 @@ } catch (InstantiationException e1) { - throw new ExecutionException(e1); + throw new RuntimeException(e1); } catch (IllegalAccessException e1) { - throw new ExecutionException(e1); + throw new RuntimeException(e1); } e.initCause(t); throw e; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -22,7 +22,6 @@ import javax.enterprise.inject.BindingType; import javax.enterprise.inject.NonBinding; -import javax.inject.ExecutionException; import org.jboss.webbeans.DefinitionException; import org.jboss.webbeans.introspector.WBMethod; @@ -143,15 +142,15 @@ } catch (IllegalArgumentException e) { - throw new ExecutionException(e); + throw new RuntimeException(e); } catch (IllegalAccessException e) { - throw new ExecutionException(e); + throw new RuntimeException(e); } catch (InvocationTargetException e) { - throw new ExecutionException(e); + throw new RuntimeException(e); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -35,7 +35,6 @@ import java.util.Set; import javax.enterprise.inject.BindingType; -import javax.inject.ExecutionException; import org.jboss.webbeans.util.reflection.ParameterizedTypeImpl; @@ -409,15 +408,15 @@ } catch (IllegalArgumentException e) { - throw new ExecutionException("Error invoking method " + method.getName() + " on " + method.getDeclaringClass(), e); + throw new RuntimeException("Error invoking method " + method.getName() + " on " + method.getDeclaringClass(), e); } catch (IllegalAccessException e) { - throw new ExecutionException("Error invoking method " + method.getName() + " on " + method.getDeclaringClass(), e); + throw new RuntimeException("Error invoking method " + method.getName() + " on " + method.getDeclaringClass(), e); } catch (InvocationTargetException e) { - throw new ExecutionException("Error invoking method " + method.getName() + " on " + method.getDeclaringClass(), e); + throw new RuntimeException("Error invoking method " + method.getName() + " on " + method.getDeclaringClass(), e); } } @@ -434,11 +433,11 @@ } catch (SecurityException e) { - throw new ExecutionException("Error invoking method " + methodName + " on " + instance.getClass(), e); + throw new RuntimeException("Error invoking method " + methodName + " on " + instance.getClass(), e); } catch (NoSuchMethodException e) { - throw new ExecutionException("Error invoking method " + methodName + " on " + instance.getClass(), e); + throw new RuntimeException("Error invoking method " + methodName + " on " + instance.getClass(), e); } } @@ -457,11 +456,11 @@ } catch (IllegalArgumentException e) { - throw new ExecutionException("Error getting field " + field.getName() + " on " + field.getDeclaringClass(), e); + throw new RuntimeException("Error getting field " + field.getName() + " on " + field.getDeclaringClass(), e); } catch (IllegalAccessException e) { - throw new ExecutionException("Error getting field " + field.getName() + " on " + field.getDeclaringClass(), e); + throw new RuntimeException("Error getting field " + field.getName() + " on " + field.getDeclaringClass(), e); } } @@ -473,11 +472,11 @@ } catch (SecurityException e) { - throw new ExecutionException("Error getting field " + fieldName + " on " + target.getClass(), e); + throw new RuntimeException("Error getting field " + fieldName + " on " + target.getClass(), e); } catch (NoSuchFieldException e) { - throw new ExecutionException("Error getting field " + fieldName + " on " + target.getClass(), e); + throw new RuntimeException("Error getting field " + fieldName + " on " + target.getClass(), e); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/AnnotationImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/AnnotationImpl.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/reflection/AnnotationImpl.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -20,8 +20,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.inject.ExecutionException; - /** * Supports instantiation of annotation type instances. * @@ -109,15 +107,15 @@ } catch (IllegalArgumentException e) { - throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); } catch (IllegalAccessException e) { - throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); } catch (InvocationTargetException e) { - throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); } } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/BeansXmlParser.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/BeansXmlParser.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/BeansXmlParser.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -8,11 +8,12 @@ import java.util.Collections; import java.util.List; -import javax.inject.DeploymentException; +import javax.enterprise.inject.InjectionException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.jboss.webbeans.DeploymentException; import org.jboss.webbeans.resources.spi.ResourceLoader; import org.jboss.webbeans.resources.spi.ResourceLoadingException; import org.jboss.webbeans.util.dom.NodeListIterable; @@ -98,7 +99,7 @@ } catch (ParserConfigurationException e) { - throw new DeploymentException("Error configuring XML parser", e); + throw new InjectionException("Error configuring XML parser", e); } List<XmlElement> deployElements = new ArrayList<XmlElement>(); List<XmlElement> decoratorElements = new ArrayList<XmlElement>(); @@ -114,7 +115,7 @@ } catch (IOException e) { - throw new DeploymentException("Error loading beans.xml " + url.toString(), e); + throw new InjectionException("Error loading beans.xml " + url.toString(), e); } if (fileHasContents) { Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceLoadingException.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceLoadingException.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceLoadingException.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -3,7 +3,6 @@ */ package org.jboss.webbeans.resources.spi; -import javax.inject.ExecutionException; /** @@ -12,7 +11,7 @@ * @author Pete Muir * */ -public class ResourceLoadingException extends ExecutionException +public class ResourceLoadingException extends RuntimeException { private static final long serialVersionUID = 1L; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/AbstractResourceServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/AbstractResourceServices.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/AbstractResourceServices.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -6,7 +6,6 @@ import javax.annotation.Resource; import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.ExecutionException; import javax.naming.Context; import javax.naming.NamingException; @@ -35,7 +34,7 @@ } catch (NamingException e) { - throw new ExecutionException("Error looking up " + name + " in JNDI", e); + throw new RuntimeException("Error looking up " + name + " in JNDI", e); } } @@ -48,7 +47,7 @@ } catch (NamingException e) { - throw new ExecutionException("Error looking up " + name + " in JNDI", e); + throw new RuntimeException("Error looking up " + name + " in JNDI", e); } } Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -8,11 +8,11 @@ import javax.enterprise.context.Dependent; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.InjectionException; import javax.enterprise.inject.deployment.Production; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.DeploymentException; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.literal.CurrentLiteral; @@ -99,7 +99,7 @@ return bean; } - @Test(groups = { "ri-broken" }, expectedExceptions = { DeploymentException.class }) + @Test(groups = { "ri-broken" }, expectedExceptions = { InjectionException.class }) public void testSameBeanTypeInChildAsParentInjection() { BeanManager childActivity = getCurrentManager().createActivity(); @@ -107,7 +107,7 @@ childActivity.addBean(anotherMyBean); } - @Test(groups = { "ri-broken" }, expectedExceptions = { DeploymentException.class }) + @Test(groups = { "ri-broken" }, expectedExceptions = { InjectionException.class }) public void testSameBeanTypeInChildAsIndirectParentInjection() { WebBeansManager childActivity = getCurrentManager().createActivity(); Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -5,12 +5,12 @@ import javax.enterprise.inject.deployment.Production; import javax.enterprise.inject.deployment.Standard; -import javax.inject.DeploymentException; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.webbeans.DeploymentException; import org.jboss.webbeans.mock.MockResourceLoader; import org.jboss.webbeans.test.AbstractWebBeansTest; import org.jboss.webbeans.xml.BeansXmlParser; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/DependentInterceptorSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/DependentInterceptorSerializableTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/DependentInterceptorSerializableTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,15 +1,14 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken1; -import javax.inject.UnserializableDependencyException; - 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.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(UnserializableDependencyException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class DependentInterceptorSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "stub" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,9 +1,8 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken10; -import javax.inject.UnserializableDependencyException; - 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.Packaging; @@ -12,7 +11,7 @@ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(UnserializableDependencyException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/DependentDecoratorSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/DependentDecoratorSerializableTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/DependentDecoratorSerializableTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,15 +1,14 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken3; -import javax.inject.UnserializableDependencyException; - 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.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(UnserializableDependencyException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class DependentDecoratorSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "stub" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/DependentInterceptorSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/DependentInterceptorSerializableTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/DependentInterceptorSerializableTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,15 +1,14 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken4; -import javax.inject.UnserializableDependencyException; - 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.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(UnserializableDependencyException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class DependentInterceptorSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "stub" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/DependentDecoratorSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/DependentDecoratorSerializableTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/DependentDecoratorSerializableTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,14 +1,13 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken5; -import javax.inject.UnserializableDependencyException; - import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(UnserializableDependencyException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class DependentDecoratorSerializableTest { @Test(groups = { "contexts", "passivation", "stub" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,15 +1,14 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken6; -import javax.inject.UnserializableDependencyException; - 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.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(UnserializableDependencyException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,15 +1,14 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken7; -import javax.inject.UnserializableDependencyException; - 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.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(UnserializableDependencyException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,15 +1,14 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken8; -import javax.inject.UnserializableDependencyException; - 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.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(UnserializableDependencyException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/NonSerializableTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/NonSerializableTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,15 +1,14 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken9; -import javax.inject.UnserializableDependencyException; - 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.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(UnserializableDependencyException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -34,7 +34,7 @@ public class FinalBeanClassTest extends AbstractJSR299Test { - @Test(groups="ri-broken") + @Test(groups="broken") @SpecAssertion(section="8.1.2", id="d") public void testAppliesToFinalManagedBeanClass() { Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/Logger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/Logger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/Logger.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -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.decorators.definition.broken.tooManyDecoratorsElements; + +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * @author pmuir + * + */ +public interface Logger +{ + + public static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(Logger.class)); + + public void log(String string); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/Logger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/MockLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/MockLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/MockLogger.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -0,0 +1,41 @@ +/* + * 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.decorators.definition.broken.tooManyDecoratorsElements; + +/** + * @author pmuir + * + */ +public final class MockLogger implements Logger +{ + + private static String log = ""; + + public void log(String string) + { + log += string; + } + + /** + * @return the log + */ + public static String getLog() + { + return log; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/MockLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TimestampLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TimestampLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TimestampLogger.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -0,0 +1,33 @@ +/* + * 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.decorators.definition.broken.tooManyDecoratorsElements; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +/** + * @author pmuir + * + */ +@Decorator +public abstract class TimestampLogger implements Logger +{ + + @Decorates private Logger logger; + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TimestampLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TooManyDecoratorElementsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TooManyDecoratorElementsTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TooManyDecoratorElementsTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -0,0 +1,53 @@ +/* + * 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.decorators.definition.broken.tooManyDecoratorsElements; + +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.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.Resources; +import org.testng.annotations.Test; + +/** + * @author pmuir + * + */ +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +@IntegrationTest +(a)Packaging(PackagingType.WAR) +@Resources({ + @Resource(destination="WEB-INF/classes/META-INF/beans.xml", source="beans.xml"), + @Resource(destination="WEB-INF/beans.xml", source="beans.xml") +}) +public class TooManyDecoratorElementsTest extends AbstractJSR299Test +{ + + @Test(groups="broken") + @SpecAssertion(section="8.2", id="d") + public void testTooManyDecoratorElements() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TooManyDecoratorElementsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/TooManyDeployElementsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/TooManyDeployElementsTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/TooManyDeployElementsTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,10 +1,8 @@ package org.jboss.jsr299.tck.tests.definition.stereotype.broken2; -import javax.inject.DeploymentException; - import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; @@ -13,17 +11,13 @@ import org.jboss.testharness.impl.packaging.Resources; import org.testng.annotations.Test; -/** - * Spec version: 20090519 - */ -@Artifact @IntegrationTest @Packaging(PackagingType.WAR) @Resources({ @Resource(destination="WEB-INF/classes/META-INF/beans.xml", source="default-beans.xml"), @Resource(destination="WEB-INF/beans.xml", source="default-beans.xml") }) -(a)ExpectedDeploymentException(DeploymentException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class TooManyDeployElementsTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -12,7 +12,6 @@ import javax.enterprise.inject.spi.BeanManager; import javax.event.Event; import javax.event.Observer; -import javax.inject.DuplicateBindingTypeException; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -160,7 +159,7 @@ getCurrentManager().fireEvent(anEventOnAnyType); } - @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class }) + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) @SpecAssertion(section = "11.2.8", id = "d") public void testDuplicateBindingsToFireEventFails() throws Exception { @@ -447,7 +446,7 @@ assert false; } - @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class }) + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) @SpecAssertion(section = "11.2.8", id = "d") public void testDuplicateBindingsToFireFails() throws Exception { @@ -463,7 +462,7 @@ }.run(); } - @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class }) + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) @SpecAssertion(section = "11.2.7", id = "d") public void testDuplicateBindingsToObservesFails() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,7 +1,6 @@ package org.jboss.jsr299.tck.tests.event.register.observer1; import javax.event.Observer; -import javax.inject.DuplicateBindingTypeException; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -26,7 +25,7 @@ } } - @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class }) + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) @SpecAssertion(section = "7.3", id = "j") public void testMultipleInstancesOfSameBindingTypeWhenAddingObserverFails() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,7 +1,6 @@ package org.jboss.jsr299.tck.tests.event.resolve.binding; import javax.event.Observer; -import javax.inject.DuplicateBindingTypeException; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -26,7 +25,7 @@ } } - @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class }) + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) @SpecAssertion(section = "7.7", id = "d") public void testDuplicateBindingTypesWhenResolvingFails() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -3,7 +3,6 @@ import static org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE; import javax.enterprise.inject.Instance; -import javax.inject.DuplicateBindingTypeException; import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; @@ -52,7 +51,7 @@ assert injectionPoint.getPaymentProcessor().get() instanceof ChequePaymentProcessor; } - @Test(groups = "ri-broken", expectedExceptions = DuplicateBindingTypeException.class) + @Test(groups = "ri-broken", expectedExceptions = IllegalArgumentException.class) @SpecAssertion(section = "5.5.1", id ="d") public void testDuplicateBindingsThrowsException() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -1,9 +1,8 @@ package org.jboss.jsr299.tck.tests.lookup.injection.nullableBean; -import javax.inject.NullableDependencyException; - 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.testng.annotations.Test; @@ -13,7 +12,7 @@ * Spec version: 20090519 */ @Artifact -(a)ExpectedDeploymentException(NullableDependencyException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class NullableBeanTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-06-23 22:35:55 UTC (rev 2874) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-06-23 23:13:17 UTC (rev 2875) @@ -7,7 +7,6 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.TypeLiteral; import javax.enterprise.inject.spi.Bean; -import javax.inject.DuplicateBindingTypeException; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -45,7 +44,7 @@ getBeans(new TypeLiteral<ParameterizedBean_Broken<T>>(){}); } - @Test(groups = { "resolution", "rewrite" }, expectedExceptions=DuplicateBindingTypeException.class) + @Test(groups = { "resolution", "rewrite" }, expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.1", id = "d") public void testDuplicateBindingTypesUsed() { Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/beans.xml 2009-06-23 23:13:17 UTC (rev 2875) @@ -0,0 +1,5 @@ +<beans> + <decorators> + <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.tooManyDecoratorsElements.TimestampLogger</class> + </decorators> +</beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 10 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2874 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance: specialization/enterprise and 20 other directories.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-06-23 18:35:55 -0400 (Tue, 23 Jun 2009) New Revision: 2874 Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java Log: Upgraded all inheritance tests to the 20090519 version of the spec Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -16,7 +16,7 @@ import org.testng.annotations.Test; /** - * Spec version: PRD2 + * Spec version: 20090519 */ @Artifact @Packaging(PackagingType.EAR) @@ -28,8 +28,8 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "c"), - @SpecAssertion(section = "3.3.7", id = "a") + @SpecAssertion(section = "4.3.1", id = "j"), + @SpecAssertion(section = "3.3.4", id = "aa") }) public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { @@ -42,8 +42,7 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "d"), - @SpecAssertion(section = "3.3.7", id = "a") + @SpecAssertion(section = "4.3.1", id = "k") }) public void testSpecializingBeanHasNameOfSpecializedBean() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -2,32 +2,29 @@ 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.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** - * Spec version: PRD2 + * Spec version: 20090519 */ @Artifact @Packaging(PackagingType.EAR) @BeansXml("beans.xml") -(a)ExpectedDeploymentException(DefinitionError.class) public class InvalidEnterpriseBeanSpecializationTest extends AbstractJSR299Test { @Test(groups={"stub", "specialization"}) - @SpecAssertion(section="3.3.7", id = "a") + @SpecAssertion(section="3.3.4", id = "e") public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean() { assert false; } @Test(groups={"stub", "specialization"}) - @SpecAssertion(section="3.3.7", id = "a") + @SpecAssertion(section="3.3.4", id = "f") public void testSpecializingBeanDoesNotSupportLocalInterfaceView() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -10,6 +10,9 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) @@ -17,8 +20,8 @@ { - @Test(groups={"specialization"}) - @SpecAssertion(section="3.3.7", id = "d") + @Test(groups={"specialization"}) + @SpecAssertion(section="3.3.4", id = "da") public void testSpecializingClassDirectlyExtendsNothing() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -10,6 +10,9 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) @@ -18,7 +21,7 @@ @Test(groups={"specialization"}) - @SpecAssertion(section="3.3.7", id = "d") + @SpecAssertion(section="3.3.4", id = "da") public void testSpecializingClassDirectlyExtendsSimpleBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -10,6 +10,9 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @ExpectedDeploymentException(DefinitionError.class) @Artifact @Packaging(PackagingType.EAR) @@ -17,7 +20,7 @@ { @Test(groups={"specialization"}) - @SpecAssertion(section="3.3.7", id = "d") + @SpecAssertion(section="3.3.4", id = "da") public void testSpecializingClassImplementsInterfaceAndExtendsNothing() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -11,6 +11,9 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) @@ -19,8 +22,8 @@ { - @Test - @SpecAssertion(section = "4.3.1", id = "e") + @Test + @SpecAssertion(section = "4.3.1", id = "l") public void testSpecializingAndSpecializedBeanHasName() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -1,23 +1,25 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence; -import javax.inject.InconsistentSpecializationException; - 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.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(InconsistentSpecializationException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class SamePrecedenceTest extends AbstractJSR299Test { - @Test - @SpecAssertion(section="4.3.3", id = "a") + @Test(groups = "ri-broken") + @SpecAssertion(section="4.3.3", id = "aa") public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -1,9 +1,8 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; -import javax.inject.InconsistentSpecializationException; - 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.Packaging; @@ -11,16 +10,19 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(InconsistentSpecializationException.class) +(a)ExpectedDeploymentException(DeploymentError.class) @BeansXml("beans.xml") public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test { - @Test - @SpecAssertion(section="4.3.3", id = "a") + @Test(groups = "ri-broken") + @SpecAssertion(section="4.3.3", id = "ba") public void testTwoBeansSpecializeTheSameBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -13,7 +13,7 @@ import org.testng.annotations.Test; /** - * Spec version: PRD2 + * Spec version: 20090519 * */ @Artifact @@ -25,34 +25,15 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "c"), - @SpecAssertion(section = "3.4.5", id = "a") + @SpecAssertion(section = "3.4.4", id = "aa") }) - public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() + public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() throws Exception { assert getCurrentManager().getBeans(Product.class, EXPENSIVE_LITERAL).size() == 1; assert getCurrentManager().getBeans(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings().size() == 3; assert annotationSetMatches( getCurrentManager().getBeans(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings(), Expensive.class, Sparkly.class, Any.class); - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "d"), - @SpecAssertion(section = "3.4.5", id = "a") - }) - public void testSpecializingBeanHasNameOfSpecializedBean() - { assert getBeans(Product.class, new AnnotationLiteral<Sparkly>(){}).size() == 1; assert getBeans(Product.class, new AnnotationLiteral<Sparkly>(){}).iterator().next().getName().equals("expensiveGift"); - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "f"), - @SpecAssertion(section = "3.4.5", id = "a") - }) - public void testSpecializedBeanNotInstantiated() throws Exception - { new RunInDependentContext() { @@ -65,5 +46,5 @@ }.run(); } - + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -8,13 +8,16 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class IndirectOverrideTest extends AbstractJSR299Test { - @Test - @SpecAssertion(section="3.4.5", id = "c") + @Test + @SpecAssertion(section="3.4.4", id = "ca") public void testSpecializedMethodIndirectlyOverridesAnotherProducerMethod() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -1,21 +1,23 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence; -import javax.inject.InconsistentSpecializationException; - 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.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact -(a)ExpectedDeploymentException(InconsistentSpecializationException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest extends AbstractJSR299Test { - @Test - @SpecAssertion(section="4.3.1", id = "a") + @Test(groups = "ri-broken") + @SpecAssertion(section="4.3.3", id = "aa") public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -8,13 +8,16 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class SpecializesStaticMethodTest extends AbstractJSR299Test { - @Test - @SpecAssertion(section="3.4.5", id = "b") + @Test + @SpecAssertion(section="3.4.4", id = "ba") public void testSpecializedStaticMethod() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -8,6 +8,9 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractJSR299Test @@ -15,7 +18,7 @@ @Test - @SpecAssertion(section = "4.3.1", id = "d") + @SpecAssertion(section = "4.3.1", id = "l") public void testSpecializingAndSpecializedBeanHasName() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -1,20 +1,22 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; -import javax.inject.InconsistentSpecializationException; - 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.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact -(a)ExpectedDeploymentException(InconsistentSpecializationException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test { - @Test - @SpecAssertion(section="4.3.3", id = "a") + @Test(groups = "ri-broken") + @SpecAssertion(section="4.3.3", id = "ba") public void testTwoBeansSpecializeTheSameBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -14,7 +14,7 @@ import org.testng.annotations.Test; /** - * Spec version: PRD2 + * Spec version: 20090519 * */ @Artifact @@ -29,8 +29,9 @@ @SuppressWarnings("unchecked") @Test @SpecAssertions( { - @SpecAssertion(section = "4.3.1", id = "c"), - @SpecAssertion(section = "3.2.7", id = "a") + @SpecAssertion(section = "4.3.1", id = "i"), + @SpecAssertion(section = "4.3.1", id = "j"), + @SpecAssertion(section = "3.2.5", id = "aa") }) public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { @@ -43,8 +44,8 @@ @Test @SpecAssertions( { - @SpecAssertion(section = "4.3.1", id = "d"), - @SpecAssertion(section = "3.2.7", id = "a") + @SpecAssertion(section = "4.3.1", id = "k"), + @SpecAssertion(section = "3.2.5", id = "aa") }) public void testSpecializingBeanHasNameOfSpecializedBean() { @@ -54,10 +55,6 @@ } @Test - @SpecAssertions( { - @SpecAssertion(section = "4.3.1", id = "f"), - @SpecAssertion(section = "3.2.7", id = "b") - }) public void testSpecializedBeanNotInstantiated() throws Exception { new RunInDependentContext() @@ -74,10 +71,11 @@ } @Test - @SpecAssertion(section = "4.3.1", id = "g") + @SpecAssertions( { + @SpecAssertion(section = "4.3.2", id = "a") + }) public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception { -// deployBeans(Office.class, Building.class); new RunInDependentContext() { @@ -90,5 +88,4 @@ }.run(); } - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -10,13 +10,16 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) - @SpecAssertion(section = "3.2.7", id = "a") + @SpecAssertion(section = "3.2.5", id = "aa") public void testSpecializingClassDirectlyExtendsEnterpriseBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -8,12 +8,15 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class SpecializingAndSpecializedBeanHasNameTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "4.3.1", id = "e") + @SpecAssertion(section = "4.3.1", id = "l") public void testSpecializingAndSpecializedBeanHasName() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -8,12 +8,15 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class SpecializingBeanImplementsInterfaceOnly extends AbstractJSR299Test { @Test(groups = { "specialization" }) - @SpecAssertion(section = "3.2.7", id = "a") + @SpecAssertion(section = "3.2.5", id = "da") public void testSpecializingClassImplementsInterfaceAndExtendsNothing() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -8,12 +8,15 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class SpecializingBeanExtendsNothingTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) - @SpecAssertion(section = "3.2.7", id = "a") + @SpecAssertion(section = "3.2.5", id = "da") public void testSpecializingClassDirectlyExtendsNothing() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -8,12 +8,15 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class SpecializingClassExtendsNonSimpleBeanTest extends AbstractJSR299Test { - @Test(groups = { "specialization", "ri-broken" }) - @SpecAssertion(section = "3.2.7", id = "d") + @Test(groups = { "specialization" }) + @SpecAssertion(section = "3.2.5", id = "da") public void testSpecializingClassExtendsNonSimpleBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -1,19 +1,21 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.precedence; -import javax.inject.InconsistentSpecializationException; - 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.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact -(a)ExpectedDeploymentException(InconsistentSpecializationException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class SpecializingBeanWithLowerPrecedenceTest extends AbstractJSR299Test { - @Test - @SpecAssertion(section="4.3.3", id="a") + @Test(groups = "ri-broken") + @SpecAssertion(section="4.3.3", id="aa") public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-06-23 22:16:27 UTC (rev 2873) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-06-23 22:35:55 UTC (rev 2874) @@ -1,19 +1,21 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two; -import javax.inject.InconsistentSpecializationException; - 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.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact -(a)ExpectedDeploymentException(InconsistentSpecializationException.class) +(a)ExpectedDeploymentException(DeploymentError.class) public class TwoSpecializingBeansForOneSpecializedTest extends AbstractJSR299Test { - @Test - @SpecAssertion(section="4.3.3", id="a") + @Test(groups = "ri-broken") + @SpecAssertion(section="4.3.3", id="ba") public void testTwoBeansSpecializeTheSameBean() { assert false;

14 years, 10 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2873 - ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap and 12 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-23 18:16:27 -0400 (Tue, 23 Jun 2009) New Revision: 2873 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator1.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/Logger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/MockLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/TimestampLogger.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/beans.xml Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/DecoratorResolver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/beans.xml Log: decorator ordering 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-23 21:09:52 UTC (rev 2872) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -202,7 +202,7 @@ */ private transient final ThreadLocal<Stack<InjectionPoint>> currentInjectionPoint; private transient final List<Bean<?>> beans; - private transient final List<Decorator<?>> decorators; + private transient final List<DecoratorBean<?>> decorators; private final transient Namespace rootNamespace; private final transient ConcurrentSetMultiMap<Type, EventObserver<?>> registeredObservers; private final transient Set<BeanManagerImpl> childActivities; @@ -225,7 +225,7 @@ return new BeanManagerImpl( serviceRegistry, new CopyOnWriteArrayList<Bean<?>>(), - new CopyOnWriteArrayList<Decorator<?>>(), + new CopyOnWriteArrayList<DecoratorBean<?>>(), new ConcurrentSetHashMultiMap<Type, EventObserver<?>>(), new Namespace(), new ConcurrentHashMap<Class<?>, EnterpriseBean<?>>(), @@ -273,7 +273,7 @@ * * @param ejbServices the ejbResolver to use */ - private BeanManagerImpl(ServiceRegistry serviceRegistry, List<Bean<?>> beans, List<Decorator<?>> decorators, ConcurrentSetMultiMap<Type, EventObserver<?>> registeredObservers, Namespace rootNamespace, Map<Class<?>, EnterpriseBean<?>> newEnterpriseBeans, Map<String, RIBean<?>> riBeans, ClientProxyProvider clientProxyProvider, ConcurrentListMultiMap<Class<? extends Annotation>, Context> contexts, Set<CurrentActivity> currentActivities, Map<Bean<?>, Bean<?>> specializedBeans, List<Class<? extends Annotation>> enabledDeploymentTypes, List<Class<?>> enabledDecoratorClasses, AtomicInteger ids) + private BeanManagerImpl(ServiceRegistry serviceRegistry, List<Bean<?>> beans, List<DecoratorBean<?>> decorators, ConcurrentSetMultiMap<Type, EventObserver<?>> registeredObservers, Namespace rootNamespace, Map<Class<?>, EnterpriseBean<?>> newEnterpriseBeans, Map<String, RIBean<?>> riBeans, ClientProxyProvider clientProxyProvider, ConcurrentListMultiMap<Class<? extends Annotation>, Context> contexts, Set<CurrentActivity> currentActivities, Map<Bean<?>, Bean<?>> specializedBeans, List<Class<? extends Annotation>> enabledDeploymentTypes, List<Class<?>> enabledDecoratorClasses, AtomicInteger ids) { this.services = serviceRegistry; this.beans = beans; @@ -525,7 +525,7 @@ } if (bean instanceof DecoratorBean) { - decorators.add((Decorator<?>) bean); + decorators.add((DecoratorBean<?>) bean); } riBeans.put(bean.getId(), bean); registerBeanNamespace(bean); @@ -569,7 +569,7 @@ return Collections.unmodifiableList(beans); } - public List<Decorator<?>> getDecorators() + public List<DecoratorBean<?>> getDecorators() { return Collections.unmodifiableList(decorators); } @@ -826,6 +826,7 @@ */ public List<Decorator<?>> resolveDecorators(Set<Type> types, Annotation... bindings) { + // TODO Fix this cast and make the resolver return a list return new ArrayList(decoratorResolver.get(ResolvableFactory.of(types, bindings))); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-06-23 21:09:52 UTC (rev 2872) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -23,6 +23,7 @@ import java.lang.reflect.WildcardType; import java.util.ArrayList; import java.util.Comparator; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -41,6 +42,7 @@ import javax.inject.Obtains; import javax.inject.UnserializableDependencyException; +import org.jboss.webbeans.bean.DecoratorBean; import org.jboss.webbeans.bean.NewEnterpriseBean; import org.jboss.webbeans.bean.NewSimpleBean; import org.jboss.webbeans.bean.RIBean; @@ -149,8 +151,27 @@ throw new UnproxyableResolutionException("Normal scoped bean " + bean + " is not proxyable"); } } - + + validateEnabledDecoratorClasses(); + } + + private void validateEnabledDecoratorClasses() + { + // TODO Move building this list to the boot or sth + Set<Class<?>> decoratorBeanClasses = new HashSet<Class<?>>(); + for (DecoratorBean<?> bean : manager.getDecorators()) + { + decoratorBeanClasses.add(bean.getType()); + } + for (Class<?> clazz : manager.getEnabledDecoratorClasses()) + { + if (!decoratorBeanClasses.contains(clazz)) + { + throw new DeploymentException("Enabled decorator " + clazz + " is not the bean class of at least one decorator (detected decorators " + decoratorBeanClasses + ")"); + } + } + } private boolean hasHigherPrecedence(Class<? extends Annotation> deploymentType, Class<? extends Annotation> otherDeploymentType) { 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-23 21:09:52 UTC (rev 2872) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -207,8 +207,8 @@ registerBeans(getServices().get(WebBeanDiscovery.class).discoverWebBeanClasses(), ejbDescriptors); fireAfterBeanDiscoveryEvent(); log.debug("Web Beans initialized. Validating beans."); - manager.getResolver().resolveInjectionPoints(); new BeanValidator(manager).validate(); + // TODO I don't really think this is needed anymore, as we validate all points manager.getResolver().resolveInjectionPoints(); fireAfterDeploymentValidationEvent(); endDeploy(requestBeanStore); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/DecoratorResolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/DecoratorResolver.java 2009-06-23 21:09:52 UTC (rev 2872) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/DecoratorResolver.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -18,8 +18,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.util.Comparator; import java.util.List; import java.util.Set; +import java.util.TreeSet; import javax.enterprise.inject.spi.Bean; @@ -61,5 +63,32 @@ { return bean.getDelegateTypes(); } + + @Override + protected Set<Bean<?>> sortBeans(Set<Bean<?>> matchedBeans) + { + Set<Bean<?>> sortedBeans = new TreeSet<Bean<?>>(new Comparator<Bean<?>>() + { + + public int compare(Bean<?> o1, Bean<?> o2) + { + if (o1 instanceof DecoratorBean && o2 instanceof DecoratorBean) + { + List<Class<?>> enabledDecorators = getManager().getEnabledDecoratorClasses(); + int p1 = enabledDecorators.indexOf(((DecoratorBean<?>) o1).getType()); + int p2 = enabledDecorators.indexOf(((DecoratorBean<?>) o2).getType()); + return p1 - p2; + } + else + { + throw new IllegalStateException("Unable to process non container generated decorator!"); + } + + } + + }); + sortedBeans.addAll(matchedBeans); + return sortedBeans; + } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java 2009-06-23 21:09:52 UTC (rev 2872) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -86,7 +86,7 @@ private ConcurrentCache<String, Set<Bean<?>>> resolvedNames; // The beans to search - private final List<? extends Bean<?>> beans; + private final List<? extends Bean<?>> allBeans; // The Web Beans manager private final BeanManagerImpl manager; @@ -98,10 +98,10 @@ * Constructor * */ - public Resolver(BeanManagerImpl manager, List<? extends Bean<?>> beans) + public Resolver(BeanManagerImpl manager, List<? extends Bean<?>> allBeans) { this.manager = manager; - this.beans = beans; + this.allBeans = allBeans; this.injectionPoints = new HashSet<WBAnnotated<?, ?>>(); this.resolvedInjectionPoints = new ConcurrentCache<Resolvable, Set<Bean<?>>>(); this.resolvedNames = new ConcurrentCache<String, Set<Bean<?>>>(); @@ -144,7 +144,9 @@ { public Set<Bean<?>> call() throws Exception { - return retainHighestPrecedenceBeans(getMatchingBeans(wrapped), manager.getEnabledDeploymentTypes()); + Set<Bean<?>> matchedBeans = getMatchingBeans(wrapped); + matchedBeans = retainHighestPrecedenceBeans(matchedBeans); + return sortBeans(matchedBeans); } }; @@ -208,19 +210,26 @@ public Set<Bean<? extends Object>> call() throws Exception { Set<Bean<?>> matchedBeans = new HashSet<Bean<?>>(); - for (Bean<?> bean : beans) + for (Bean<?> bean : allBeans) { if ((bean.getName() == null && name == null) || (bean.getName() != null && bean.getName().equals(name))) { matchedBeans.add(bean); } } - return retainHighestPrecedenceBeans(matchedBeans, manager.getEnabledDeploymentTypes()); + matchedBeans = retainHighestPrecedenceBeans(matchedBeans); + return sortBeans(matchedBeans); } }); } + + protected Set<Bean<?>> sortBeans(Set<Bean<?>> matchedBeans) + { + return matchedBeans; + } + /** * Filters out the beans with the highest enabled deployment type * @@ -229,16 +238,16 @@ * @param enabledDeploymentTypes The enabled deployment types * @return The filtered beans */ - private static Set<Bean<?>> retainHighestPrecedenceBeans(Set<Bean<?>> beans, List<Class<? extends Annotation>> enabledDeploymentTypes) + protected Set<Bean<?>> retainHighestPrecedenceBeans(Set<Bean<?>> beans) { if (beans.size() > 0) { - SortedSet<Class<? extends Annotation>> possibleDeploymentTypes = new TreeSet<Class<? extends Annotation>>(new ListComparator<Class<? extends Annotation>>(enabledDeploymentTypes)); + SortedSet<Class<? extends Annotation>> possibleDeploymentTypes = new TreeSet<Class<? extends Annotation>>(new ListComparator<Class<? extends Annotation>>(manager.getEnabledDeploymentTypes())); for (Bean<?> bean : beans) { possibleDeploymentTypes.add(bean.getDeploymentType()); } - possibleDeploymentTypes.retainAll(enabledDeploymentTypes); + possibleDeploymentTypes.retainAll(manager.getEnabledDeploymentTypes()); Set<Bean<?>> trimmed = new HashSet<Bean<?>>(); if (possibleDeploymentTypes.size() > 0) { @@ -271,7 +280,7 @@ private Set<Bean<?>> getMatchingBeans(MatchingResolvable resolvable) { Set<Bean<?>> resolvedBeans = new HashSet<Bean<?>>(); - for (Bean<?> bean : beans) + for (Bean<?> bean : allBeans) { if (matches(resolvable, bean)) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-06-23 21:09:52 UTC (rev 2872) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -173,7 +173,8 @@ } @Test(groups = { "contexts", "passivation", "enterpriseBean", "integration" }) - @SpecAssertion(section = "8.4", id = "a") + //@SpecAssertion(section = "8.4", id = "a") + @SpecAssertion(section = "unknown", id = "unknown") public void testEJBWebBeanCanDeclarePassivatingScope() { assert getBeans(TurkuLocal.class).size() == 1; Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator1.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator1.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator1.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -0,0 +1,32 @@ +/* + * 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.decorators.definition; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +/** + * @author pmuir + * + */ +@Decorator +public class BazDecorator1 implements Baz +{ + + @Decorates Bazt bazt; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator1.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-06-23 21:09:52 UTC (rev 2872) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -47,7 +47,8 @@ @SpecAssertion(section="8.1", id="a"), @SpecAssertion(section="8.1", id="d"), @SpecAssertion(section="8.1.1", id="a"), - @SpecAssertion(section="8.1.3", id="c") + @SpecAssertion(section="8.1.3", id="c"), + @SpecAssertion(section="8.3", id="a") }) public void testDecoratorIsManagedBean() @@ -99,8 +100,22 @@ public void testDecoratorDoesNotImplementDelegateType() { List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Baz.TYPES); - assert decorators.size() == 2; + assert decorators.size() == 3; } + + @Test + @SpecAssertions({ + @SpecAssertion(section="8.2", id="b"), + @SpecAssertion(section="8.3", id="a") + }) + public void testDecoratorOrdering() + { + List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Baz.TYPES); + assert decorators.get(0).getTypes().contains(BazDecorator.class); + assert decorators.get(1).getTypes().contains(BazDecorator1.class); + assert decorators.get(2).getTypes().contains(FooDecorator.class); + assert decorators.size() == 3; + } @Test @SpecAssertion(section="8.2", id="a") Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -0,0 +1,44 @@ +/* + * 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.decorators.definition.broken.enabledDecoratorIsNotDecorator; + +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.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * @author pmuir + * + */ +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +@BeansXml("beans.xml") +public class EnabledDecoratorNotADecoratorTest extends AbstractJSR299Test +{ + + @Test + @SpecAssertion(section="8.2", id="c") + public void testEnabledDecoratorNotADecoratorTest() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/Logger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/Logger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/Logger.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -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.decorators.definition.broken.enabledDecoratorIsNotDecorator; + +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * @author pmuir + * + */ +public interface Logger +{ + + public static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(Logger.class)); + + public void log(String string); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/Logger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/MockLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/MockLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/MockLogger.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -0,0 +1,41 @@ +/* + * 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.decorators.definition.broken.enabledDecoratorIsNotDecorator; + +/** + * @author pmuir + * + */ +public class MockLogger implements Logger +{ + + private static String log = ""; + + public void log(String string) + { + log += string; + } + + /** + * @return the log + */ + public static String getLog() + { + return log; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/MockLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/TimestampLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/TimestampLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/TimestampLogger.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -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.jsr299.tck.tests.decorators.definition.broken.enabledDecoratorIsNotDecorator; + + +/** + * @author pmuir + * + */ +public abstract class TimestampLogger implements Logger +{ + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/TimestampLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-06-23 21:09:52 UTC (rev 2872) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -21,6 +21,7 @@ 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; /** @@ -29,6 +30,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@BeansXml("beans.xml") public class FinalBeanClassTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-06-23 21:09:52 UTC (rev 2872) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -21,6 +21,7 @@ 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; /** @@ -29,6 +30,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@BeansXml("beans.xml") public class MultipleDelegateInjectionPointsTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-06-23 21:09:52 UTC (rev 2872) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -21,6 +21,7 @@ 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; /** @@ -29,6 +30,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@BeansXml("beans.xml") public class NoDelegateInjectionPointsTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-06-23 21:09:52 UTC (rev 2872) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-06-23 22:16:27 UTC (rev 2873) @@ -21,6 +21,7 @@ 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; /** @@ -29,6 +30,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionError.class) +@BeansXml("beans.xml") public class NotAllDecoratedTypesImplementedTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/beans.xml 2009-06-23 21:09:52 UTC (rev 2872) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/beans.xml 2009-06-23 22:16:27 UTC (rev 2873) @@ -1,6 +1,7 @@ <beans> <decorators> <class>org.jboss.jsr299.tck.tests.decorators.definition.BazDecorator</class> + <class>org.jboss.jsr299.tck.tests.decorators.definition.BazDecorator1</class> <class>org.jboss.jsr299.tck.tests.decorators.definition.FooDecorator</class> <class>org.jboss.jsr299.tck.tests.decorators.definition.TimestampLogger</class> </decorators> Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/beans.xml 2009-06-23 22:16:27 UTC (rev 2873) @@ -0,0 +1,5 @@ +<beans> + <decorators> + <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.enabledDecoratorIsNotDecorator.TimestampLogger</class> + </decorators> +</beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 10 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2872 - ri/trunk/impl/src/main/java/org/jboss/webbeans/bean and 23 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-23 17:09:52 -0400 (Tue, 23 Jun 2009) New Revision: 2872 Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/DecoratorResolver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/AbstractFooDecorator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Bar.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Baz.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Bazt.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BaztImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Boo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/CowShed.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Field.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldDecorator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Foo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBar.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBarImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Logger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Meta.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/MockLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/TimestampLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/Logger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/MockLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/TimestampLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/Logger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MockLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/Logger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/MockLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/TimestampLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/EnhancedLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/Logger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/MockLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/AnimalImpl.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/beans.xml Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableFactory.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/BeansXmlParser.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: Various decorator tests 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-23 20:42:32 UTC (rev 2871) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -80,6 +80,7 @@ import org.jboss.webbeans.event.EventObserver; import org.jboss.webbeans.event.ObserverImpl; import org.jboss.webbeans.injection.NonContextualInjector; +import org.jboss.webbeans.injection.resolution.DecoratorResolver; import org.jboss.webbeans.injection.resolution.ResolvableFactory; import org.jboss.webbeans.injection.resolution.ResolvableWBClass; import org.jboss.webbeans.injection.resolution.Resolver; @@ -110,10 +111,10 @@ private static class CurrentActivity { - + private final Context context; - private final BeanManagerImpl manager; - + private final BeanManagerImpl manager; + public CurrentActivity(Context context, BeanManagerImpl manager) { this.context = context; @@ -164,14 +165,14 @@ public static final String JNDI_KEY = "java:app/Manager"; /* - * Application scoped services - * **************************** - */ + * Application scoped services + * *************************** + */ private transient final ExecutorService taskExecutor = Executors.newSingleThreadExecutor(); private transient final ServiceRegistry services; - + /* - * Application scoped data structures + * Application scoped data structures * *********************************** */ private transient List<Class<? extends Annotation>> enabledDeploymentTypes; @@ -184,19 +185,19 @@ private transient final Map<String, RIBean<?>> riBeans; private final transient Map<Bean<?>, Bean<?>> specializedBeans; private final transient AtomicInteger ids; - + /* - * Activity scoped services + * Activity scoped services * ************************* - */ + */ private transient final EventManager eventManager; private transient final Resolver resolver; private transient final Resolver decoratorResolver; private final transient NonContextualInjector nonContextualInjector; private final transient ELResolver webbeansELResolver; - + /* - * Activity scoped data structures + * Activity scoped data structures * ******************************** */ private transient final ThreadLocal<Stack<InjectionPoint>> currentInjectionPoint; @@ -206,8 +207,7 @@ private final transient ConcurrentSetMultiMap<Type, EventObserver<?>> registeredObservers; private final transient Set<BeanManagerImpl> childActivities; private final Integer id; - - + /** * Create a new, root, manager * @@ -220,23 +220,23 @@ defaultEnabledDeploymentTypes.add(0, Standard.class); defaultEnabledDeploymentTypes.add(1, Production.class); + List<Class<?>> defaultEnabledDecoratorClasses = new ArrayList<Class<?>>(); + return new BeanManagerImpl( serviceRegistry, - new CopyOnWriteArrayList<Bean<?>>(), + new CopyOnWriteArrayList<Bean<?>>(), new CopyOnWriteArrayList<Decorator<?>>(), new ConcurrentSetHashMultiMap<Type, EventObserver<?>>(), new Namespace(), new ConcurrentHashMap<Class<?>, EnterpriseBean<?>>(), - new ConcurrentHashMap<String, RIBean<?>>(), - new ClientProxyProvider(), + new ConcurrentHashMap<String, RIBean<?>>(), + new ClientProxyProvider(), new ConcurrentListHashMultiMap<Class<? extends Annotation>, Context>(), - new CopyOnWriteArraySet<CurrentActivity>(), - new HashMap<Bean<?>, Bean<?>>(), - defaultEnabledDeploymentTypes, - new AtomicInteger() - ); + new CopyOnWriteArraySet<CurrentActivity>(), + new HashMap<Bean<?>, Bean<?>>(), defaultEnabledDeploymentTypes, defaultEnabledDecoratorClasses, + new AtomicInteger()); } - + /** * Create a new child manager * @@ -251,44 +251,29 @@ ConcurrentSetMultiMap<Type, EventObserver<?>> registeredObservers = new ConcurrentSetHashMultiMap<Type, EventObserver<?>>(); registeredObservers.deepPutAll(parentManager.getRegisteredObservers()); Namespace rootNamespace = new Namespace(parentManager.getRootNamespace()); - + return new BeanManagerImpl( - parentManager.getServices(), - beans, - parentManager.getDecorators(), - registeredObservers, - rootNamespace, + parentManager.getServices(), + beans, parentManager.getDecorators(), + registeredObservers, rootNamespace, parentManager.getNewEnterpriseBeanMap(), - parentManager.getRiBeans(), - parentManager.getClientProxyProvider(), - parentManager.getContexts(), - parentManager.getCurrentActivities(), - parentManager.getSpecializedBeans(), - parentManager.getEnabledDeploymentTypes(), - parentManager.getIds() - ); + parentManager.getRiBeans(), + parentManager.getClientProxyProvider(), + parentManager.getContexts(), + parentManager.getCurrentActivities(), + parentManager.getSpecializedBeans(), + parentManager.getEnabledDeploymentTypes(), + parentManager.getEnabledDecoratorClasses(), + parentManager.getIds()); } /** * Create a new manager + * @param enabledDecoratorClasses * * @param ejbServices the ejbResolver to use */ - private BeanManagerImpl( - ServiceRegistry serviceRegistry, - List<Bean<?>> beans, - List<Decorator<?>> decorators, - ConcurrentSetMultiMap<Type, EventObserver<?>> registeredObservers, - Namespace rootNamespace, - Map<Class<?>, EnterpriseBean<?>> newEnterpriseBeans, - Map<String, RIBean<?>> riBeans, - ClientProxyProvider clientProxyProvider, - ConcurrentListMultiMap<Class<? extends Annotation>, Context> contexts, - Set<CurrentActivity> currentActivities, - Map<Bean<?>, Bean<?>> specializedBeans, - List<Class<? extends Annotation>> enabledDeploymentTypes, - AtomicInteger ids - ) + private BeanManagerImpl(ServiceRegistry serviceRegistry, List<Bean<?>> beans, List<Decorator<?>> decorators, ConcurrentSetMultiMap<Type, EventObserver<?>> registeredObservers, Namespace rootNamespace, Map<Class<?>, EnterpriseBean<?>> newEnterpriseBeans, Map<String, RIBean<?>> riBeans, ClientProxyProvider clientProxyProvider, ConcurrentListMultiMap<Class<? extends Annotation>, Context> contexts, Set<CurrentActivity> currentActivities, Map<Bean<?>, Bean<?>> specializedBeans, List<Class<? extends Annotation>> enabledDeploymentTypes, List<Class<?>> enabledDecoratorClasses, AtomicInteger ids) { this.services = serviceRegistry; this.beans = beans; @@ -301,12 +286,13 @@ this.specializedBeans = specializedBeans; this.registeredObservers = registeredObservers; setEnabledDeploymentTypes(enabledDeploymentTypes); + setEnabledDecoratorClasses(enabledDecoratorClasses); this.rootNamespace = rootNamespace; this.ids = ids; this.id = ids.incrementAndGet(); - + this.resolver = new Resolver(this, beans); - this.decoratorResolver = new Resolver(this, decorators); + this.decoratorResolver = new DecoratorResolver(this, decorators); this.eventManager = new EventManager(this); this.nonContextualInjector = new NonContextualInjector(this); this.webbeansELResolver = new WebBeansELResolverImpl(this); @@ -426,6 +412,14 @@ } /** + * @return the enabledDecoratorClasses + */ + public List<Class<?>> getEnabledDecoratorClasses() + { + return Collections.unmodifiableList(enabledDecoratorClasses); + } + + /** * Set the enabled deployment types * * @param enabledDeploymentTypes @@ -446,7 +440,6 @@ { this.enabledInterceptorClasses = enabledInterceptorClasses; } - public Set<Bean<?>> getBeans(Type beanType, Annotation... bindings) { @@ -480,7 +473,7 @@ return resolver.get(ResolvableFactory.of(element)); } - public Set<Bean<?>> getBeans(InjectionPoint injectionPoint) + public Set<Bean<?>> getInjectableBeans(InjectionPoint injectionPoint) { boolean registerInjectionPoint = !injectionPoint.getType().equals(InjectionPoint.class); try @@ -490,7 +483,16 @@ currentInjectionPoint.get().push(injectionPoint); } // TODO Do this properly - return getBeans(ResolvableWBClass.of(injectionPoint.getType(), injectionPoint.getBindings().toArray(new Annotation[0]), this)); + Set<Bean<?>> beans = getBeans(ResolvableWBClass.of(injectionPoint.getType(), injectionPoint.getBindings().toArray(new Annotation[0]), this)); + Set<Bean<?>> injectableBeans = new HashSet<Bean<?>>(); + for (Bean<?> bean : beans) + { + if (!(bean instanceof Decorator || bean instanceof Interceptor)) + { + injectableBeans.add(bean); + } + } + return injectableBeans; } finally { @@ -523,7 +525,7 @@ } if (bean instanceof DecoratorBean) { - decorators.add(DecoratorBean.wrapForResolver((Decorator<?>) bean)); + decorators.add((Decorator<?>) bean); } riBeans.put(bean.getId(), bean); registerBeanNamespace(bean); @@ -590,10 +592,9 @@ contexts.put(context.getScopeType(), context); } - public void addObserver(Observer<?> observer, Annotation... bindings) { - addObserver(observer,eventManager.getTypeOfObserver(observer),bindings); + addObserver(observer, eventManager.getTypeOfObserver(observer), bindings); } /** @@ -609,15 +610,12 @@ public void addObserver(ObserverMethod<?, ?> observerMethod) { - addObserver((Observer<?>)observerMethod, observerMethod.getObservedEventType(), - new ArrayList<Annotation>(observerMethod.getObservedEventBindings()).toArray(new Annotation[0])); - + addObserver(observerMethod, observerMethod.getObservedEventType(), new ArrayList<Annotation>(observerMethod.getObservedEventBindings()).toArray(new Annotation[0])); } - /** * Does the actual observer registration - * + * * @param observer * @param eventType * @param bindings @@ -638,7 +636,6 @@ eventManager.removeObserver(observer); } - /** * Fires an event object with given event object for given bindings * @@ -722,15 +719,15 @@ return getContext(bean.getScopeType()).get((Bean) bean, creationalContext); } } - /* - * TODO this is not correct, as the current implementation of getInstance does not - * pay attention to what type the resulting instance needs to implement + * TODO this is not correct, as the current implementation of getInstance + * does not pay attention to what type the resulting instance needs to + * implement */ public Object getReference(Bean<?> bean, Type beanType) { - return getInjectableReference(bean, CreationalContextImpl.of(bean)); + return getInjectableReference(bean, CreationalContextImpl.of(bean)); } @SuppressWarnings("unchecked") @@ -824,11 +821,12 @@ * @param bindings The binding types to match * @return A list of matching decorators * - * @see javax.enterprise.inject.spi.BeanManager#resolveDecorators(java.util.Set, java.lang.annotation.Annotation[]) + * @see javax.enterprise.inject.spi.BeanManager#resolveDecorators(java.util.Set, + * java.lang.annotation.Annotation[]) */ public List<Decorator<?>> resolveDecorators(Set<Type> types, Annotation... bindings) { - throw new UnsupportedOperationException(); + return new ArrayList(decoratorResolver.get(ResolvableFactory.of(types, bindings))); } public List<Decorator<?>> resolveDecorators(Bean<?> bean) @@ -910,7 +908,7 @@ if (activeCurrentActivities.size() == 0) { return CurrentManager.rootManager(); - } + } else if (activeCurrentActivities.size() == 1) { return activeCurrentActivities.get(0).getManager(); @@ -1041,7 +1039,6 @@ return rootNamespace; } - public <T> InjectionTarget<T> createInjectionTarget(Class<T> type) { throw new UnsupportedOperationException("Not yet implemented"); @@ -1062,8 +1059,6 @@ throw new UnsupportedOperationException("Not yet implemented"); } - - public <X> Bean<? extends X> getMostSpecializedBean(Bean<X> bean) { Bean<?> key = bean; @@ -1078,15 +1073,12 @@ return (Bean<X>) key; } - public void validate(InjectionPoint injectionPoint) { throw new UnsupportedOperationException("Not yet implemented"); } - - public Set<Annotation> getInterceptorBindingTypeDefinition( - Class<? extends Annotation> bindingType) + public Set<Annotation> getInterceptorBindingTypeDefinition(Class<? extends Annotation> bindingType) { throw new UnsupportedOperationException("Not yet implemented"); } @@ -1101,8 +1093,7 @@ throw new UnsupportedOperationException("Not yet implemented"); } - public Set<Annotation> getStereotypeDefinition( - Class<? extends Annotation> stereotype) + public Set<Annotation> getStereotypeDefinition(Class<? extends Annotation> stereotype) { throw new UnsupportedOperationException("Not yet implemented"); } @@ -1112,8 +1103,7 @@ throw new UnsupportedOperationException("Not yet implemented"); } - public boolean isInterceptorBindingType( - Class<? extends Annotation> annotationType) + public boolean isInterceptorBindingType(Class<? extends Annotation> annotationType) { throw new UnsupportedOperationException("Not yet implemented"); } @@ -1130,32 +1120,32 @@ public <X> Bean<? extends X> getHighestPrecedenceBean(Set<Bean<? extends X>> beans) { - if (beans.size() == 1) - { - return beans.iterator().next(); - } - else if (beans.isEmpty()) - { - return null; - } - - // make a copy so that the sort is stable with respect to new deployment types added through the SPI - // TODO This code needs to be in Resolver - // TODO This needs caching + if (beans.size() == 1) + { + return beans.iterator().next(); + } + else if (beans.isEmpty()) + { + return null; + } + + // make a copy so that the sort is stable with respect to new deployment types added through the SPI + // TODO This code needs to be in Resolver + // TODO This needs caching final List<Class<? extends Annotation>> enabledDeploymentTypes = getEnabledDeploymentTypes(); - - SortedSet<Bean<? extends X>> sortedBeans = new TreeSet<Bean<? extends X>>(new Comparator<Bean<? extends X>>() - { - public int compare(Bean<? extends X> o1, Bean<? extends X> o2) - { - int diff = enabledDeploymentTypes.indexOf(o1) - enabledDeploymentTypes.indexOf(o2); - if (diff == 0) - { - throw new AmbiguousResolutionException(); - } - return diff; - } - }); + + SortedSet<Bean<? extends X>> sortedBeans = new TreeSet<Bean<? extends X>>(new Comparator<Bean<? extends X>>() + { + public int compare(Bean<? extends X> o1, Bean<? extends X> o2) + { + int diff = enabledDeploymentTypes.indexOf(o1) - enabledDeploymentTypes.indexOf(o2); + if (diff == 0) + { + throw new AmbiguousResolutionException(); + } + return diff; + } + }); sortedBeans.addAll(beans); return sortedBeans.last(); } @@ -1164,7 +1154,5 @@ { return webbeansELResolver; } - - - + } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-06-23 20:42:32 UTC (rev 2871) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -104,7 +104,7 @@ checkFacadeInjectionPoint(injectionPoint, Any.class, Event.class); Annotation[] bindings = injectionPoint.getBindings().toArray(new Annotation[0]); WBAnnotated<?, ?> annotatedItem = ResolvableWBClass.of(injectionPoint.getType(), bindings, manager); - Set<?> resolvedBeans = manager.getBeans(injectionPoint); + Set<?> resolvedBeans = manager.getInjectableBeans(injectionPoint); if (resolvedBeans.isEmpty()) { throw new UnsatisfiedResolutionException("The injection point " + injectionPoint + " with binding types " + Names.annotationsToString(injectionPoint.getBindings()) + " in " + bean + " has unsatisfied dependencies with binding types "); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java 2009-06-23 20:42:32 UTC (rev 2871) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -64,6 +64,7 @@ private WBAnnotated<?, ?> decorates; private Set<Annotation> delegateBindings; private Type delegateType; + private Set<Type> delegateTypes; private Set<Type> decoratedTypes; protected DecoratorBean(WBClass<T> type, BeanManagerImpl manager) @@ -81,6 +82,7 @@ initDecoratedTypes(); initDelegateBindings(); initDelegateType(); + checkDelegateType(); } } @@ -124,6 +126,7 @@ protected void initDelegateType() { this.delegateType = this.decorates.getBaseType(); + this.delegateTypes = this.decorates.getTypeClosure(); } protected void checkDelegateType() @@ -174,4 +177,14 @@ return decoratedTypes; } + /** + * The type closure of the delegate type + * + * @return the delegateTypes + */ + public Set<Type> getDelegateTypes() + { + return delegateTypes; + } + } Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/DecoratorResolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/DecoratorResolver.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/DecoratorResolver.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,65 @@ +/* + * 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.injection.resolution; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.List; +import java.util.Set; + +import javax.enterprise.inject.spi.Bean; + +import org.jboss.webbeans.BeanManagerImpl; +import org.jboss.webbeans.bean.DecoratorBean; + +/** + * @author pmuir + * + */ +public class DecoratorResolver extends Resolver +{ + + public DecoratorResolver(BeanManagerImpl manager, List<? extends Bean<?>> beans) + { + super(manager, beans); + } + + @Override + protected boolean matches(MatchingResolvable resolvable, Bean<?> bean) + { + if (bean instanceof DecoratorBean) + { + DecoratorBean<?> decoratorBean = (DecoratorBean<?>) bean; + return resolvable.matches(getBeanTypes(decoratorBean), getBeanBindings(decoratorBean)) && getManager().getEnabledDecoratorClasses().contains(decoratorBean.getType()); + } + else + { + throw new IllegalStateException("Unable to process non container generated decorator!"); + } + } + + private Set<Annotation> getBeanBindings(DecoratorBean<?> bean) + { + return bean.getDelegateBindings(); + } + + private Set<Type> getBeanTypes(DecoratorBean<?> bean) + { + return bean.getDelegateTypes(); + } + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/DecoratorResolver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableFactory.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableFactory.java 2009-06-23 20:42:32 UTC (rev 2871) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableFactory.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -2,6 +2,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.util.Arrays; import java.util.HashSet; import java.util.Set; @@ -25,6 +26,16 @@ } } + public static Resolvable of(Set<Type> typeClosure, Set<Annotation> bindings) + { + return new ResolvableImpl(bindings, typeClosure); + } + + public static Resolvable of(Set<Type> typeClosure, Annotation... bindings) + { + return new ResolvableImpl(new HashSet<Annotation>(Arrays.asList(bindings)), typeClosure); + } + private ResolvableFactory() {} private static class ResolvableImpl implements Resolvable Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java 2009-06-23 20:42:32 UTC (rev 2871) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -47,7 +47,7 @@ { private static final long serialVersionUID = 1L; - private static abstract class MatchingResolvable extends ForwardingResolvable + protected static abstract class MatchingResolvable extends ForwardingResolvable { private final BeanManagerImpl manager; @@ -144,7 +144,7 @@ { public Set<Bean<?>> call() throws Exception { - return retainHighestPrecedenceBeans(getMatchingBeans(wrapped, beans), manager.getEnabledDeploymentTypes()); + return retainHighestPrecedenceBeans(getMatchingBeans(wrapped), manager.getEnabledDeploymentTypes()); } }; @@ -207,7 +207,6 @@ public Set<Bean<? extends Object>> call() throws Exception { - Set<Bean<?>> matchedBeans = new HashSet<Bean<?>>(); for (Bean<?> bean : beans) { @@ -221,8 +220,6 @@ }); } - - /** * Filters out the beans with the highest enabled deployment type @@ -271,12 +268,12 @@ * @param beans The beans to filter * @return A set of filtered beans */ - private static Set<Bean<?>> getMatchingBeans(MatchingResolvable resolvable, List<? extends Bean<?>> beans) + private Set<Bean<?>> getMatchingBeans(MatchingResolvable resolvable) { Set<Bean<?>> resolvedBeans = new HashSet<Bean<?>>(); for (Bean<?> bean : beans) { - if (resolvable.matches(bean.getTypes(), bean.getBindings())) + if (matches(resolvable, bean)) { resolvedBeans.add(bean); } @@ -284,6 +281,11 @@ return resolvedBeans; } + protected boolean matches(MatchingResolvable resolvable, Bean<?> bean) + { + return resolvable.matches(bean.getTypes(), bean.getBindings()); + } + /** * Gets a string representation * @@ -300,4 +302,9 @@ return buffer.toString(); } + protected BeanManagerImpl getManager() + { + return manager; + } + } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/BeansXmlParser.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/BeansXmlParser.java 2009-06-23 20:42:32 UTC (rev 2871) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/BeansXmlParser.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -141,12 +141,12 @@ } if (child instanceof Element && "interceptors".equals(child.getNodeName())) { - decoratorElements.add(new XmlElement(url, (Element) child)); + interceptorElements.add(new XmlElement(url, (Element) child)); } - + if (child instanceof Element && "decorators".equals(child.getNodeName())) { - interceptorElements.add(new XmlElement(url, (Element) child)); + decoratorElements.add(new XmlElement(url, (Element) child)); } } } @@ -171,7 +171,7 @@ enabledDecoratorClasses = new ArrayList<Class<?>>(); enabledDecoratorClasses.addAll(processElement(resourceLoader, decoratorElements.get(0))); } - + if (interceptorElements.size() > 1) { throw new DeploymentException("<interceptor> can only be specified once, but it is specified muliple times " + interceptorElements); @@ -228,7 +228,7 @@ { try { - list.add(resourceLoader.classForName(className).asSubclass(Annotation.class)); + list.add(resourceLoader.classForName(className)); } catch (ResourceLoadingException e) { Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/AbstractFooDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/AbstractFooDecorator.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/AbstractFooDecorator.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,26 @@ +/* + * 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.decorators.definition; + +/** + * @author pmuir + * + */ +public class AbstractFooDecorator implements Boo +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/AbstractFooDecorator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Bar.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Bar.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Bar.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,26 @@ +/* + * 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.decorators.definition; + +/** + * @author pmuir + * + */ +public interface Bar +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Bar.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Baz.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Baz.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Baz.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,33 @@ +/* + * 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.decorators.definition; + +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * @author pmuir + * + */ +public interface Baz +{ + + public static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(Baz.class)); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Baz.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,32 @@ +/* + * 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.decorators.definition; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +/** + * @author pmuir + * + */ +@Decorator +public class BazDecorator implements Baz +{ + + @Decorates Bazt bazt; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BazDecorator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Bazt.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Bazt.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Bazt.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,33 @@ +/* + * 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.decorators.definition; + +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * @author pmuir + * + */ +public interface Bazt extends Baz +{ + + public static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(Bazt.class)); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Bazt.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BaztImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BaztImpl.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BaztImpl.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,26 @@ +/* + * 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.decorators.definition; + +/** + * @author pmuir + * + */ +public class BaztImpl implements Bazt +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/BaztImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Boo.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Boo.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Boo.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,26 @@ +/* + * 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.decorators.definition; + +/** + * @author pmuir + * + */ +public interface Boo +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Boo.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/CowShed.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/CowShed.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/CowShed.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,39 @@ +/* + * 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.decorators.definition; + +import javax.enterprise.inject.Current; + +/** + * @author pmuir + * + */ +public class CowShed +{ + + @Current Logger logger; + + @Current Foo foo; + + @Current Bar bar; + + public void milk() + { + logger.log("milked"); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/CowShed.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,116 @@ +/* + * 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.decorators.definition; + +import java.io.Serializable; +import java.util.List; +import java.util.Set; + +import javax.decorator.Decorates; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.Decorator; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * @author pmuir + * + */ +@Artifact +@BeansXml("beans.xml") +public class DecoratorDefinitionTest extends AbstractJSR299Test +{ + + @Test + @SpecAssertions + ({ + @SpecAssertion(section="8.1", id="a"), + @SpecAssertion(section="8.1", id="d"), + @SpecAssertion(section="8.1.1", id="a"), + @SpecAssertion(section="8.1.3", id="c") + }) + + public void testDecoratorIsManagedBean() + { + List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Logger.TYPES); + assert decorators.size() == 1; + Set<Bean<?>> beans = getCurrentManager().getBeans(TimestampLogger.class); + assert beans.size() == 1; + assert decorators.get(0).equals(beans.iterator().next()); + } + + @Test + @SpecAssertions + ({ + @SpecAssertion(section="8.1", id="b"), + @SpecAssertion(section="8.1", id="c") + }) + public void testDecoratedTypes() + { + List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Foo.TYPES); + assert decorators.size() == 1; + assert decorators.get(0).getDecoratedTypes().size() == 3; + assert decorators.get(0).getDecoratedTypes().contains(Foo.class); + assert decorators.get(0).getDecoratedTypes().contains(Bar.class); + assert decorators.get(0).getDecoratedTypes().contains(Baz.class); + assert !decorators.get(0).getDecoratedTypes().contains(Serializable.class); + assert !decorators.get(0).getDecoratedTypes().contains(FooDecorator.class); + assert !decorators.get(0).getDecoratedTypes().contains(AbstractFooDecorator.class); + assert !decorators.get(0).getDecoratedTypes().contains(Boo.class); + } + + @Test + @SpecAssertion(section="8.1.2", id="a") + public void testDelegateInjectionPoint() + { + List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Logger.TYPES); + assert decorators.size() == 1; + Decorator<?> decorator = decorators.get(0); + assert decorator.getInjectionPoints().size() == 1; + assert decorator.getInjectionPoints().iterator().next().getType().equals(Logger.class); + assert decorator.getInjectionPoints().iterator().next().getAnnotated().isAnnotationPresent(Decorates.class); + assert decorator.getDelegateType().equals(Logger.class); + assert decorator.getDelegateBindings().size() == 1; + assert decorator.getDelegateBindings().iterator().next().annotationType().equals(Current.class); + } + + @Test + @SpecAssertion(section="8.1.3", id="b") + public void testDecoratorDoesNotImplementDelegateType() + { + List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Baz.TYPES); + assert decorators.size() == 2; + } + + @Test + @SpecAssertion(section="8.2", id="a") + public void testNonEnabledDecoratorNotResolved() + { + List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Field.TYPES); + assert decorators.size() == 0; + } + + + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Field.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Field.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Field.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,31 @@ +/* + * 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.decorators.definition; + +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * @author pmuir + * + */ +public interface Field +{ + public static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(Field.class)); +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Field.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldDecorator.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldDecorator.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,32 @@ +/* + * 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.decorators.definition; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +/** + * @author pmuir + * + */ +@Decorator +public class FieldDecorator implements Field +{ + + @Decorates Field field; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldDecorator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldImpl.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldImpl.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,26 @@ +/* + * 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.decorators.definition; + +/** + * @author pmuir + * + */ +public class FieldImpl implements Field +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FieldImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Foo.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Foo.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Foo.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,34 @@ +/* + * 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.decorators.definition; + +import java.io.Serializable; +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * @author pmuir + * + */ +public interface Foo extends Baz, Serializable +{ + + public static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(Foo.class)); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Foo.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBar.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBar.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBar.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,33 @@ +/* + * 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.decorators.definition; + +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * @author pmuir + * + */ +public interface FooBar extends Foo, Bar +{ + + public static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(FooBar.class)); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBar.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBarImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBarImpl.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBarImpl.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,26 @@ +/* + * 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.decorators.definition; + +/** + * @author pmuir + * + */ +public class FooBarImpl implements FooBar +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooBarImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,32 @@ +/* + * 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.decorators.definition; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +/** + * @author pmuir + * + */ +@Decorator +public class FooDecorator extends AbstractFooDecorator implements Foo, Bar +{ + + @Decorates FooBar foobar; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Logger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Logger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Logger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -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.decorators.definition; + +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * @author pmuir + * + */ +public interface Logger +{ + + public static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(Logger.class)); + + public void log(String string); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Logger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Meta.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Meta.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Meta.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.decorators.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Meta +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/Meta.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/MockLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/MockLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/MockLogger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,41 @@ +/* + * 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.decorators.definition; + +/** + * @author pmuir + * + */ +public class MockLogger implements Logger +{ + + private static String log = ""; + + public void log(String string) + { + log += string; + } + + /** + * @return the log + */ + public static String getLog() + { + return log; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/MockLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/TimestampLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/TimestampLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/TimestampLogger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,32 @@ +/* + * 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.decorators.definition; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +/** + * @author pmuir + * + */ +@Decorator +public abstract class TimestampLogger implements Logger +{ + + @Decorates Logger logger; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/TimestampLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -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.jsr299.tck.tests.decorators.definition.broken.finalBeanClass; + +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; + +/** + * @author pmuir + * + */ +@Artifact +(a)ExpectedDeploymentException(DefinitionError.class) +public class FinalBeanClassTest extends AbstractJSR299Test +{ + + @Test(groups="ri-broken") + @SpecAssertion(section="8.1.2", id="d") + public void testAppliesToFinalManagedBeanClass() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/Logger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/Logger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/Logger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -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.decorators.definition.broken.finalBeanClass; + +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * @author pmuir + * + */ +public interface Logger +{ + + public static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(Logger.class)); + + public void log(String string); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/Logger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/MockLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/MockLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/MockLogger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,41 @@ +/* + * 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.decorators.definition.broken.finalBeanClass; + +/** + * @author pmuir + * + */ +public final class MockLogger implements Logger +{ + + private static String log = ""; + + public void log(String string) + { + log += string; + } + + /** + * @return the log + */ + public static String getLog() + { + return log; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/MockLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/TimestampLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/TimestampLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/TimestampLogger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,33 @@ +/* + * 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.decorators.definition.broken.finalBeanClass; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +/** + * @author pmuir + * + */ +@Decorator +public abstract class TimestampLogger implements Logger +{ + + @Decorates private Logger logger; + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/TimestampLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/Logger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/Logger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/Logger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -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.decorators.definition.broken.multipleDelegateInjectionPoints; + +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * @author pmuir + * + */ +public interface Logger +{ + + public static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(Logger.class)); + + public void log(String string); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/Logger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MockLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MockLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MockLogger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,41 @@ +/* + * 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.decorators.definition.broken.multipleDelegateInjectionPoints; + +/** + * @author pmuir + * + */ +public class MockLogger implements Logger +{ + + private static String log = ""; + + public void log(String string) + { + log += string; + } + + /** + * @return the log + */ + public static String getLog() + { + return log; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MockLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -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.jsr299.tck.tests.decorators.definition.broken.multipleDelegateInjectionPoints; + +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; + +/** + * @author pmuir + * + */ +@Artifact +(a)ExpectedDeploymentException(DefinitionError.class) +public class MultipleDelegateInjectionPointsTest extends AbstractJSR299Test +{ + + @Test + @SpecAssertion(section="8.1.2", id="ca") + public void testMultipleDelegateInjectionPoints() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,33 @@ +/* + * 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.decorators.definition.broken.multipleDelegateInjectionPoints; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +/** + * @author pmuir + * + */ +@Decorator +public abstract class TimestampLogger implements Logger +{ + + @Decorates Logger logger; + @Decorates Logger logger2; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/Logger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/Logger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/Logger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -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.decorators.definition.broken.noDelegateInjectionPoints; + +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * @author pmuir + * + */ +public interface Logger +{ + + public static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(Logger.class)); + + public void log(String string); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/Logger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/MockLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/MockLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/MockLogger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,41 @@ +/* + * 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.decorators.definition.broken.noDelegateInjectionPoints; + +/** + * @author pmuir + * + */ +public class MockLogger implements Logger +{ + + private static String log = ""; + + public void log(String string) + { + log += string; + } + + /** + * @return the log + */ + public static String getLog() + { + return log; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/MockLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -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.jsr299.tck.tests.decorators.definition.broken.noDelegateInjectionPoints; + +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; + +/** + * @author pmuir + * + */ +@Artifact +(a)ExpectedDeploymentException(DefinitionError.class) +public class NoDelegateInjectionPointsTest extends AbstractJSR299Test +{ + + @Test + @SpecAssertion(section="8.1.2", id="cb") + public void testNoDelegateInjectionPoints() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/TimestampLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/TimestampLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/TimestampLogger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,30 @@ +/* + * 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.decorators.definition.broken.noDelegateInjectionPoints; + +import javax.decorator.Decorator; + +/** + * @author pmuir + * + */ +@Decorator +public abstract class TimestampLogger implements Logger +{ + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/TimestampLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/EnhancedLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/EnhancedLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/EnhancedLogger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,26 @@ +/* + * 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.decorators.definition.broken.notAllDecoratedTypesImplemented; + +/** + * @author pmuir + * + */ +public interface EnhancedLogger +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/EnhancedLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/Logger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/Logger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/Logger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -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.decorators.definition.broken.notAllDecoratedTypesImplemented; + +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * @author pmuir + * + */ +public interface Logger +{ + + public static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(Logger.class)); + + public void log(String string); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/Logger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/MockLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/MockLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/MockLogger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,41 @@ +/* + * 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.decorators.definition.broken.notAllDecoratedTypesImplemented; + +/** + * @author pmuir + * + */ +public class MockLogger implements Logger, EnhancedLogger +{ + + private static String log = ""; + + public void log(String string) + { + log += string; + } + + /** + * @return the log + */ + public static String getLog() + { + return log; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/MockLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -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.jsr299.tck.tests.decorators.definition.broken.notAllDecoratedTypesImplemented; + +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; + +/** + * @author pmuir + * + */ +@Artifact +(a)ExpectedDeploymentException(DefinitionError.class) +public class NotAllDecoratedTypesImplementedTest extends AbstractJSR299Test +{ + + @Test + @SpecAssertion(section="8.1.3", id="a") + public void testNotAllDecoratedTypesImplemented() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,32 @@ +/* + * 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.decorators.definition.broken.notAllDecoratedTypesImplemented; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +/** + * @author pmuir + * + */ +@Decorator +public abstract class TimestampLogger implements Logger, EnhancedLogger +{ + + @Decorates private Logger logger; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessImpl.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessImpl.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,71 @@ +/* + * 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 + * + */ +public class DataAccessImpl implements DataAccess +{ + + /* (non-Javadoc) + * @see org.jboss.jsr299.tck.tests.deployment.lifecycle.DataAccess#delete() + */ + public void delete() + { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.jboss.jsr299.tck.tests.deployment.lifecycle.DataAccess#getDataType() + */ + public Class<?> getDataType() + { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.jboss.jsr299.tck.tests.deployment.lifecycle.DataAccess#getId() + */ + public Object getId() + { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.jboss.jsr299.tck.tests.deployment.lifecycle.DataAccess#load(java.lang.Object) + */ + public Object load(Object id) + { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.jboss.jsr299.tck.tests.deployment.lifecycle.DataAccess#save() + */ + public void save() + { + // TODO Auto-generated method stub + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/AnimalImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/AnimalImpl.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/AnimalImpl.java 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,26 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.jsr299.tck.tests.implementation.simple.definition; + +/** + * @author pmuir + * + */ +public class AnimalImpl implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/AnimalImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/beans.xml 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,7 @@ +<beans> + <decorators> + <class>org.jboss.jsr299.tck.tests.decorators.definition.BazDecorator</class> + <class>org.jboss.jsr299.tck.tests.decorators.definition.FooDecorator</class> + <class>org.jboss.jsr299.tck.tests.decorators.definition.TimestampLogger</class> + </decorators> +</beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/beans.xml 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,5 @@ +<beans> + <decorators> + <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanClass.TimestampLogger</class> + </decorators> +</beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/beans.xml 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,5 @@ +<beans> + <decorators> + <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.multipleDelegateInjectionPoints.TimestampLogger</class> + </decorators> +</beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/beans.xml 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,5 @@ +<beans> + <decorators> + <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.noDelegateInjectionPoints.TimestampLogger</class> + </decorators> +</beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/beans.xml 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,5 @@ +<beans> + <decorators> + <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.notAllDecoratedTypesImplemented.TimestampLogger</class> + </decorators> +</beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/beans.xml 2009-06-23 21:09:52 UTC (rev 2872) @@ -0,0 +1,10 @@ +<beans> + <deploy> + <type>javax.enterprise.inject.deployment.Standard</type> + <type>javax.enterprise.inject.deployment.Production</type> + <type>org.jboss.jsr299.tck.tests.definition.deployment.AnotherDeploymentType</type> + <type>org.jboss.jsr299.tck.tests.definition.deployment.HornedAnimalDeploymentType</type> + <type>org.jboss.jsr299.tck.tests.definition.deployment.NotInheritedDeploymentType</type> + <type>org.jboss.jsr299.tck.tests.definition.deployment.InheritedDeploymentType</type> + </deploy> +</beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-23 20:42:32 UTC (rev 2871) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-23 21:09:52 UTC (rev 2872) @@ -3541,10 +3541,14 @@ in Section 5.1, "Typesafe resolution algorithm".</text> </assertion> - <assertion id="c"> - <text>A decorator must have exactly one delegate injection point. If a decorator has more than one delegate injection point, or does not have a delegate injection point, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> + <assertion id="ca"> + <text>A decorator must have exactly one delegate injection point. If a decorator has more than one delegate injection point~, or does not have a delegate injection point,~ the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> </assertion> + <assertion id="cb"> + <text>A decorator must have exactly one delegate injection point. If a decorator ~has more than one delegate injection point, or~ does not have a delegate injection point, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> + </assertion> + <assertion id="d"> <text>If a decorator applies to a managed bean, and the bean class is declared final, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> </assertion>

14 years, 10 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2871 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition: stereotype and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-06-23 16:42:32 -0400 (Tue, 23 Jun 2009) New Revision: 2871 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ResolvedStereotypeScopeConflictTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/Scallop.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java Log: seperate broken and non-broken tests into different packages Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java 2009-06-23 20:42:04 UTC (rev 2870) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -1,24 +1,22 @@ package org.jboss.jsr299.tck.tests.definition.scope.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.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** * Spec version: 20090519 */ -@Artifact(addCurrentPackage = false) -@Classes( { AnimalStereotype.class, FishStereotype.class, Scallop_Broken.class, IncompatibleStereotypesTest.class }) +@Artifact @ExpectedDeploymentException(DefinitionError.class) public class IncompatibleStereotypesTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "2.4.4", id = "da") + @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.4.4", id = "da") }) public void testMutipleIncompatibleScopeStereotypes() { assert false; Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java 2009-06-23 20:42:04 UTC (rev 2870) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -1,23 +0,0 @@ -package org.jboss.jsr299.tck.tests.definition.scope.broken1; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.Classes; -import org.testng.annotations.Test; - -/** - * Spec version: 20090519 - */ -@Artifact(addCurrentPackage = false) -@Classes( { AnimalStereotype.class, FishStereotype.class, Scallop.class, ResolvedIncompatibleStereotypesTest.class }) -public class ResolvedIncompatibleStereotypesTest extends AbstractJSR299Test -{ - @Test - @SpecAssertions( { @SpecAssertion(section = "2.4.4", id = "da"), @SpecAssertion(section = "2.4.4", id = "e") }) - public void testMutipleIncompatibleScopeStereotypesWithOverride() - { - assert true; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop.java 2009-06-23 20:42:04 UTC (rev 2870) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.tests.definition.scope.broken1; - -import javax.enterprise.context.RequestScoped; - -/** - * This bean definition is valid because it declares two stereotypes that have - * different default scopes yet the bean explictly defines a scope to resolve - * the conflict. - */ -@AnimalStereotype -@FishStereotype -@RequestScoped -class Scallop -{ - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/AnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/AnimalStereotype.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.resolvedScopeConflict; + +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.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; + +@Stereotype +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@interface AnimalStereotype +{ +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/FishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/FishStereotype.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.resolvedScopeConflict; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Stereotype; + +@Stereotype +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@interface FishStereotype +{ +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ResolvedStereotypeScopeConflictTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ResolvedStereotypeScopeConflictTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ResolvedStereotypeScopeConflictTest.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.resolvedScopeConflict; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.testng.annotations.Test; + +/** + * Spec version: 20090519 + */ +@Artifact +public class ResolvedStereotypeScopeConflictTest extends AbstractJSR299Test +{ + @Test + @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.4.4", id = "da"), @SpecAssertion(section = "2.4.4", id = "e") }) + public void testExplicitScopeOverridesMutipleStereotypesWithConflictingScopes() + { + assert true; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/Scallop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/Scallop.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/Scallop.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.resolvedScopeConflict; + +import javax.enterprise.context.RequestScoped; + +/** + * This bean definition is valid because it declares two stereotypes that have + * different default scopes yet the bean explictly defines a scope to resolve + * the conflict. + */ +@AnimalStereotype +@FishStereotype +@RequestScoped +class Scallop +{ +}

14 years, 10 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2870 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype.

by webbeans-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-06-23 16:42:04 -0400 (Tue, 23 Jun 2009) New Revision: 2870 Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ Log: remove redundant spec assertion test

14 years, 10 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2869 - tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment.

by webbeans-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-06-23 16:26:31 -0400 (Tue, 23 Jun 2009) New Revision: 2869 Removed: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/broken/ Log: remove unused beans.xml

14 years, 10 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2868 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/request and 3 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-23 12:13:10 -0400 (Tue, 23 Jun 2009) New Revision: 2868 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/TestFilter.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/TestFilter.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/TestFilter.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java Log: More fixes Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java 2009-06-23 14:42:20 UTC (rev 2867) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java 2009-06-23 16:13:10 UTC (rev 2868) @@ -34,7 +34,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java 2009-06-23 14:42:20 UTC (rev 2867) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java 2009-06-23 16:13:10 UTC (rev 2868) @@ -40,7 +40,7 @@ { private static final long serialVersionUID = 1L; - + @Current private BeanManager jsr299Manager; @@ -71,7 +71,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/TestFilter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/TestFilter.java 2009-06-23 14:42:20 UTC (rev 2867) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/TestFilter.java 2009-06-23 16:13:10 UTC (rev 2868) @@ -43,7 +43,7 @@ if (jsr299Manager == null) { InitialContext ic = new InitialContext(); - jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager"); } } catch (Exception e) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java 2009-06-23 14:42:20 UTC (rev 2867) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java 2009-06-23 16:13:10 UTC (rev 2868) @@ -34,7 +34,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java 2009-06-23 14:42:20 UTC (rev 2867) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java 2009-06-23 16:13:10 UTC (rev 2868) @@ -40,7 +40,7 @@ { private static final long serialVersionUID = 1L; - + @Current private BeanManager jsr299Manager; @@ -71,7 +71,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/TestFilter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/TestFilter.java 2009-06-23 14:42:20 UTC (rev 2867) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/TestFilter.java 2009-06-23 16:13:10 UTC (rev 2868) @@ -43,7 +43,7 @@ if (jsr299Manager == null) { InitialContext ic = new InitialContext(); - jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager"); } } catch (Exception e) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java 2009-06-23 14:42:20 UTC (rev 2867) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java 2009-06-23 16:13:10 UTC (rev 2868) @@ -38,7 +38,7 @@ public class IntrospectSession extends HttpServlet { private static final long serialVersionUID = 1L; - + @Current private BeanManager jsr299Manager; @@ -57,7 +57,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java 2009-06-23 14:42:20 UTC (rev 2867) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java 2009-06-23 16:13:10 UTC (rev 2868) @@ -23,7 +23,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { resp.setContentType("text/text"); - + if (req.getParameter("timeout") != null) { SimpleSessionBean.setBeanDestroyed(false); @@ -49,7 +49,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java 2009-06-23 14:42:20 UTC (rev 2867) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java 2009-06-23 16:13:10 UTC (rev 2868) @@ -40,7 +40,7 @@ { private static final long serialVersionUID = 1L; - + @Current private BeanManager jsr299Manager; @@ -71,7 +71,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/TestFilter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/TestFilter.java 2009-06-23 14:42:20 UTC (rev 2867) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/TestFilter.java 2009-06-23 16:13:10 UTC (rev 2868) @@ -43,7 +43,7 @@ if (jsr299Manager == null) { InitialContext ic = new InitialContext(); - jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager"); } } catch (Exception e) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-23 14:42:20 UTC (rev 2867) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-23 16:13:10 UTC (rev 2868) @@ -37,7 +37,7 @@ @ExpectedDeploymentException(DeploymentError.class) public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test { - @Test(groups="ri-incontainer-broken") + @Test(groups="incontainer-ri-broken") @SpecAssertion(section = "11.5.3", id = "c") public void testObserverFailureTreatedAsDeploymentError() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java 2009-06-23 14:42:20 UTC (rev 2867) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java 2009-06-23 16:13:10 UTC (rev 2868) @@ -20,7 +20,7 @@ @ExpectedDeploymentException(DefinitionError.class) public class AddDefinitionErrorTest extends AbstractJSR299Test { - @Test(groups="ri-incontainer-broken") + @Test(groups="incontainer-ri-broken") @SpecAssertion(section = "11.5.2", id = "c") public void testObserverDefinitionErrorTreatedAsDefinitionError() {

14 years, 10 months

1
0
0 / 0

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

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-23 10:42:20 -0400 (Tue, 23 Jun 2009) New Revision: 2867 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/FooException.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/ Removed: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/mock-orm.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/package-mock-orm.xml Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/TooManyProducerFieldDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/TooManyScopesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/NonEmptyNamedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/MultipleStereotypesWithMultipleScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/TooManyDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/TooManyScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereoTypeWithBindingTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/DeploymentFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/AfterBeanDiscoveryFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/AfterBeanDiscoveryObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/AddDeploymentProblemTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3a/ObserverMethodAndTypeVariableEventTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java 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/broken3/InitializerUnallowedDefinitionTest.java 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/broken6/DisposalMethodOnSessionBean.java 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/singletonWithConversationScope/SingletonWithConversationScopeTest.java 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/singletonWithSessionScope/SingletonWithSessionScopeTest.java 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/statelessWithConversationScope/StatelessWithConversationScopeTest.java 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/statelessWithSessionScope/StatelessWithSessionScopeTest.java 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/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 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/staticInitializer/StaticInitializerTest.java 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/method/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/application/web.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/request/web.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/session/web.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml Log: lots of fixes for i/c Deleted: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.api; - -/** - * A category exception which can be declared in the @ExpectedDeploymentException - * annotation of an @Artifact to detect a definition error as described in - * Section 12.4, "Problems detected automatically by the container". - * - * @see org.jboss.jsr299.tck.spi.Managers#isDefinitionError(Throwable) - */ -public class DefinitionError extends RuntimeException { -} Deleted: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.api; - -/** - * A category exception which can be declared in the @ExpectedDeploymentException - * annotation of an @Artifact to detect a deployment error as described in - * Section 12.4, "Problems detected automatically by the container". - * - * @see org.jboss.jsr299.tck.spi.Managers#isDeploymentError(Throwable) - */ -public class DeploymentError extends RuntimeException { -} Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -5,46 +5,57 @@ import javax.enterprise.inject.spi.BeanManager; +import org.jboss.testharness.api.DeploymentException; + /** * This interface provides operations relating to a Manager. * - * The TCK porting package must provide an implementation of this interface which is - * suitable for the target implementation. + * The TCK porting package must provide an implementation of this interface + * which is suitable for the target implementation. * * @author Shane Bryzak */ public interface Managers { - + public static final String PROPERTY_NAME = Managers.class.getName(); - + /** * Get a new Manager instance * * @return the Manager */ public BeanManager getManager(); - + /** * Returns a list of the enabled deployment types for the current manager * * @return */ List<Class<? extends Annotation>> getEnabledDeploymentTypes(); - + /** - * Checks whether the throwable is a definition error, as described - * in Section 12.4, "Problems detected automatically by the container". + * Checks whether there is a definition error, as described in Section 12.4, + * "Problems detected automatically by the container". * - * @return true if the throwable reports a definition error + * @param deploymentException the deployment exception context provided by + * the deployment which is in error. The deployment is not required + * to provide a deploymentException, even if the deployment is in + * error + * @return true if there is a definition error */ - public boolean isDefinitionError(Throwable throwable); + public boolean isDefinitionError(DeploymentException deploymentException); /** - * Checks whether the throwable is a deployment error, as described - * in Section 12.4, "Problems detected automatically by the container". + * Checks whether there is a deployment error, as described in Section 12.4, + * "Problems detected automatically by the container". * - * @return true if the throwable reports a deployment error + * @param deploymentException the deployment exception context provided by + * the deployment which is in error. The deployment is not required + * to provide a deploymentException, even if the deployment is in + * error + * @return true if there is a deployment error */ - public boolean isDeploymentError(Throwable throwable); + public boolean isDeploymentError(DeploymentException deploymentException); + } 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-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -16,28 +16,26 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; -import org.jboss.jsr299.tck.api.DefinitionError; -import org.jboss.jsr299.tck.api.DeploymentError; import org.jboss.jsr299.tck.api.JSR299Configuration; import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; import org.jboss.jsr299.tck.impl.OldSPIBridge; public abstract class AbstractJSR299Test extends org.jboss.testharness.AbstractTest { - + protected abstract static class RunInDependentContext { - + protected void setup() { getCurrentConfiguration().getContexts().setActive(getCurrentConfiguration().getContexts().getDependentContext()); } - + protected void cleanup() { getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getDependentContext()); } - + public final void run() throws Exception { try @@ -50,24 +48,24 @@ cleanup(); } } - + protected JSR299Configuration getCurrentConfiguration() { return JSR299ConfigurationImpl.get(); } - + protected abstract void execute() throws Exception; - + } - + private BeanManager currentManager; - + protected void setCurrentManager(BeanManager currentManager) { this.currentManager = currentManager; } - + protected BeanManager getCurrentManager() { return currentManager; @@ -101,27 +99,27 @@ { getCurrentConfiguration().getContexts().destroyContext(context); } - + @Override protected JSR299Configuration getCurrentConfiguration() { return JSR299ConfigurationImpl.get(); } - + @Override public void beforeMethod() { super.beforeMethod(); setCurrentManager(getCurrentConfiguration().getManagers().getManager()); } - + @Override public void afterMethod() { super.afterMethod(); setCurrentManager(null); } - + /** * Checks if all annotations are in a given set of annotations * @@ -146,12 +144,12 @@ } return annotationTypeList.size() == 0; } - + public <T> Set<Bean<T>> getBeans(Class<T> type, Annotation... bindings) { return (Set) getCurrentManager().getBeans(type, bindings); } - + public <T> Set<Bean<T>> getBeans(TypeLiteral<T> type, Annotation... bindings) { return (Set)getCurrentManager().getBeans(type.getType(), bindings); @@ -161,17 +159,17 @@ { return OldSPIBridge.getInstanceByType(getCurrentManager(), beanType, bindings); } - + public <T> T getInstanceByType(TypeLiteral<T> beanType, Annotation... bindings) { return OldSPIBridge.getInstanceByType(getCurrentManager(), beanType, bindings); } - + public Object getInstanceByName(String name) { return OldSPIBridge.getInstanceByName(getCurrentManager(), name); } - + /** * Create a bean instance. This method abstracts the TCK * from having to manage the CreationalContext @@ -184,7 +182,7 @@ { return getCurrentConfiguration().getBeans().createBeanInstance(bean); } - + /** * Destroy a bean instance. This method abstracts the TCK * from having to manage the CreationalContext @@ -199,17 +197,19 @@ } @Override - protected boolean isThrowablePresent(Class<? extends Throwable> throwableType, Throwable throwable) + protected org.jboss.testharness.api.DeploymentException handleDeploymentFailure(org.jboss.testharness.api.DeploymentException deploymentException) { - if (throwableType.equals(DefinitionError.class) && getCurrentConfiguration().getManagers().isDefinitionError(throwable)) + if (getCurrentConfiguration().getManagers().isDefinitionError(deploymentException)) { - return true; + return new org.jboss.testharness.api.DeploymentException(deploymentException, new DefinitionError(deploymentException.getCause())); } - else if (throwableType.equals(DeploymentError.class) && getCurrentConfiguration().getManagers().isDeploymentError(throwable)) + else if (getCurrentConfiguration().getManagers().isDeploymentError(deploymentException)) { - return true; + return new org.jboss.testharness.api.DeploymentException(deploymentException, new DeploymentError(deploymentException.getCause())); } - - return super.isThrowablePresent(throwableType, throwable); + else + { + return deploymentException; + } } } Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java (from rev 2862, tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DefinitionError.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -0,0 +1,35 @@ +package org.jboss.jsr299.tck; + +/** + * A category exception which can be declared in the @ExpectedDeploymentException + * annotation of an @Artifact to detect a definition error as described in + * Section 12.4, "Problems detected automatically by the container". + * + * @see org.jboss.jsr299.tck.spi.Managers#isDefinitionError(Throwable) + */ +public class DefinitionError extends RuntimeException +{ + + public DefinitionError() + { + super(); + } + + public DefinitionError(String message, Throwable cause) + { + super(message, cause); + } + + public DefinitionError(String message) + { + super(message); + } + + public DefinitionError(Throwable cause) + { + super(cause); + } + + + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java (from rev 2862, tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -0,0 +1,35 @@ +package org.jboss.jsr299.tck; + +/** + * A category exception which can be declared in the @ExpectedDeploymentException + * annotation of an @Artifact to detect a deployment error as described in + * Section 12.4, "Problems detected automatically by the container". + * + * @see org.jboss.jsr299.tck.spi.Managers#isDeploymentError(Throwable) + */ +public class DeploymentError extends RuntimeException +{ + + public DeploymentError() + { + super(); + } + + public DeploymentError(String message, Throwable cause) + { + super(message, cause); + } + + public DeploymentError(String message) + { + super(message); + } + + public DeploymentError(Throwable cause) + { + super(cause); + } + + + +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,7 +3,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +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; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/TooManyProducerFieldDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/TooManyProducerFieldDeploymentTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/TooManyProducerFieldDeploymentTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,7 +3,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +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; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,17 +3,17 @@ 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.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** * Spec version: 20090519 */ @Artifact(addCurrentPackage = false) -@Classes( { AnimalStereotype.class, FishStereotype.class, Scallop_Broken.class }) +@Classes( { AnimalStereotype.class, FishStereotype.class, Scallop_Broken.class, IncompatibleStereotypesTest.class }) @ExpectedDeploymentException(DefinitionError.class) public class IncompatibleStereotypesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -11,7 +11,7 @@ * Spec version: 20090519 */ @Artifact(addCurrentPackage = false) -@Classes( { AnimalStereotype.class, FishStereotype.class, Scallop.class }) +@Classes( { AnimalStereotype.class, FishStereotype.class, Scallop.class, ResolvedIncompatibleStereotypesTest.class }) public class ResolvedIncompatibleStereotypesTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/TooManyScopesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/TooManyScopesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/TooManyScopesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/NonEmptyNamedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/NonEmptyNamedTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/NonEmptyNamedTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,9 +4,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/MultipleStereotypesWithMultipleScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/MultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/MultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,17 +4,17 @@ 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.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** * Spec version: 20090519 */ @Artifact(addCurrentPackage = false) -@Classes( { ApplicationScopedHornedMammalStereotype.class, SessionScopedHornedMammalStereotype.class, Deer_Broken.class }) +@Classes( { ApplicationScopedHornedMammalStereotype.class, SessionScopedHornedMammalStereotype.class, Deer_Broken.class, MultipleStereotypesWithMultipleScopeTypesTest.class }) @ExpectedDeploymentException(DefinitionError.class) public class MultipleStereotypesWithMultipleScopeTypesTest extends AbstractJSR299Test { @@ -25,6 +25,6 @@ { assert false; } - + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -11,7 +11,7 @@ * Spec version: 20090519 */ @Artifact(addCurrentPackage = false) -@Classes( { ApplicationScopedHornedMammalStereotype.class, SessionScopedHornedMammalStereotype.class, Deer.class }) +@Classes( { ApplicationScopedHornedMammalStereotype.class, SessionScopedHornedMammalStereotype.class, Deer.class, ResolvedMultipleStereotypesWithMultipleScopeTypesTest.class }) public class ResolvedMultipleStereotypesWithMultipleScopeTypesTest extends AbstractJSR299Test { @@ -21,6 +21,6 @@ { assert true; } - + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/TooManyDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/TooManyDeploymentTypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/TooManyDeploymentTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/TooManyScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/TooManyScopeTypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/TooManyScopeTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereoTypeWithBindingTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereoTypeWithBindingTypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereoTypeWithBindingTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/DeploymentFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/DeploymentFailureTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/DeploymentFailureTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,7 +3,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +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; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/AfterBeanDiscoveryFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/AfterBeanDiscoveryFailureTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/AfterBeanDiscoveryFailureTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -24,7 +24,6 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.AfterClass; import org.testng.annotations.Test; /** @@ -52,13 +51,13 @@ { assert false; } - - @Override - @AfterClass(alwaysRun = true, groups = "scaffold") - public void afterClass() throws Exception - { - super.afterClass(); - assert BeanDiscoveryObserver.isManagerInitialized(); - } - + + // @Override + // @AfterClass(alwaysRun = true, groups = "scaffold") + // public void afterClass() throws Exception + // { + // super.afterClass(); + // assert BeanDiscoveryObserver.isManagerInitialized(); + // } + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/AfterBeanDiscoveryObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -2,7 +2,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +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; @@ -20,7 +20,7 @@ @ExpectedDeploymentException(DefinitionError.class) public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test { - @Test + @Test(groups="incontainer-ri-broken") @SpecAssertion(section = "11.5.2", id = "d") public void testObserverFailureTreatedAsDefinitionError() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -7,6 +7,6 @@ { public void afterBeanDiscovery(@Observes AfterBeanDiscovery event) { - throw new AssertionError("This error should be treated as a definition error"); + throw new FooException("This error should be treated as a definition error"); } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/FooException.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/FooException.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/FooException.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -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.broken3; + +/** + * @author pmuir + * + */ +public class FooException extends RuntimeException +{ + + public FooException() + { + super(); + // TODO Auto-generated constructor stub + } + + public FooException(String arg0, Throwable arg1) + { + super(arg0, arg1); + // TODO Auto-generated constructor stub + } + + public FooException(String arg0) + { + super(arg0); + // TODO Auto-generated constructor stub + } + + public FooException(Throwable arg0) + { + super(arg0); + // TODO Auto-generated constructor stub + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/FooException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -19,7 +19,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DeploymentError; +import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @@ -37,7 +37,7 @@ @ExpectedDeploymentException(DeploymentError.class) public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test { - @Test + @Test(groups="ri-incontainer-broken") @SpecAssertion(section = "11.5.3", id = "c") public void testObserverFailureTreatedAsDeploymentError() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -2,10 +2,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.AfterClass; import org.testng.annotations.Test; /** @@ -21,18 +20,18 @@ @ExpectedDeploymentException(DefinitionError.class) public class AddDefinitionErrorTest extends AbstractJSR299Test { - @Test + @Test(groups="ri-incontainer-broken") @SpecAssertion(section = "11.5.2", id = "c") public void testObserverDefinitionErrorTreatedAsDefinitionError() { assert false; } - - @Override - @AfterClass(alwaysRun = true, groups = "scaffold") - public void afterClass() throws Exception - { - super.afterClass(); - assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterBeanDiscovery observer methods should have been called"; - } + + // @Override + // @AfterClass(alwaysRun = true, groups = "scaffold") + // public void afterClass() throws Exception + // { + // super.afterClass(); + // assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterBeanDiscovery observer methods should have been called"; + // } } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/AddDeploymentProblemTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/AddDeploymentProblemTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/AddDeploymentProblemTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -19,10 +19,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DeploymentError; +import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.AfterClass; import org.testng.annotations.Test; /** @@ -39,19 +38,19 @@ @ExpectedDeploymentException(DeploymentError.class) public class AddDeploymentProblemTest extends AbstractJSR299Test { - @Test + @Test(groups="incontainer-ri-broken") @SpecAssertion(section = "11.5.3", id = "b") public void testObserverDeploymentProblemTreatedAsDeploymentError() { assert false; } - @Override - @AfterClass(alwaysRun = true, groups = "scaffold") - public void afterClass() throws Exception - { - super.afterClass(); - assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterDeploymentValidation observer methods should have been called"; - } - + // @Override + // @AfterClass(alwaysRun = true, groups = "scaffold") + // public void afterClass() throws Exception + // { + // super.afterClass(); + // assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterDeploymentValidation observer methods should have been called"; + // } + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,7 +20,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +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; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -21,7 +21,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; +import org.jboss.jsr299.tck.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -21,11 +21,11 @@ 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.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,9 +4,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3a/ObserverMethodAndTypeVariableEventTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3a/ObserverMethodAndTypeVariableEventTypeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3a/ObserverMethodAndTypeVariableEventTypeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -20,9 +20,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -18,7 +18,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +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; Modified: 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/broken1/MultipleDisposeParametersDefinitionTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,10 +4,10 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: 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/broken2/ProducesUnallowedDefinitionTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: 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/broken3/InitializerUnallowedDefinitionTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,10 +3,10 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: 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/broken4/ObserverParameterUnallowedDefinitionTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,10 +3,10 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,12 +4,12 @@ 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.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: 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/newAndOtherBinding/NewAndOtherBindingTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: 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/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @ExpectedDeploymentException(DefinitionError.class) Modified: 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/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: 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/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: 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/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: 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/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: 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/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: 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/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: 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/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,9 +4,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: 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/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: 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/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact 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-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: 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/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,11 +4,11 @@ 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.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -4,9 +4,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,28 +0,0 @@ -package org.jboss.jsr299.tck.tests.implementation.simple.definition; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; -import org.testng.annotations.Test; - -@Artifact -@IntegrationTest -@Resources({ - @Resource(source="package-mock-orm.xml", destination="WEB-INF/classes/META-INF/orm.xml") -}) -public class SimpleBeanOrmMappedPackageTest extends AbstractJSR299Test -{ - - - @Test - @SpecAssertion(section = "3.2.1", id = "o") - public void testOrmMappedEntityClassesNotDiscoveredAsSimpleBean() - { - assert getBeans(Vet.class).size() == 0; - } - - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,28 +0,0 @@ -package org.jboss.jsr299.tck.tests.implementation.simple.definition; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; -import org.testng.annotations.Test; - -@Artifact -@IntegrationTest -@Resources({ - @Resource(source="mock-orm.xml", destination="WEB-INF/classes/META-INF/orm.xml") -}) -public class SimpleBeanOrmMappedTest extends AbstractJSR299Test -{ - - - @Test - @SpecAssertion(section = "3.2.1", id = "o") - public void testOrmMappedEntityClassesNotDiscoveredAsSimpleBean() - { - assert getBeans(Vet.class).size() == 0; - } - - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -2,7 +2,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.api.DefinitionError; +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; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @ExpectedDeploymentException(DefinitionError.class) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,12 +3,12 @@ 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.jboss.testharness.impl.packaging.jsr299.BeansXml; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,11 +3,11 @@ 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.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -3,9 +3,9 @@ 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.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-06-23 14:42:20 UTC (rev 2867) @@ -26,7 +26,7 @@ @BeansXml("beans.xml") public class ResolutionByTypeTest extends AbstractJSR299Test { - + @Test(groups="resolution") @SpecAssertions({ @SpecAssertion(section="5.1", id = "gaa") @@ -37,39 +37,39 @@ assert possibleTargets.size() == 1; assert possibleTargets.iterator().next().getTypes().contains(Tuna.class); } - + @Test(groups = { "resolution", "rewrite" }, expectedExceptions = IllegalArgumentException.class) // This assertion comes back later public <T> void testParameterizedTypeWithTypeParameter() { getBeans(new TypeLiteral<ParameterizedBean_Broken<T>>(){}); } - + @Test(groups = { "resolution", "rewrite" }, expectedExceptions=DuplicateBindingTypeException.class) @SpecAssertion(section="5.1", id = "d") public void testDuplicateBindingTypesUsed() { getBeans(Tuna.class, new CurrentLiteral(), new CurrentLiteral()); } - + @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.1", id = "e") public void testNonBindingTypeUsed() { getBeans(Tuna.class, new AnotherDeploymentTypeLiteral()); } - + @Test(groups="resolution") @SpecAssertions({ @SpecAssertion(section = "5.1", id ="faa") }) public void testResolveByType() throws Exception { - + assert getBeans(Tuna.class, new CurrentLiteral()).size() == 1; - + assert getBeans(Tuna.class).size() == 1; - + Set<Bean<Animal>> beans = getBeans(Animal.class, new AnnotationLiteral<FishILike>() {}); assert beans.size() == 3; List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>(); @@ -92,19 +92,19 @@ assert classes.contains(SeaBass.class); assert classes.contains(Haddock.class); } - + @Test(groups="injection") @SpecAssertions({ - @SpecAssertion(section = "2.3.4", id = "b" ), - @SpecAssertion(section = "5.1", id = "gba"), - @SpecAssertion(section = "2.3.3", id = "d" ), - @SpecAssertion(section = "5.1.5", id = "a" ) + @SpecAssertion(section = "2.3.4", id = "b" ), + @SpecAssertion(section = "5.1", id = "gba"), + @SpecAssertion(section = "2.3.3", id = "d" ), + @SpecAssertion(section = "5.1.5", id = "a" ) }) public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean() { assert getBeans(Animal.class, new ChunkyLiteral(), new AnnotationLiteral<Whitefish>() {}).size() == 1; assert getBeans(Animal.class, new ChunkyLiteral(), new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Cod.class); - + assert getBeans(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).size() == 2; List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>(); for (Bean<ScottishFish> bean : getBeans(ScottishFish.class, new AnnotationLiteral<Whitefish>() {})) @@ -121,7 +121,7 @@ assert classes.contains(Cod.class); assert classes.contains(Sole.class); } - + @Test(groups="resolution") @SpecAssertions({ @SpecAssertion(section="5.1", id = "fd"), @@ -133,36 +133,36 @@ assert getBeans(new TypeLiteral<Farmer<ScottishFish>>(){}).size() == 1; assert getBeans(new TypeLiteral<Farmer<ScottishFish>>(){}).iterator().next().getTypes().contains(ScottishFishFarmer.class); } - + @Test(groups={"resolution", "producerMethod"}) @SpecAssertion(section="5.1", id = "fc") public void testResolveByTypeWithArray() throws Exception { assert getBeans(Spider[].class).size() == 1; } - + @Test @SpecAssertion(section="5.1", id = "ha") public void testOnlyHighestEnabledPrecedenceWebBeansResolved() throws Exception { assert getBeans(Animal.class, new AnnotationLiteral<Whitefish>() {}).size() == 1; assert getBeans(Animal.class, new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Plaice.class); } - - + + @Test(groups="resolution") @SpecAssertion(section="5.1", id = "hb") public void testNoWebBeansFound() throws Exception { assert getBeans(Tuna.class, new AnnotationLiteral<FakeFish>() {}).size() == 0; } - + @Test(groups="resolution") @SpecAssertions({ @SpecAssertion(section="5.1", id = "gca") }) public void testResolveByTypeWithNonBindingMembers() throws Exception { - + Set<Bean<Animal>> beans = getBeans(Animal.class, new ExpensiveLiteral() { @@ -175,10 +175,10 @@ { return true; } - + }, new AnnotationLiteral<Whitefish>() {}); assert beans.size() == 2; - + List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>(); for (Bean<Animal> bean : beans) { @@ -194,8 +194,8 @@ assert classes.contains(Halibut.class); assert classes.contains(RoundWhitefish.class); } - - @Test(groups="resolution") + + @Test(groups={"resolution", "broken"}) @SpecAssertion(section="5.1.4", id = "ca") public void testArrayValuedAnnotationMemberWithoutNonBinding() { @@ -217,10 +217,10 @@ t = throwable; } - assert getCurrentConfiguration().getManagers().isDefinitionError(t); + //assert getCurrentConfiguration().getManagers().isDefinitionError(t); } - - @Test(groups="resolution")//, expectedExceptions=DefinitionException.class) + + @Test(groups={"resolution", "broken"})//, expectedExceptions=DefinitionException.class) @SpecAssertion(section="5.1.4", id = "cb") public void testAnnotationValuedAnnotationMemberWithoutNonBinding() { @@ -251,8 +251,8 @@ { t = throwable; } - - assert getCurrentConfiguration().getManagers().isDefinitionError(t); + + //assert getCurrentConfiguration().getManagers().isDefinitionError(t); } - + } Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/application/web.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/application/web.xml 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/application/web.xml 2009-06-23 14:42:20 UTC (rev 2867) @@ -6,7 +6,7 @@ <filter> <display-name>Test Filter for Sessions</display-name> <filter-name>filterTest</filter-name> - <filter-class>org.jboss.jsr299.tck.tests.context.application.FilterTest</filter-class> + <filter-class>org.jboss.jsr299.tck.tests.context.application.TestFilter</filter-class> </filter> <filter-mapping> <filter-name>filterTest</filter-name> Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/request/web.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/request/web.xml 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/request/web.xml 2009-06-23 14:42:20 UTC (rev 2867) @@ -6,7 +6,7 @@ <filter> <display-name>Test Filter for Sessions</display-name> <filter-name>filterTest</filter-name> - <filter-class>org.jboss.jsr299.tck.tests.context.request.FilterTest</filter-class> + <filter-class>org.jboss.jsr299.tck.tests.context.request.TestFilter</filter-class> </filter> <filter-mapping> <filter-name>filterTest</filter-name> Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/session/web.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/session/web.xml 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/session/web.xml 2009-06-23 14:42:20 UTC (rev 2867) @@ -6,7 +6,7 @@ <filter> <display-name>Test Filter for Sessions</display-name> <filter-name>filterTest</filter-name> - <filter-class>org.jboss.jsr299.tck.tests.context.session.FilterTest</filter-class> + <filter-class>org.jboss.jsr299.tck.tests.context.session.TestFilter</filter-class> </filter> <filter-mapping> <filter-name>filterTest</filter-name> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/broken2 (from rev 2862, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements) Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/mock-orm.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/mock-orm.xml 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/mock-orm.xml 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" version="1.0"> - - <entity class="org.jboss.jsr299.tck.tests.implementation.simple.definition.Vet" /> - -</entity-mappings> \ No newline at end of file Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/package-mock-orm.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/package-mock-orm.xml 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/package-mock-orm.xml 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" version="1.0"> - - <package>org.jboss.jsr299.tck.tests.implementation.simple.definition</package> - - <entity class="Vet" /> - -</entity-mappings> \ No newline at end of file Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml 2009-06-23 14:18:45 UTC (rev 2866) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml 2009-06-23 14:42:20 UTC (rev 2867) @@ -1,5 +1,6 @@ <beans> <deploy> <type>javax.enterprise.inject.deployment.Standard</type> + <type>javax.enterprise.inject.deployment.Production</type> </deploy> </beans>

14 years, 10 months

1
0
0 / 0

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits June 2009