You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openwebbeans.apache.org by Mark Struberg <st...@yahoo.de> on 2009/10/11 23:57:40 UTC
Re: svn commit: r824079 [3/3] - in /incubator/openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/annotation/ main/java/org/apache/webbeans/annotation/deployment/ main/java/org/apache/webbeans/component/ main/java/org/apache/webbeans/compon...
Hi Gurkan!
Not 100% sure why we internalise the old 'Production' annotation. What I understood was that they got replaced with Alternatives, isn't?
Is this a temporary change, then we should @deprecated it.
LieGrue,
strub
--- On Sun, 10/11/09, gerdogdu@apache.org <ge...@apache.org> wrote:
> From: gerdogdu@apache.org <ge...@apache.org>
> Subject: svn commit: r824079 [3/3] - in /incubator/openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/annotation/ main/java/org/apache/webbeans/annotation/deployment/ main/java/org/apache/webbeans/component/ main/java/org/apache/webbeans/compon...
> To: openwebbeans-commits@incubator.apache.org
> Date: Sunday, October 11, 2009, 4:03 PM
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java
> Sun Oct 11 14:03:41 2009
> @@ -15,8 +15,7 @@
>
> import java.io.Serializable;
>
> -import javax.enterprise.inject.deployment.Production;
> -
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.sterotype.StereoWithSessionScope;
> import
> org.apache.webbeans.test.sterotype.StereoWithSessionScope2;
>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithoutScopeStero.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithoutScopeStero.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithoutScopeStero.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithoutScopeStero.java
> Sun Oct 11 14:03:41 2009
> @@ -13,8 +13,7 @@
> */
> package
> org.apache.webbeans.test.component.exception.stero;
>
> -import javax.enterprise.inject.deployment.Production;
> -
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.sterotype.StereoWithNonScope;
>
> @Production
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment1.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment1.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment1.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment1.java
> Sun Oct 11 14:03:41 2009
> @@ -22,7 +22,7 @@
> import java.lang.annotation.RetentionPolicy;
> import java.lang.annotation.Target;
>
> -import javax.enterprise.inject.deployment.DeploymentType;
> +import
> org.apache.webbeans.annotation.deployment.DeploymentType;
>
> @DeploymentType
> @Inherited
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment2.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment2.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment2.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment2.java
> Sun Oct 11 14:03:41 2009
> @@ -22,7 +22,7 @@
> import java.lang.annotation.RetentionPolicy;
> import java.lang.annotation.Target;
>
> -import javax.enterprise.inject.deployment.DeploymentType;
> +import
> org.apache.webbeans.annotation.deployment.DeploymentType;
>
> @DeploymentType
> @Inherited
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeComponent.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeComponent.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,22 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.inject.alternative;
> +
> +import javax.enterprise.inject.Alternative;
> +
> +@Alternative
> +public class AlternativeComponent implements IAlternative
> +{
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeComponent.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeInjector.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeInjector.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeInjector.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeInjector.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,27 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.inject.alternative;
> +
> +import javax.enterprise.inject.Default;
> +import javax.inject.Inject;
> +
> +public class AlternativeInjector
> +{
> + private @Inject @Default IAlternative
> alternative;
> +
> + public IAlternative getAlternative()
> + {
> + return this.alternative;
> + }
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeInjector.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/IAlternative.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/IAlternative.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/IAlternative.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/IAlternative.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,19 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.inject.alternative;
> +
> +public interface IAlternative
> +{
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/IAlternative.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/NotAlternativeComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/NotAlternativeComponent.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/NotAlternativeComponent.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/NotAlternativeComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,19 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.inject.alternative;
> +
> +public class NotAlternativeComponent implements
> IAlternative
> +{
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/NotAlternativeComponent.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptedComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptedComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptedComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptedComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,11 +14,12 @@
> package org.apache.webbeans.test.component.intercept;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.AroundInvoke;
> import javax.interceptor.Interceptors;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { Interceptor1.class })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -20,11 +20,12 @@
> import java.util.Map.Entry;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.AroundInvoke;
> import javax.interceptor.Interceptors;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { InterceptorWithSuperClass.class
> })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithClassInterceptorsComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithClassInterceptorsComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithClassInterceptorsComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithClassInterceptorsComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,10 +14,11 @@
> package org.apache.webbeans.test.component.intercept;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.Interceptors;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { Interceptor1.class })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithoutClassInterceptorsComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithoutClassInterceptorsComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithoutClassInterceptorsComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithoutClassInterceptorsComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,11 +14,12 @@
> package org.apache.webbeans.test.component.intercept;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.ExcludeClassInterceptors;
> import javax.interceptor.Interceptors;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { Interceptor1.class })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleInterceptedComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleInterceptedComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleInterceptedComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleInterceptedComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -20,11 +20,12 @@
> import java.util.Map.Entry;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.AroundInvoke;
> import javax.interceptor.Interceptors;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { Interceptor1.class,
> Interceptor2.class })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,9 +14,10 @@
> package org.apache.webbeans.test.component.intercept;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.Interceptors;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { Interceptor1.class })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedWithExcludeClassComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedWithExcludeClassComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedWithExcludeClassComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedWithExcludeClassComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,12 +14,13 @@
> package org.apache.webbeans.test.component.intercept;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.AroundInvoke;
> import javax.interceptor.ExcludeClassInterceptors;
> import javax.interceptor.Interceptors;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { Interceptor1.class })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/NoArgConstructorInterceptorComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/NoArgConstructorInterceptorComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/NoArgConstructorInterceptorComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/NoArgConstructorInterceptorComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -13,9 +13,10 @@
> */
> package org.apache.webbeans.test.component.intercept;
>
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.Interceptors;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @Interceptors(value = { NoArgConstructorInterceptor.class
> })
> public class NoArgConstructorInterceptorComponent
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,8 +14,8 @@
> package
> org.apache.webbeans.test.component.intercept.webbeans;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.component.intercept.webbeans.bindings.Transactional;
>
> @Production
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,8 +14,8 @@
> package
> org.apache.webbeans.test.component.intercept.webbeans;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.component.intercept.webbeans.bindings.Action;
>
> @Production
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/library/BookShop.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/library/BookShop.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/library/BookShop.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/library/BookShop.java
> Sun Oct 11 14:03:41 2009
> @@ -14,10 +14,11 @@
> package org.apache.webbeans.test.component.library;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.AroundInvoke;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> public class BookShop extends Business implements
> Shop<Book>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,9 +14,9 @@
> package org.apache.webbeans.test.component.newcomp;
>
> import javax.enterprise.inject.New;
> -import javax.enterprise.inject.deployment.Production;
> import javax.inject.Inject;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.component.dependent.DependentOwnerComponent;
>
> @Production
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/ProducerNewComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/ProducerNewComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/ProducerNewComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/ProducerNewComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -15,11 +15,11 @@
>
> import javax.enterprise.context.Dependent;
> import javax.enterprise.context.RequestScoped;
> -import javax.inject.Named;
> import javax.enterprise.inject.New;
> import javax.enterprise.inject.Produces;
> -import javax.enterprise.inject.deployment.Production;
> +import javax.inject.Named;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.component.CheckWithCheckPayment;
> import org.apache.webbeans.test.component.IPayment;
>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/PortableType1.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/PortableType1.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/PortableType1.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/PortableType1.java
> Sun Oct 11 14:03:41 2009
> @@ -15,9 +15,9 @@
>
> import javax.enterprise.event.Observes;
> import javax.enterprise.inject.Default;
> -import javax.inject.Named;
> import javax.enterprise.inject.Produces;
> import javax.inject.Inject;
> +import javax.inject.Named;
> import javax.interceptor.Interceptor;
>
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java
> Sun Oct 11 14:03:41 2009
> @@ -17,7 +17,8 @@
>
> import javax.enterprise.context.RequestScoped;
> import javax.enterprise.inject.Produces;
> -import javax.enterprise.inject.deployment.Production;
> +
> +import
> org.apache.webbeans.annotation.deployment.Production;
>
> @Production
> @RequestScoped
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer1.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer1.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer1.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer1.java
> Sun Oct 11 14:03:41 2009
> @@ -15,10 +15,10 @@
>
> import javax.enterprise.context.ApplicationScoped;
> import javax.enterprise.context.RequestScoped;
> -import javax.inject.Named;
> import javax.enterprise.inject.Produces;
> -import javax.enterprise.inject.deployment.Production;
> +import javax.inject.Named;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
> import
> org.apache.webbeans.test.annotation.binding.ProducerBinding1;
> import
> org.apache.webbeans.test.component.service.IService;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer2.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer2.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer2.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer2.java
> Sun Oct 11 14:03:41 2009
> @@ -15,8 +15,8 @@
>
> import javax.enterprise.context.RequestScoped;
> import javax.enterprise.inject.Produces;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
> import
> org.apache.webbeans.test.annotation.binding.Binding2;
> import
> org.apache.webbeans.test.component.service.IService;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer3.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer3.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer3.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer3.java
> Sun Oct 11 14:03:41 2009
> @@ -15,7 +15,8 @@
>
> import javax.enterprise.context.RequestScoped;
> import javax.enterprise.inject.Produces;
> -import javax.enterprise.inject.deployment.Production;
> +
> +import
> org.apache.webbeans.annotation.deployment.Production;
>
> @Production
> @RequestScoped
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -16,10 +16,10 @@
> import java.io.Serializable;
>
> import javax.enterprise.context.SessionScoped;
> -import javax.inject.Named;
> import javax.enterprise.inject.Produces;
> -import javax.enterprise.inject.deployment.Production;
> +import javax.inject.Named;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding2;
> import org.apache.webbeans.test.annotation.binding.Check;
> import org.apache.webbeans.test.component.IPayment;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorInjectorComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorInjectorComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorInjectorComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorInjectorComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -17,8 +17,8 @@
>
> import javax.enterprise.context.SessionScoped;
> import javax.inject.Named;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding2;
> import org.apache.webbeans.test.component.IPayment;
>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/StaticProducer1.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/StaticProducer1.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/StaticProducer1.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/StaticProducer1.java
> Sun Oct 11 14:03:41 2009
> @@ -14,8 +14,8 @@
> package org.apache.webbeans.test.component.producer;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.inject.Named;
> import javax.enterprise.inject.Produces;
> +import javax.inject.Named;
>
> @RequestScoped
> public class StaticProducer1
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/SpecializesProducer1.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/SpecializesProducer1.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/SpecializesProducer1.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/SpecializesProducer1.java
> Sun Oct 11 14:03:41 2009
> @@ -13,9 +13,9 @@
> */
> package
> org.apache.webbeans.test.component.producer.specializes;
>
> -import javax.inject.Named;
> import javax.enterprise.inject.Produces;
> import javax.enterprise.inject.Specializes;
> +import javax.inject.Named;
>
> import
> org.apache.webbeans.test.annotation.deployment.DeploymentType2;
> import
> org.apache.webbeans.test.component.producer.specializes.superclazz.SpecializesProducer1SuperClazz;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/InjectedComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/InjectedComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/InjectedComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/InjectedComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,8 +14,8 @@
> package org.apache.webbeans.test.component.service;
>
> import javax.enterprise.context.ApplicationScoped;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
>
> @Production
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Producer1ConsumerComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Producer1ConsumerComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Producer1ConsumerComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Producer1ConsumerComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -16,8 +16,8 @@
> import javax.enterprise.context.RequestScoped;
> import javax.inject.Inject;
> import javax.inject.Named;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.ProducerBinding1;
>
> @RequestScoped
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/ServiceImpl1.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/ServiceImpl1.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/ServiceImpl1.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/ServiceImpl1.java
> Sun Oct 11 14:03:41 2009
> @@ -14,8 +14,8 @@
> package org.apache.webbeans.test.component.service;
>
> import javax.enterprise.context.ApplicationScoped;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
>
> @Production
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Typed2.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Typed2.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Typed2.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Typed2.java
> Sun Oct 11 14:03:41 2009
> @@ -16,8 +16,8 @@
> import java.io.Serializable;
>
> import javax.enterprise.context.SessionScoped;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
> import
> org.apache.webbeans.test.annotation.binding.Binding2;
>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -13,7 +13,7 @@
> */
> package org.apache.webbeans.test.component.service;
>
> -import javax.enterprise.inject.deployment.Production;
> +import
> org.apache.webbeans.annotation.deployment.Production;
>
> @Production
> public class TypedComponent implements
> ITyped<String>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjection.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjection.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjection.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjection.java
> Sun Oct 11 14:03:41 2009
> @@ -16,9 +16,9 @@
> import java.io.Serializable;
>
> import javax.enterprise.context.SessionScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.inject.Inject;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
> import
> org.apache.webbeans.test.annotation.binding.Binding2;
>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjectionWithoutArguments.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjectionWithoutArguments.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjectionWithoutArguments.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjectionWithoutArguments.java
> Sun Oct 11 14:03:41 2009
> @@ -16,9 +16,9 @@
> import java.io.Serializable;
>
> import javax.enterprise.context.SessionScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.inject.Inject;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
> import
> org.apache.webbeans.test.annotation.binding.Binding2;
>
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/DefaultLogger.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/DefaultLogger.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/DefaultLogger.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/DefaultLogger.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,28 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +import java.lang.annotation.ElementType;
> +import java.lang.annotation.Retention;
> +import java.lang.annotation.RetentionPolicy;
> +import java.lang.annotation.Target;
> +
> +import javax.inject.Qualifier;
> +
> +@Qualifier
> +@Retention(RetentionPolicy.RUNTIME)
> +@Target( { ElementType.FIELD, ElementType.METHOD,
> ElementType.TYPE, ElementType.PARAMETER })
> +public @interface DefaultLogger {
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/DefaultLogger.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/ISomeLogger.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/ISomeLogger.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/ISomeLogger.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/ISomeLogger.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,20 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +public interface ISomeLogger
> +{
> + public void printError(String
> errorMessage);
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/ISomeLogger.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/LoggerBinding.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/LoggerBinding.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/LoggerBinding.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/LoggerBinding.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,28 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +import java.lang.annotation.ElementType;
> +import java.lang.annotation.Retention;
> +import java.lang.annotation.RetentionPolicy;
> +import java.lang.annotation.Target;
> +
> +import javax.inject.Qualifier;
> +
> +@Qualifier
> +@Retention(RetentionPolicy.RUNTIME)
> +@Target( { ElementType.FIELD, ElementType.METHOD,
> ElementType.TYPE, ElementType.PARAMETER })
> +public @interface LoggerBinding {
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/LoggerBinding.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockNotSpecializedLogger.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockNotSpecializedLogger.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockNotSpecializedLogger.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockNotSpecializedLogger.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,34 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +import javax.enterprise.inject.Alternative;
> +
> +@LoggerBinding
> +@Alternative
> +public class MockNotSpecializedLogger extends
> SystemLogger
> +{
> + private String message;
> +
> + @Override
> + public void printError(String errorMessage)
> + {
> + this.message = errorMessage;
> + }
> +
> + public String getMessage()
> + {
> + return this.message;
> + }
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockNotSpecializedLogger.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockSpecializedLogger.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockSpecializedLogger.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockSpecializedLogger.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockSpecializedLogger.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,36 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +import javax.enterprise.inject.Alternative;
> +import javax.enterprise.inject.Specializes;
> +
> +@LoggerBinding
> +@Alternative
> +@Specializes
> +public class MockSpecializedLogger extends SystemLogger
> +{
> + private String message;
> +
> + @Override
> + public void printError(String errorMessage)
> + {
> + this.message = errorMessage;
> + }
> +
> + public String getMessage()
> + {
> + return this.message;
> + }
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockSpecializedLogger.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SpecializedInjector.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SpecializedInjector.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SpecializedInjector.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SpecializedInjector.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,26 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +import javax.inject.Inject;
> +
> +public class SpecializedInjector
> +{
> + private @Inject @DefaultLogger ISomeLogger
> logger;
> +
> + public ISomeLogger logger()
> + {
> + return logger;
> + }
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SpecializedInjector.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SystemLogger.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SystemLogger.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SystemLogger.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SystemLogger.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,32 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +@LoggerBinding
> +@DefaultLogger
> +public class SystemLogger implements ISomeLogger
> +{
> + private String message;
> +
> + @Override
> + public void printError(String errorMessage)
> + {
> + this.message = errorMessage;
> + }
> +
> + public String getMessage()
> + {
> + return this.message;
> + }
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SystemLogger.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
> Sun Oct 11 14:03:41 2009
> @@ -28,12 +28,12 @@
> import javax.enterprise.inject.TypeLiteral;
> import javax.enterprise.inject.spi.AnnotatedType;
> import javax.enterprise.inject.spi.Bean;
> +import javax.enterprise.inject.spi.BeanManager;
> import javax.enterprise.inject.spi.Decorator;
> import javax.enterprise.inject.spi.InjectionPoint;
> import javax.enterprise.inject.spi.InjectionTarget;
> import javax.enterprise.inject.spi.InterceptionType;
> import javax.enterprise.inject.spi.Interceptor;
> -import javax.enterprise.inject.spi.BeanManager;
> import javax.enterprise.inject.spi.ObserverMethod;
>
> import org.apache.webbeans.component.AbstractBean;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java
> Sun Oct 11 14:03:41 2009
> @@ -24,10 +24,9 @@
> import javax.enterprise.context.Dependent;
> import javax.enterprise.context.spi.Context;
> import javax.enterprise.inject.Instance;
> -import javax.enterprise.inject.deployment.Production;
> import javax.enterprise.inject.spi.Bean;
> -import javax.enterprise.inject.spi.InjectionPoint;
> import javax.enterprise.inject.spi.BeanManager;
> +import javax.enterprise.inject.spi.InjectionPoint;
> import javax.interceptor.Interceptor;
> import javax.servlet.ServletContext;
> import javax.servlet.ServletContextListener;
> @@ -36,6 +35,7 @@
> import junit.framework.Assert;
>
> import org.apache.log4j.Logger;
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import org.apache.webbeans.component.AbstractBean;
> import org.apache.webbeans.component.ManagedBean;
> import org.apache.webbeans.component.WebBeansType;
> @@ -49,7 +49,6 @@
> import
> org.apache.webbeans.deployment.DeploymentTypeManager;
> import org.apache.webbeans.deployment.StereoTypeManager;
> import org.apache.webbeans.deployment.StereoTypeModel;
> -import org.apache.webbeans.event.NotificationManager;
> import org.apache.webbeans.intercept.InterceptorUtil;
> import org.apache.webbeans.intercept.InterceptorsManager;
> import
> org.apache.webbeans.intercept.WebBeansInterceptorConfig;
> @@ -318,7 +317,6 @@
> ManagedBean<T>
> bean = null;
>
> bean =
> ManagedBeanConfigurator.define(clazz,
> WebBeansType.MANAGED);
> -
> if (bean != null)
> {
>
> manager.addBean(WebBeansUtil.createNewSimpleBeanComponent(bean));
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java
> Sun Oct 11 14:03:41 2009
> @@ -31,7 +31,6 @@
> import
> org.apache.webbeans.test.component.decorator.broken.MoreThanOneDelegateAttribute;
> import
> org.apache.webbeans.test.component.decorator.broken.PaymentDecorator;
> import org.apache.webbeans.test.servlet.TestContext;
> -import org.apache.webbeans.util.Asserts;
> import org.junit.Before;
> import org.junit.Test;
>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java
> Sun Oct 11 14:03:41 2009
> @@ -20,7 +20,6 @@
> import junit.framework.Assert;
>
> import org.apache.webbeans.annotation.AnyLiteral;
> -import org.apache.webbeans.annotation.DefaultLiteral;
> import org.apache.webbeans.component.AbstractBean;
> import org.apache.webbeans.context.ContextFactory;
> import org.apache.webbeans.test.annotation.binding.Check;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
> Sun Oct 11 14:03:41 2009
> @@ -19,6 +19,7 @@
> import junit.framework.Assert;
>
> import org.apache.webbeans.component.AbstractBean;
> +import
> org.apache.webbeans.config.OpenWebBeansConfiguration;
> import
> org.apache.webbeans.exception.WebBeansConfigurationException;
> import
> org.apache.webbeans.intercept.ejb.EJBInterceptorConfig;
> import
> org.apache.webbeans.test.component.exception.AroundInvokeWithFinalMethodComponent;
> @@ -49,7 +50,6 @@
> import
> org.apache.webbeans.test.component.exception.InnerComponent.InnerInnerComponent;
> import
> org.apache.webbeans.test.component.intercept.NoArgConstructorInterceptorComponent;
> import org.apache.webbeans.test.servlet.TestContext;
> -
> import org.junit.Before;
> import org.junit.Test;
>
> @@ -78,6 +78,7 @@
> {
> try
> {
> +
> OpenWebBeansConfiguration.getInstance().setProperty(OpenWebBeansConfiguration.USE_INJECTION_RESOLVER_VIA_ALTERNATIVE,
> "false");
>
> clear();
>
> defineSimpleWebBean(ComponentTypeExceptionComponent.class);
> }
> @@ -86,6 +87,10 @@
>
> System.out.println(e.getMessage());
>
> return; // all ok!
> }
> + finally
> + {
> +
> OpenWebBeansConfiguration.getInstance().setProperty(OpenWebBeansConfiguration.USE_INJECTION_RESOLVER_VIA_ALTERNATIVE,
> "true");
> + }
>
> Assert.fail("expecting an exception!");
> }
>
> @@ -95,6 +100,7 @@
>
> WebBeansConfigurationException exc =
> null;
> try
> {
> +
> OpenWebBeansConfiguration.getInstance().setProperty(OpenWebBeansConfiguration.USE_INJECTION_RESOLVER_VIA_ALTERNATIVE,
> "false");
>
> clear();
>
> defineSimpleWebBean(ProducerTypeExceptionComponent.class);
>
> @@ -104,6 +110,10 @@
>
> System.out.println("got expected
> exception: " + e.getMessage());
>
> return; // all ok!
> }
> + finally
> + {
> +
> OpenWebBeansConfiguration.getInstance().setProperty(OpenWebBeansConfiguration.USE_INJECTION_RESOLVER_VIA_ALTERNATIVE,
> "true");
> + }
>
> Assert.fail("expecting an exception!");
> }
>
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,90 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.unittests.inject.alternative;
> +
> +import java.io.InputStream;
> +
> +import javax.enterprise.inject.spi.Bean;
> +
> +import junit.framework.Assert;
> +
> +import org.apache.webbeans.inject.AlternativesManager;
> +import org.apache.webbeans.plugins.PluginLoader;
> +import
> org.apache.webbeans.test.component.inject.alternative.AlternativeComponent;
> +import
> org.apache.webbeans.test.component.inject.alternative.AlternativeInjector;
> +import
> org.apache.webbeans.test.component.inject.alternative.IAlternative;
> +import
> org.apache.webbeans.test.component.inject.alternative.NotAlternativeComponent;
> +import org.apache.webbeans.test.servlet.TestContext;
> +import org.apache.webbeans.test.unittests.xml.XMLTest;
> +import org.apache.webbeans.xml.WebBeansXMLConfigurator;
> +import org.junit.Test;
> +
> +public class AlternativeTest extends TestContext
> +{
> + public AlternativeTest()
> + {
> +
> super(AlternativeTest.class.getName());
> + }
> +
> + @Test
> + public void testInjectAlternative()
> + {
> +
> PluginLoader.getInstance().startUp();
> +
> + InputStream stream =
> XMLTest.class.getClassLoader().getResourceAsStream("org/apache/webbeans/test/xml/alternative/alternatives.xml");
> + Assert.assertNotNull(stream);
> +
> + WebBeansXMLConfigurator
> configurator = new WebBeansXMLConfigurator();
> +
> configurator.configureSpecSpecific(stream,
> "alternative.xml");
> +
> +
> defineSimpleWebBean(AlternativeComponent.class);
> +
> defineSimpleWebBean(NotAlternativeComponent.class);
> +
> +
> Bean<AlternativeInjector> injector =
> defineSimpleWebBean(AlternativeInjector.class);
> + AlternativeInjector instance =
> (AlternativeInjector) getManager().getReference(injector,
> AlternativeInjector.class,
> getManager().createCreationalContext(injector));
> +
> +
> Assert.assertNotNull(instance);
> +
> + IAlternative alternative =
> instance.getAlternative();
> +
> + Assert.assertTrue(alternative
> instanceof AlternativeComponent);
> +
> +
> PluginLoader.getInstance().shutDown();
> +
> + }
> +
> + @Test
> + public void testInjectNotAlternative()
> + {
> +
> PluginLoader.getInstance().startUp();
> +
> +
> AlternativesManager.getInstance().clear();
> +
> +
> defineSimpleWebBean(AlternativeComponent.class);
> +
> defineSimpleWebBean(NotAlternativeComponent.class);
> +
> +
> Bean<AlternativeInjector> injector =
> defineSimpleWebBean(AlternativeInjector.class);
> + AlternativeInjector instance =
> (AlternativeInjector) getManager().getReference(injector,
> AlternativeInjector.class,
> getManager().createCreationalContext(injector));
> +
> +
> Assert.assertNotNull(instance);
> +
> + IAlternative alternative =
> instance.getAlternative();
> +
> + Assert.assertTrue(alternative
> instanceof NotAlternativeComponent);
> +
> +
> PluginLoader.getInstance().shutDown();
> +
> + }
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/named/NamedTests.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/named/NamedTests.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/named/NamedTests.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/named/NamedTests.java
> Sun Oct 11 14:03:41 2009
> @@ -22,7 +22,6 @@
> import javax.enterprise.inject.spi.InjectionPoint;
> import javax.inject.Named;
>
> -import org.apache.webbeans.container.InjectionResolver;
> import
> org.apache.webbeans.exception.WebBeansConfigurationException;
> import
> org.apache.webbeans.inject.impl.InjectionPointFactory;
> import org.apache.webbeans.test.component.IPayment;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
> Sun Oct 11 14:03:41 2009
> @@ -21,7 +21,6 @@
>
> import org.apache.webbeans.component.AbstractBean;
> import org.apache.webbeans.context.ContextFactory;
> -import
> org.apache.webbeans.exception.WebBeansConfigurationException;
> import
> org.apache.webbeans.test.component.intercept.InterceptedComponent;
> import
> org.apache.webbeans.test.component.intercept.InterceptorWithSuperClassInterceptedComponent;
> import
> org.apache.webbeans.test.component.intercept.MultipleInterceptedComponent;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/PortableTests.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/PortableTests.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/PortableTests.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/PortableTests.java
> Sun Oct 11 14:03:41 2009
> @@ -21,7 +21,6 @@
>
> import javax.enterprise.event.Observes;
> import javax.enterprise.inject.Default;
> -import javax.inject.Named;
> import javax.enterprise.inject.Produces;
> import javax.enterprise.inject.spi.AnnotatedConstructor;
> import javax.enterprise.inject.spi.AnnotatedField;
> @@ -29,6 +28,7 @@
> import javax.enterprise.inject.spi.AnnotatedParameter;
> import javax.enterprise.inject.spi.AnnotatedType;
> import javax.inject.Inject;
> +import javax.inject.Named;
> import javax.interceptor.Interceptor;
>
> import junit.framework.Assert;
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,114 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.unittests.specializes.logger;
> +
> +import java.io.InputStream;
> +
> +import javax.enterprise.inject.spi.Bean;
> +
> +import junit.framework.Assert;
> +
> +import org.apache.webbeans.inject.AlternativesManager;
> +import org.apache.webbeans.plugins.PluginLoader;
> +import
> org.apache.webbeans.test.component.specializes.logger.ISomeLogger;
> +import
> org.apache.webbeans.test.component.specializes.logger.MockNotSpecializedLogger;
> +import
> org.apache.webbeans.test.component.specializes.logger.MockSpecializedLogger;
> +import
> org.apache.webbeans.test.component.specializes.logger.SpecializedInjector;
> +import
> org.apache.webbeans.test.component.specializes.logger.SystemLogger;
> +import org.apache.webbeans.test.servlet.TestContext;
> +import org.apache.webbeans.test.unittests.xml.XMLTest;
> +import org.apache.webbeans.util.WebBeansUtil;
> +import org.apache.webbeans.xml.WebBeansXMLConfigurator;
> +import org.junit.Test;
> +
> +public class LoggerSpecializationTest extends TestContext
> +{
> + public LoggerSpecializationTest()
> + {
> +
> super(LoggerSpecializationTest.class.getName());
> + }
> +
> + @Test
> + public void testNotSpecializedVersion()
> + {
> + clear();
> +
> +
> PluginLoader.getInstance().startUp();
> +
> + InputStream stream =
> XMLTest.class.getClassLoader().getResourceAsStream("org/apache/webbeans/test/xml/specializes/alternatives.xml");
> + Assert.assertNotNull(stream);
> +
> + WebBeansXMLConfigurator
> configurator = new WebBeansXMLConfigurator();
> +
> configurator.configureSpecSpecific(stream,
> "alternative.xml");
> +
> +
> defineSimpleWebBean(SystemLogger.class);
> +
> defineSimpleWebBean(MockNotSpecializedLogger.class);
>
> +
> +
> Bean<SpecializedInjector> bean =
> defineSimpleWebBean(SpecializedInjector.class);
> + Object instance =
> getManager().getReference(bean, SpecializedInjector.class,
> null);
> +
> + Assert.assertTrue(instance
> instanceof SpecializedInjector);
> + SpecializedInjector injector =
> (SpecializedInjector)instance;
> +
> + ISomeLogger logger =
> injector.logger();
> +
> + Assert.assertTrue(logger
> instanceof SystemLogger);
> +
> + logger.printError("Hello
> World");
> +
> + SystemLogger sysLogger =
> (SystemLogger)logger;
> +
> + Assert.assertEquals("Hello
> World", sysLogger.getMessage());
> +
> +
> PluginLoader.getInstance().shutDown();
> +
> AlternativesManager.getInstance().clear();
> + }
> +
> + @Test
> + public void testSpecializedVersion()
> + {
> + clear();
> +
> +
> PluginLoader.getInstance().startUp();
> +
> + InputStream stream =
> XMLTest.class.getClassLoader().getResourceAsStream("org/apache/webbeans/test/xml/specializes/alternatives.xml");
> + Assert.assertNotNull(stream);
> +
> + WebBeansXMLConfigurator
> configurator = new WebBeansXMLConfigurator();
> +
> configurator.configureSpecSpecific(stream,
> "alternatives.xml");
> +
> +
> defineSimpleWebBean(SystemLogger.class);
> +
> defineSimpleWebBean(MockSpecializedLogger.class);
> +
> +
> WebBeansUtil.configureSpecializations(MockSpecializedLogger.class);
> +
> +
> Bean<SpecializedInjector> bean =
> defineSimpleWebBean(SpecializedInjector.class);
> + Object instance =
> getManager().getReference(bean, SpecializedInjector.class,
> null);
> +
> + Assert.assertTrue(instance
> instanceof SpecializedInjector);
> + SpecializedInjector injector =
> (SpecializedInjector)instance;
> +
> + ISomeLogger logger =
> injector.logger();
> +
> + Assert.assertTrue(logger
> instanceof MockSpecializedLogger);
> +
> + logger.printError("Hello
> World");
> +
> + MockSpecializedLogger
> sysLogger = (MockSpecializedLogger)logger;
> +
> + Assert.assertEquals("Hello
> World", sysLogger.getMessage());
> +
> +
> PluginLoader.getInstance().shutDown();
> + }
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
> Sun Oct 11 14:03:41 2009
> @@ -17,6 +17,8 @@
>
> import javax.enterprise.inject.spi.Bean;
>
> +import junit.framework.Assert;
> +
> import
> org.apache.webbeans.exception.WebBeansConfigurationException;
> import org.apache.webbeans.inject.AlternativesManager;
> import org.apache.webbeans.test.servlet.TestContext;
> @@ -26,8 +28,6 @@
> import org.apache.webbeans.xml.WebBeansXMLConfigurator;
> import org.junit.Test;
>
> -import junit.framework.Assert;
> -
> public class AlternativesTest extends TestContext
> {
> public AlternativesTest()
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/alternative/alternatives.xml
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/alternative/alternatives.xml?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/alternative/alternatives.xml
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/alternative/alternatives.xml
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,24 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> +Licensed to the Apache Software Foundation (ASF) under
> one
> +or more contributor license agreements. See the
> NOTICE file
> +distributed with this work for additional information
> +regarding copyright ownership. The ASF licenses this
> file
> +to you 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.
> +-->
> +<beans>
> + <alternatives>
> +
> <class>org.apache.webbeans.test.component.inject.alternative.AlternativeComponent</class>
> + </alternatives>
> +</beans>
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/alternative/alternatives.xml
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/specializes/alternatives.xml
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/specializes/alternatives.xml?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/specializes/alternatives.xml
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/specializes/alternatives.xml
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,25 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> +Licensed to the Apache Software Foundation (ASF) under
> one
> +or more contributor license agreements. See the
> NOTICE file
> +distributed with this work for additional information
> +regarding copyright ownership. The ASF licenses this
> file
> +to you 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.
> +-->
> +<beans>
> + <alternatives>
> +
> <class>org.apache.webbeans.test.component.specializes.logger.MockSpecializedLogger</class>
> +
> <class>org.apache.webbeans.test.component.specializes.logger.MockNotSpecializedLogger</class>
> + </alternatives>
> +</beans>
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/specializes/alternatives.xml
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
>
>
Re: svn commit: r824079 [3/3] - in /incubator/openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/annotation/ main/java/org/apache/webbeans/annotation/deployment/ main/java/org/apache/webbeans/component/ main/java/org/apache/webbeans/compon...
Posted by Gurkan Erdogdu <gu...@yahoo.com>.
Hi;
I implemented @Alternative stuff as indicated in the spec. Usage of @DeploymentType is optional now. The default is @Alternative.
You can specify it on the openwebbeans.properties file via "org.apache.webbeans.resolver.useAlternative=true" property.
Thanks;
--Gurkan
________________________________
From: Mark Struberg <st...@yahoo.de>
To: openwebbeans-dev@incubator.apache.org
Sent: Mon, October 12, 2009 12:57:40 AM
Subject: Re: svn commit: r824079 [3/3] - in /incubator/openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/annotation/ main/java/org/apache/webbeans/annotation/deployment/ main/java/org/apache/webbeans/component/ main/java/org/apache/webbeans/compon...
Hi Gurkan!
Not 100% sure why we internalise the old 'Production' annotation. What I understood was that they got replaced with Alternatives, isn't?
Is this a temporary change, then we should @deprecated it.
LieGrue,
strub
--- On Sun, 10/11/09, gerdogdu@apache.org <ge...@apache.org> wrote:
> From: gerdogdu@apache.org <ge...@apache.org>
> Subject: svn commit: r824079 [3/3] - in /incubator/openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/annotation/ main/java/org/apache/webbeans/annotation/deployment/ main/java/org/apache/webbeans/component/ main/java/org/apache/webbeans/compon...
> To: openwebbeans-commits@incubator.apache.org
> Date: Sunday, October 11, 2009, 4:03 PM
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java
> Sun Oct 11 14:03:41 2009
> @@ -15,8 +15,7 @@
>
> import java.io.Serializable;
>
> -import javax.enterprise.inject.deployment.Production;
> -
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.sterotype.StereoWithSessionScope;
> import
> org.apache.webbeans.test.sterotype.StereoWithSessionScope2;
>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithoutScopeStero.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithoutScopeStero.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithoutScopeStero.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithoutScopeStero.java
> Sun Oct 11 14:03:41 2009
> @@ -13,8 +13,7 @@
> */
> package
> org.apache.webbeans.test.component.exception.stero;
>
> -import javax.enterprise.inject.deployment.Production;
> -
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.sterotype.StereoWithNonScope;
>
> @Production
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment1.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment1.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment1.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment1.java
> Sun Oct 11 14:03:41 2009
> @@ -22,7 +22,7 @@
> import java.lang.annotation.RetentionPolicy;
> import java.lang.annotation.Target;
>
> -import javax.enterprise.inject.deployment.DeploymentType;
> +import
> org.apache.webbeans.annotation.deployment.DeploymentType;
>
> @DeploymentType
> @Inherited
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment2.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment2.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment2.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment2.java
> Sun Oct 11 14:03:41 2009
> @@ -22,7 +22,7 @@
> import java.lang.annotation.RetentionPolicy;
> import java.lang.annotation.Target;
>
> -import javax.enterprise.inject.deployment.DeploymentType;
> +import
> org.apache.webbeans.annotation.deployment.DeploymentType;
>
> @DeploymentType
> @Inherited
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeComponent.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeComponent.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,22 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.inject.alternative;
> +
> +import javax.enterprise.inject.Alternative;
> +
> +@Alternative
> +public class AlternativeComponent implements IAlternative
> +{
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeComponent.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeInjector.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeInjector.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeInjector.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeInjector.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,27 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.inject.alternative;
> +
> +import javax.enterprise.inject.Default;
> +import javax.inject.Inject;
> +
> +public class AlternativeInjector
> +{
> + private @Inject @Default IAlternative
> alternative;
> +
> + public IAlternative getAlternative()
> + {
> + return this.alternative;
> + }
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/AlternativeInjector.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/IAlternative.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/IAlternative.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/IAlternative.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/IAlternative.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,19 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.inject.alternative;
> +
> +public interface IAlternative
> +{
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/IAlternative.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/NotAlternativeComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/NotAlternativeComponent.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/NotAlternativeComponent.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/NotAlternativeComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,19 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.inject.alternative;
> +
> +public class NotAlternativeComponent implements
> IAlternative
> +{
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/alternative/NotAlternativeComponent.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptedComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptedComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptedComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptedComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,11 +14,12 @@
> package org.apache.webbeans.test.component.intercept;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.AroundInvoke;
> import javax.interceptor.Interceptors;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { Interceptor1.class })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -20,11 +20,12 @@
> import java.util.Map.Entry;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.AroundInvoke;
> import javax.interceptor.Interceptors;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { InterceptorWithSuperClass.class
> })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithClassInterceptorsComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithClassInterceptorsComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithClassInterceptorsComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithClassInterceptorsComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,10 +14,11 @@
> package org.apache.webbeans.test.component.intercept;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.Interceptors;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { Interceptor1.class })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithoutClassInterceptorsComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithoutClassInterceptorsComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithoutClassInterceptorsComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithoutClassInterceptorsComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,11 +14,12 @@
> package org.apache.webbeans.test.component.intercept;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.ExcludeClassInterceptors;
> import javax.interceptor.Interceptors;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { Interceptor1.class })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleInterceptedComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleInterceptedComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleInterceptedComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleInterceptedComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -20,11 +20,12 @@
> import java.util.Map.Entry;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.AroundInvoke;
> import javax.interceptor.Interceptors;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { Interceptor1.class,
> Interceptor2.class })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,9 +14,10 @@
> package org.apache.webbeans.test.component.intercept;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.Interceptors;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { Interceptor1.class })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedWithExcludeClassComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedWithExcludeClassComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedWithExcludeClassComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedWithExcludeClassComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,12 +14,13 @@
> package org.apache.webbeans.test.component.intercept;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.AroundInvoke;
> import javax.interceptor.ExcludeClassInterceptors;
> import javax.interceptor.Interceptors;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> @Interceptors(value = { Interceptor1.class })
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/NoArgConstructorInterceptorComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/NoArgConstructorInterceptorComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/NoArgConstructorInterceptorComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/NoArgConstructorInterceptorComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -13,9 +13,10 @@
> */
> package org.apache.webbeans.test.component.intercept;
>
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.Interceptors;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @Interceptors(value = { NoArgConstructorInterceptor.class
> })
> public class NoArgConstructorInterceptorComponent
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,8 +14,8 @@
> package
> org.apache.webbeans.test.component.intercept.webbeans;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.component.intercept.webbeans.bindings.Transactional;
>
> @Production
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,8 +14,8 @@
> package
> org.apache.webbeans.test.component.intercept.webbeans;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.component.intercept.webbeans.bindings.Action;
>
> @Production
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/library/BookShop.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/library/BookShop.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/library/BookShop.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/library/BookShop.java
> Sun Oct 11 14:03:41 2009
> @@ -14,10 +14,11 @@
> package org.apache.webbeans.test.component.library;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.interceptor.AroundInvoke;
> import javax.interceptor.InvocationContext;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> +
> @Production
> @RequestScoped
> public class BookShop extends Business implements
> Shop<Book>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,9 +14,9 @@
> package org.apache.webbeans.test.component.newcomp;
>
> import javax.enterprise.inject.New;
> -import javax.enterprise.inject.deployment.Production;
> import javax.inject.Inject;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.component.dependent.DependentOwnerComponent;
>
> @Production
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/ProducerNewComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/ProducerNewComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/ProducerNewComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/ProducerNewComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -15,11 +15,11 @@
>
> import javax.enterprise.context.Dependent;
> import javax.enterprise.context.RequestScoped;
> -import javax.inject.Named;
> import javax.enterprise.inject.New;
> import javax.enterprise.inject.Produces;
> -import javax.enterprise.inject.deployment.Production;
> +import javax.inject.Named;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.component.CheckWithCheckPayment;
> import org.apache.webbeans.test.component.IPayment;
>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/PortableType1.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/PortableType1.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/PortableType1.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/PortableType1.java
> Sun Oct 11 14:03:41 2009
> @@ -15,9 +15,9 @@
>
> import javax.enterprise.event.Observes;
> import javax.enterprise.inject.Default;
> -import javax.inject.Named;
> import javax.enterprise.inject.Produces;
> import javax.inject.Inject;
> +import javax.inject.Named;
> import javax.interceptor.Interceptor;
>
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java
> Sun Oct 11 14:03:41 2009
> @@ -17,7 +17,8 @@
>
> import javax.enterprise.context.RequestScoped;
> import javax.enterprise.inject.Produces;
> -import javax.enterprise.inject.deployment.Production;
> +
> +import
> org.apache.webbeans.annotation.deployment.Production;
>
> @Production
> @RequestScoped
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer1.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer1.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer1.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer1.java
> Sun Oct 11 14:03:41 2009
> @@ -15,10 +15,10 @@
>
> import javax.enterprise.context.ApplicationScoped;
> import javax.enterprise.context.RequestScoped;
> -import javax.inject.Named;
> import javax.enterprise.inject.Produces;
> -import javax.enterprise.inject.deployment.Production;
> +import javax.inject.Named;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
> import
> org.apache.webbeans.test.annotation.binding.ProducerBinding1;
> import
> org.apache.webbeans.test.component.service.IService;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer2.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer2.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer2.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer2.java
> Sun Oct 11 14:03:41 2009
> @@ -15,8 +15,8 @@
>
> import javax.enterprise.context.RequestScoped;
> import javax.enterprise.inject.Produces;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
> import
> org.apache.webbeans.test.annotation.binding.Binding2;
> import
> org.apache.webbeans.test.component.service.IService;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer3.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer3.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer3.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer3.java
> Sun Oct 11 14:03:41 2009
> @@ -15,7 +15,8 @@
>
> import javax.enterprise.context.RequestScoped;
> import javax.enterprise.inject.Produces;
> -import javax.enterprise.inject.deployment.Production;
> +
> +import
> org.apache.webbeans.annotation.deployment.Production;
>
> @Production
> @RequestScoped
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -16,10 +16,10 @@
> import java.io.Serializable;
>
> import javax.enterprise.context.SessionScoped;
> -import javax.inject.Named;
> import javax.enterprise.inject.Produces;
> -import javax.enterprise.inject.deployment.Production;
> +import javax.inject.Named;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding2;
> import org.apache.webbeans.test.annotation.binding.Check;
> import org.apache.webbeans.test.component.IPayment;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorInjectorComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorInjectorComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorInjectorComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorInjectorComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -17,8 +17,8 @@
>
> import javax.enterprise.context.SessionScoped;
> import javax.inject.Named;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding2;
> import org.apache.webbeans.test.component.IPayment;
>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/StaticProducer1.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/StaticProducer1.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/StaticProducer1.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/StaticProducer1.java
> Sun Oct 11 14:03:41 2009
> @@ -14,8 +14,8 @@
> package org.apache.webbeans.test.component.producer;
>
> import javax.enterprise.context.RequestScoped;
> -import javax.inject.Named;
> import javax.enterprise.inject.Produces;
> +import javax.inject.Named;
>
> @RequestScoped
> public class StaticProducer1
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/SpecializesProducer1.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/SpecializesProducer1.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/SpecializesProducer1.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/SpecializesProducer1.java
> Sun Oct 11 14:03:41 2009
> @@ -13,9 +13,9 @@
> */
> package
> org.apache.webbeans.test.component.producer.specializes;
>
> -import javax.inject.Named;
> import javax.enterprise.inject.Produces;
> import javax.enterprise.inject.Specializes;
> +import javax.inject.Named;
>
> import
> org.apache.webbeans.test.annotation.deployment.DeploymentType2;
> import
> org.apache.webbeans.test.component.producer.specializes.superclazz.SpecializesProducer1SuperClazz;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/InjectedComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/InjectedComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/InjectedComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/InjectedComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -14,8 +14,8 @@
> package org.apache.webbeans.test.component.service;
>
> import javax.enterprise.context.ApplicationScoped;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
>
> @Production
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Producer1ConsumerComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Producer1ConsumerComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Producer1ConsumerComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Producer1ConsumerComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -16,8 +16,8 @@
> import javax.enterprise.context.RequestScoped;
> import javax.inject.Inject;
> import javax.inject.Named;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.ProducerBinding1;
>
> @RequestScoped
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/ServiceImpl1.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/ServiceImpl1.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/ServiceImpl1.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/ServiceImpl1.java
> Sun Oct 11 14:03:41 2009
> @@ -14,8 +14,8 @@
> package org.apache.webbeans.test.component.service;
>
> import javax.enterprise.context.ApplicationScoped;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
>
> @Production
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Typed2.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Typed2.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Typed2.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Typed2.java
> Sun Oct 11 14:03:41 2009
> @@ -16,8 +16,8 @@
> import java.io.Serializable;
>
> import javax.enterprise.context.SessionScoped;
> -import javax.enterprise.inject.deployment.Production;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
> import
> org.apache.webbeans.test.annotation.binding.Binding2;
>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedComponent.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedComponent.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedComponent.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedComponent.java
> Sun Oct 11 14:03:41 2009
> @@ -13,7 +13,7 @@
> */
> package org.apache.webbeans.test.component.service;
>
> -import javax.enterprise.inject.deployment.Production;
> +import
> org.apache.webbeans.annotation.deployment.Production;
>
> @Production
> public class TypedComponent implements
> ITyped<String>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjection.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjection.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjection.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjection.java
> Sun Oct 11 14:03:41 2009
> @@ -16,9 +16,9 @@
> import java.io.Serializable;
>
> import javax.enterprise.context.SessionScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.inject.Inject;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
> import
> org.apache.webbeans.test.annotation.binding.Binding2;
>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjectionWithoutArguments.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjectionWithoutArguments.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjectionWithoutArguments.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjectionWithoutArguments.java
> Sun Oct 11 14:03:41 2009
> @@ -16,9 +16,9 @@
> import java.io.Serializable;
>
> import javax.enterprise.context.SessionScoped;
> -import javax.enterprise.inject.deployment.Production;
> import javax.inject.Inject;
>
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import
> org.apache.webbeans.test.annotation.binding.Binding1;
> import
> org.apache.webbeans.test.annotation.binding.Binding2;
>
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/DefaultLogger.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/DefaultLogger.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/DefaultLogger.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/DefaultLogger.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,28 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +import java.lang.annotation.ElementType;
> +import java.lang.annotation.Retention;
> +import java.lang.annotation.RetentionPolicy;
> +import java.lang.annotation.Target;
> +
> +import javax.inject.Qualifier;
> +
> +@Qualifier
> +@Retention(RetentionPolicy.RUNTIME)
> +@Target( { ElementType.FIELD, ElementType.METHOD,
> ElementType.TYPE, ElementType.PARAMETER })
> +public @interface DefaultLogger {
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/DefaultLogger.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/ISomeLogger.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/ISomeLogger.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/ISomeLogger.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/ISomeLogger.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,20 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +public interface ISomeLogger
> +{
> + public void printError(String
> errorMessage);
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/ISomeLogger.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/LoggerBinding.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/LoggerBinding.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/LoggerBinding.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/LoggerBinding.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,28 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +import java.lang.annotation.ElementType;
> +import java.lang.annotation.Retention;
> +import java.lang.annotation.RetentionPolicy;
> +import java.lang.annotation.Target;
> +
> +import javax.inject.Qualifier;
> +
> +@Qualifier
> +@Retention(RetentionPolicy.RUNTIME)
> +@Target( { ElementType.FIELD, ElementType.METHOD,
> ElementType.TYPE, ElementType.PARAMETER })
> +public @interface LoggerBinding {
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/LoggerBinding.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockNotSpecializedLogger.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockNotSpecializedLogger.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockNotSpecializedLogger.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockNotSpecializedLogger.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,34 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +import javax.enterprise.inject.Alternative;
> +
> +@LoggerBinding
> +@Alternative
> +public class MockNotSpecializedLogger extends
> SystemLogger
> +{
> + private String message;
> +
> + @Override
> + public void printError(String errorMessage)
> + {
> + this.message = errorMessage;
> + }
> +
> + public String getMessage()
> + {
> + return this.message;
> + }
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockNotSpecializedLogger.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockSpecializedLogger.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockSpecializedLogger.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockSpecializedLogger.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockSpecializedLogger.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,36 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +import javax.enterprise.inject.Alternative;
> +import javax.enterprise.inject.Specializes;
> +
> +@LoggerBinding
> +@Alternative
> +@Specializes
> +public class MockSpecializedLogger extends SystemLogger
> +{
> + private String message;
> +
> + @Override
> + public void printError(String errorMessage)
> + {
> + this.message = errorMessage;
> + }
> +
> + public String getMessage()
> + {
> + return this.message;
> + }
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/MockSpecializedLogger.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SpecializedInjector.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SpecializedInjector.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SpecializedInjector.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SpecializedInjector.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,26 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +import javax.inject.Inject;
> +
> +public class SpecializedInjector
> +{
> + private @Inject @DefaultLogger ISomeLogger
> logger;
> +
> + public ISomeLogger logger()
> + {
> + return logger;
> + }
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SpecializedInjector.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SystemLogger.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SystemLogger.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SystemLogger.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SystemLogger.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,32 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.component.specializes.logger;
> +
> +@LoggerBinding
> +@DefaultLogger
> +public class SystemLogger implements ISomeLogger
> +{
> + private String message;
> +
> + @Override
> + public void printError(String errorMessage)
> + {
> + this.message = errorMessage;
> + }
> +
> + public String getMessage()
> + {
> + return this.message;
> + }
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/logger/SystemLogger.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
> Sun Oct 11 14:03:41 2009
> @@ -28,12 +28,12 @@
> import javax.enterprise.inject.TypeLiteral;
> import javax.enterprise.inject.spi.AnnotatedType;
> import javax.enterprise.inject.spi.Bean;
> +import javax.enterprise.inject.spi.BeanManager;
> import javax.enterprise.inject.spi.Decorator;
> import javax.enterprise.inject.spi.InjectionPoint;
> import javax.enterprise.inject.spi.InjectionTarget;
> import javax.enterprise.inject.spi.InterceptionType;
> import javax.enterprise.inject.spi.Interceptor;
> -import javax.enterprise.inject.spi.BeanManager;
> import javax.enterprise.inject.spi.ObserverMethod;
>
> import org.apache.webbeans.component.AbstractBean;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java
> Sun Oct 11 14:03:41 2009
> @@ -24,10 +24,9 @@
> import javax.enterprise.context.Dependent;
> import javax.enterprise.context.spi.Context;
> import javax.enterprise.inject.Instance;
> -import javax.enterprise.inject.deployment.Production;
> import javax.enterprise.inject.spi.Bean;
> -import javax.enterprise.inject.spi.InjectionPoint;
> import javax.enterprise.inject.spi.BeanManager;
> +import javax.enterprise.inject.spi.InjectionPoint;
> import javax.interceptor.Interceptor;
> import javax.servlet.ServletContext;
> import javax.servlet.ServletContextListener;
> @@ -36,6 +35,7 @@
> import junit.framework.Assert;
>
> import org.apache.log4j.Logger;
> +import
> org.apache.webbeans.annotation.deployment.Production;
> import org.apache.webbeans.component.AbstractBean;
> import org.apache.webbeans.component.ManagedBean;
> import org.apache.webbeans.component.WebBeansType;
> @@ -49,7 +49,6 @@
> import
> org.apache.webbeans.deployment.DeploymentTypeManager;
> import org.apache.webbeans.deployment.StereoTypeManager;
> import org.apache.webbeans.deployment.StereoTypeModel;
> -import org.apache.webbeans.event.NotificationManager;
> import org.apache.webbeans.intercept.InterceptorUtil;
> import org.apache.webbeans.intercept.InterceptorsManager;
> import
> org.apache.webbeans.intercept.WebBeansInterceptorConfig;
> @@ -318,7 +317,6 @@
> ManagedBean<T>
> bean = null;
>
> bean =
> ManagedBeanConfigurator.define(clazz,
> WebBeansType.MANAGED);
> -
> if (bean != null)
> {
>
> manager.addBean(WebBeansUtil.createNewSimpleBeanComponent(bean));
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java
> Sun Oct 11 14:03:41 2009
> @@ -31,7 +31,6 @@
> import
> org.apache.webbeans.test.component.decorator.broken.MoreThanOneDelegateAttribute;
> import
> org.apache.webbeans.test.component.decorator.broken.PaymentDecorator;
> import org.apache.webbeans.test.servlet.TestContext;
> -import org.apache.webbeans.util.Asserts;
> import org.junit.Before;
> import org.junit.Test;
>
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java
> Sun Oct 11 14:03:41 2009
> @@ -20,7 +20,6 @@
> import junit.framework.Assert;
>
> import org.apache.webbeans.annotation.AnyLiteral;
> -import org.apache.webbeans.annotation.DefaultLiteral;
> import org.apache.webbeans.component.AbstractBean;
> import org.apache.webbeans.context.ContextFactory;
> import org.apache.webbeans.test.annotation.binding.Check;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
> Sun Oct 11 14:03:41 2009
> @@ -19,6 +19,7 @@
> import junit.framework.Assert;
>
> import org.apache.webbeans.component.AbstractBean;
> +import
> org.apache.webbeans.config.OpenWebBeansConfiguration;
> import
> org.apache.webbeans.exception.WebBeansConfigurationException;
> import
> org.apache.webbeans.intercept.ejb.EJBInterceptorConfig;
> import
> org.apache.webbeans.test.component.exception.AroundInvokeWithFinalMethodComponent;
> @@ -49,7 +50,6 @@
> import
> org.apache.webbeans.test.component.exception.InnerComponent.InnerInnerComponent;
> import
> org.apache.webbeans.test.component.intercept.NoArgConstructorInterceptorComponent;
> import org.apache.webbeans.test.servlet.TestContext;
> -
> import org.junit.Before;
> import org.junit.Test;
>
> @@ -78,6 +78,7 @@
> {
> try
> {
> +
> OpenWebBeansConfiguration.getInstance().setProperty(OpenWebBeansConfiguration.USE_INJECTION_RESOLVER_VIA_ALTERNATIVE,
> "false");
>
> clear();
>
> defineSimpleWebBean(ComponentTypeExceptionComponent.class);
> }
> @@ -86,6 +87,10 @@
>
> System.out.println(e.getMessage());
>
> return; // all ok!
> }
> + finally
> + {
> +
> OpenWebBeansConfiguration.getInstance().setProperty(OpenWebBeansConfiguration.USE_INJECTION_RESOLVER_VIA_ALTERNATIVE,
> "true");
> + }
>
> Assert.fail("expecting an exception!");
> }
>
> @@ -95,6 +100,7 @@
>
> WebBeansConfigurationException exc =
> null;
> try
> {
> +
> OpenWebBeansConfiguration.getInstance().setProperty(OpenWebBeansConfiguration.USE_INJECTION_RESOLVER_VIA_ALTERNATIVE,
> "false");
>
> clear();
>
> defineSimpleWebBean(ProducerTypeExceptionComponent.class);
>
> @@ -104,6 +110,10 @@
>
> System.out.println("got expected
> exception: " + e.getMessage());
>
> return; // all ok!
> }
> + finally
> + {
> +
> OpenWebBeansConfiguration.getInstance().setProperty(OpenWebBeansConfiguration.USE_INJECTION_RESOLVER_VIA_ALTERNATIVE,
> "true");
> + }
>
> Assert.fail("expecting an exception!");
> }
>
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,90 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.unittests.inject.alternative;
> +
> +import java.io.InputStream;
> +
> +import javax.enterprise.inject.spi.Bean;
> +
> +import junit.framework.Assert;
> +
> +import org.apache.webbeans.inject.AlternativesManager;
> +import org.apache.webbeans.plugins.PluginLoader;
> +import
> org.apache.webbeans.test.component.inject.alternative.AlternativeComponent;
> +import
> org.apache.webbeans.test.component.inject.alternative.AlternativeInjector;
> +import
> org.apache.webbeans.test.component.inject.alternative.IAlternative;
> +import
> org.apache.webbeans.test.component.inject.alternative.NotAlternativeComponent;
> +import org.apache.webbeans.test.servlet.TestContext;
> +import org.apache.webbeans.test.unittests.xml.XMLTest;
> +import org.apache.webbeans.xml.WebBeansXMLConfigurator;
> +import org.junit.Test;
> +
> +public class AlternativeTest extends TestContext
> +{
> + public AlternativeTest()
> + {
> +
> super(AlternativeTest.class.getName());
> + }
> +
> + @Test
> + public void testInjectAlternative()
> + {
> +
> PluginLoader.getInstance().startUp();
> +
> + InputStream stream =
> XMLTest.class.getClassLoader().getResourceAsStream("org/apache/webbeans/test/xml/alternative/alternatives.xml");
> + Assert.assertNotNull(stream);
> +
> + WebBeansXMLConfigurator
> configurator = new WebBeansXMLConfigurator();
> +
> configurator.configureSpecSpecific(stream,
> "alternative.xml");
> +
> +
> defineSimpleWebBean(AlternativeComponent.class);
> +
> defineSimpleWebBean(NotAlternativeComponent.class);
> +
> +
> Bean<AlternativeInjector> injector =
> defineSimpleWebBean(AlternativeInjector.class);
> + AlternativeInjector instance =
> (AlternativeInjector) getManager().getReference(injector,
> AlternativeInjector.class,
> getManager().createCreationalContext(injector));
> +
> +
> Assert.assertNotNull(instance);
> +
> + IAlternative alternative =
> instance.getAlternative();
> +
> + Assert.assertTrue(alternative
> instanceof AlternativeComponent);
> +
> +
> PluginLoader.getInstance().shutDown();
> +
> + }
> +
> + @Test
> + public void testInjectNotAlternative()
> + {
> +
> PluginLoader.getInstance().startUp();
> +
> +
> AlternativesManager.getInstance().clear();
> +
> +
> defineSimpleWebBean(AlternativeComponent.class);
> +
> defineSimpleWebBean(NotAlternativeComponent.class);
> +
> +
> Bean<AlternativeInjector> injector =
> defineSimpleWebBean(AlternativeInjector.class);
> + AlternativeInjector instance =
> (AlternativeInjector) getManager().getReference(injector,
> AlternativeInjector.class,
> getManager().createCreationalContext(injector));
> +
> +
> Assert.assertNotNull(instance);
> +
> + IAlternative alternative =
> instance.getAlternative();
> +
> + Assert.assertTrue(alternative
> instanceof NotAlternativeComponent);
> +
> +
> PluginLoader.getInstance().shutDown();
> +
> + }
> +
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/named/NamedTests.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/named/NamedTests.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/named/NamedTests.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/named/NamedTests.java
> Sun Oct 11 14:03:41 2009
> @@ -22,7 +22,6 @@
> import javax.enterprise.inject.spi.InjectionPoint;
> import javax.inject.Named;
>
> -import org.apache.webbeans.container.InjectionResolver;
> import
> org.apache.webbeans.exception.WebBeansConfigurationException;
> import
> org.apache.webbeans.inject.impl.InjectionPointFactory;
> import org.apache.webbeans.test.component.IPayment;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
> Sun Oct 11 14:03:41 2009
> @@ -21,7 +21,6 @@
>
> import org.apache.webbeans.component.AbstractBean;
> import org.apache.webbeans.context.ContextFactory;
> -import
> org.apache.webbeans.exception.WebBeansConfigurationException;
> import
> org.apache.webbeans.test.component.intercept.InterceptedComponent;
> import
> org.apache.webbeans.test.component.intercept.InterceptorWithSuperClassInterceptedComponent;
> import
> org.apache.webbeans.test.component.intercept.MultipleInterceptedComponent;
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/PortableTests.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/PortableTests.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/PortableTests.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/PortableTests.java
> Sun Oct 11 14:03:41 2009
> @@ -21,7 +21,6 @@
>
> import javax.enterprise.event.Observes;
> import javax.enterprise.inject.Default;
> -import javax.inject.Named;
> import javax.enterprise.inject.Produces;
> import javax.enterprise.inject.spi.AnnotatedConstructor;
> import javax.enterprise.inject.spi.AnnotatedField;
> @@ -29,6 +28,7 @@
> import javax.enterprise.inject.spi.AnnotatedParameter;
> import javax.enterprise.inject.spi.AnnotatedType;
> import javax.inject.Inject;
> +import javax.inject.Named;
> import javax.interceptor.Interceptor;
>
> import junit.framework.Assert;
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,114 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under
> one or more
> + * contributor license agreements. See the NOTICE file
> distributed with this
> + * work for additional information regarding copyright
> ownership. The ASF
> + * licenses this file to You 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.apache.webbeans.test.unittests.specializes.logger;
> +
> +import java.io.InputStream;
> +
> +import javax.enterprise.inject.spi.Bean;
> +
> +import junit.framework.Assert;
> +
> +import org.apache.webbeans.inject.AlternativesManager;
> +import org.apache.webbeans.plugins.PluginLoader;
> +import
> org.apache.webbeans.test.component.specializes.logger.ISomeLogger;
> +import
> org.apache.webbeans.test.component.specializes.logger.MockNotSpecializedLogger;
> +import
> org.apache.webbeans.test.component.specializes.logger.MockSpecializedLogger;
> +import
> org.apache.webbeans.test.component.specializes.logger.SpecializedInjector;
> +import
> org.apache.webbeans.test.component.specializes.logger.SystemLogger;
> +import org.apache.webbeans.test.servlet.TestContext;
> +import org.apache.webbeans.test.unittests.xml.XMLTest;
> +import org.apache.webbeans.util.WebBeansUtil;
> +import org.apache.webbeans.xml.WebBeansXMLConfigurator;
> +import org.junit.Test;
> +
> +public class LoggerSpecializationTest extends TestContext
> +{
> + public LoggerSpecializationTest()
> + {
> +
> super(LoggerSpecializationTest.class.getName());
> + }
> +
> + @Test
> + public void testNotSpecializedVersion()
> + {
> + clear();
> +
> +
> PluginLoader.getInstance().startUp();
> +
> + InputStream stream =
> XMLTest.class.getClassLoader().getResourceAsStream("org/apache/webbeans/test/xml/specializes/alternatives.xml");
> + Assert.assertNotNull(stream);
> +
> + WebBeansXMLConfigurator
> configurator = new WebBeansXMLConfigurator();
> +
> configurator.configureSpecSpecific(stream,
> "alternative.xml");
> +
> +
> defineSimpleWebBean(SystemLogger.class);
> +
> defineSimpleWebBean(MockNotSpecializedLogger.class);
>
> +
> +
> Bean<SpecializedInjector> bean =
> defineSimpleWebBean(SpecializedInjector.class);
> + Object instance =
> getManager().getReference(bean, SpecializedInjector.class,
> null);
> +
> + Assert.assertTrue(instance
> instanceof SpecializedInjector);
> + SpecializedInjector injector =
> (SpecializedInjector)instance;
> +
> + ISomeLogger logger =
> injector.logger();
> +
> + Assert.assertTrue(logger
> instanceof SystemLogger);
> +
> + logger.printError("Hello
> World");
> +
> + SystemLogger sysLogger =
> (SystemLogger)logger;
> +
> + Assert.assertEquals("Hello
> World", sysLogger.getMessage());
> +
> +
> PluginLoader.getInstance().shutDown();
> +
> AlternativesManager.getInstance().clear();
> + }
> +
> + @Test
> + public void testSpecializedVersion()
> + {
> + clear();
> +
> +
> PluginLoader.getInstance().startUp();
> +
> + InputStream stream =
> XMLTest.class.getClassLoader().getResourceAsStream("org/apache/webbeans/test/xml/specializes/alternatives.xml");
> + Assert.assertNotNull(stream);
> +
> + WebBeansXMLConfigurator
> configurator = new WebBeansXMLConfigurator();
> +
> configurator.configureSpecSpecific(stream,
> "alternatives.xml");
> +
> +
> defineSimpleWebBean(SystemLogger.class);
> +
> defineSimpleWebBean(MockSpecializedLogger.class);
> +
> +
> WebBeansUtil.configureSpecializations(MockSpecializedLogger.class);
> +
> +
> Bean<SpecializedInjector> bean =
> defineSimpleWebBean(SpecializedInjector.class);
> + Object instance =
> getManager().getReference(bean, SpecializedInjector.class,
> null);
> +
> + Assert.assertTrue(instance
> instanceof SpecializedInjector);
> + SpecializedInjector injector =
> (SpecializedInjector)instance;
> +
> + ISomeLogger logger =
> injector.logger();
> +
> + Assert.assertTrue(logger
> instanceof MockSpecializedLogger);
> +
> + logger.printError("Hello
> World");
> +
> + MockSpecializedLogger
> sysLogger = (MockSpecializedLogger)logger;
> +
> + Assert.assertEquals("Hello
> World", sysLogger.getMessage());
> +
> +
> PluginLoader.getInstance().shutDown();
> + }
> +}
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java?rev=824079&r1=824078&r2=824079&view=diff
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
> (original)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
> Sun Oct 11 14:03:41 2009
> @@ -17,6 +17,8 @@
>
> import javax.enterprise.inject.spi.Bean;
>
> +import junit.framework.Assert;
> +
> import
> org.apache.webbeans.exception.WebBeansConfigurationException;
> import org.apache.webbeans.inject.AlternativesManager;
> import org.apache.webbeans.test.servlet.TestContext;
> @@ -26,8 +28,6 @@
> import org.apache.webbeans.xml.WebBeansXMLConfigurator;
> import org.junit.Test;
>
> -import junit.framework.Assert;
> -
> public class AlternativesTest extends TestContext
> {
> public AlternativesTest()
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/alternative/alternatives.xml
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/alternative/alternatives.xml?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/alternative/alternatives.xml
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/alternative/alternatives.xml
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,24 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> +Licensed to the Apache Software Foundation (ASF) under
> one
> +or more contributor license agreements. See the
> NOTICE file
> +distributed with this work for additional information
> +regarding copyright ownership. The ASF licenses this
> file
> +to you 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.
> +-->
> +<beans>
> + <alternatives>
> +
> <class>org.apache.webbeans.test.component.inject.alternative.AlternativeComponent</class>
> + </alternatives>
> +</beans>
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/alternative/alternatives.xml
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/specializes/alternatives.xml
> URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/specializes/alternatives.xml?rev=824079&view=auto
> ==============================================================================
> ---
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/specializes/alternatives.xml
> (added)
> +++
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/specializes/alternatives.xml
> Sun Oct 11 14:03:41 2009
> @@ -0,0 +1,25 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> +Licensed to the Apache Software Foundation (ASF) under
> one
> +or more contributor license agreements. See the
> NOTICE file
> +distributed with this work for additional information
> +regarding copyright ownership. The ASF licenses this
> file
> +to you 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.
> +-->
> +<beans>
> + <alternatives>
> +
> <class>org.apache.webbeans.test.component.specializes.logger.MockSpecializedLogger</class>
> +
> <class>org.apache.webbeans.test.component.specializes.logger.MockNotSpecializedLogger</class>
> + </alternatives>
> +</beans>
>
> Propchange:
> incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/specializes/alternatives.xml
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
>
>