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