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

Author: pete.muir(a)jboss.org Date: 2009-08-16 11:35:33 -0400 (Sun, 16 Aug 2009) New Revision: 3523 Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractBuiltInBean.java Removed: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractStandardBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractFacade.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractFacadeBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/EventBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/ExtensionBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/FacadeBeanResolvableTransformer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/InjectionPointBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/InstanceBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/InstanceImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/ManagerBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/ExtensionBeanDeployer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeBeanResolver.java Log: Rename standard->built in Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin (from rev 3508, ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard) Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractBuiltInBean.java (from rev 3508, ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractBuiltInBean.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractBuiltInBean.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -0,0 +1,121 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.bean.builtin; + +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import javax.enterprise.context.Dependent; + +import org.jboss.webbeans.BeanManagerImpl; +import org.jboss.webbeans.bean.RIBean; +import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; +import org.jboss.webbeans.injection.WBInjectionPoint; +import org.jboss.webbeans.literal.AnyLiteral; +import org.jboss.webbeans.literal.CurrentLiteral; + +public abstract class AbstractBuiltInBean<T> extends RIBean<T> +{ + + private static final Annotation[] DEFAULT_BINDING_ARRAY = { new CurrentLiteral(), new AnyLiteral() }; + private static final Set<Annotation> DEFAULT_BINDING = new HashSet<Annotation>(Arrays.asList(DEFAULT_BINDING_ARRAY)); + + private final String id; + + protected AbstractBuiltInBean(BeanManagerImpl manager) + { + super(manager); + this.id = getClass().getSimpleName(); + } + + @Override + public void initialize(BeanDeployerEnvironment environment) + { + // No-op + } + + + public Set<Annotation> getBindings() + { + return DEFAULT_BINDING; + } + + public Class<? extends Annotation> getScopeType() + { + return Dependent.class; + } + + @Override + public RIBean<?> getSpecializedBean() + { + return null; + } + + public String getName() + { + return null; + } + + public Set<Class<? extends Annotation>> getStereotypes() + { + return Collections.emptySet(); + } + + @Override + public Set<WBInjectionPoint<?, ?>> getAnnotatedInjectionPoints() + { + return Collections.emptySet(); + } + + public boolean isNullable() + { + return true; + } + + @Override + public boolean isPrimitive() + { + return false; + } + + @Override + public boolean isSpecializing() + { + return false; + } + + public boolean isPolicy() + { + return false; + } + + @Override + public boolean isProxyable() + { + return false; + } + + @Override + public String getId() + { + return id; + } + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractBuiltInBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractFacade.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacade.java 2009-08-15 14:05:42 UTC (rev 3508) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractFacade.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.bean.standard; +package org.jboss.webbeans.bean.builtin; import java.io.Serializable; import java.lang.annotation.Annotation; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractFacadeBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java 2009-08-15 14:05:42 UTC (rev 3508) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractFacadeBean.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.bean.standard; +package org.jboss.webbeans.bean.builtin; import java.lang.annotation.Annotation; import java.lang.reflect.ParameterizedType; @@ -28,7 +28,7 @@ import org.jboss.webbeans.log.Log; import org.jboss.webbeans.log.Logging; -public abstract class AbstractFacadeBean<T> extends AbstractStandardBean<T> +public abstract class AbstractFacadeBean<T> extends AbstractBuiltInBean<T> { private static final Log log = Logging.getLog(AbstractFacadeBean.class); Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractStandardBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java 2009-08-15 14:05:42 UTC (rev 3508) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/AbstractStandardBean.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -1,121 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.bean.standard; - -import java.lang.annotation.Annotation; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - -import javax.enterprise.context.Dependent; - -import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.bean.RIBean; -import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; -import org.jboss.webbeans.injection.WBInjectionPoint; -import org.jboss.webbeans.literal.AnyLiteral; -import org.jboss.webbeans.literal.CurrentLiteral; - -public abstract class AbstractStandardBean<T> extends RIBean<T> -{ - - private static final Annotation[] DEFAULT_BINDING_ARRAY = { new CurrentLiteral(), new AnyLiteral() }; - private static final Set<Annotation> DEFAULT_BINDING = new HashSet<Annotation>(Arrays.asList(DEFAULT_BINDING_ARRAY)); - - private final String id; - - protected AbstractStandardBean(BeanManagerImpl manager) - { - super(manager); - this.id = getClass().getSimpleName(); - } - - @Override - public void initialize(BeanDeployerEnvironment environment) - { - // No-op - } - - - public Set<Annotation> getBindings() - { - return DEFAULT_BINDING; - } - - public Class<? extends Annotation> getScopeType() - { - return Dependent.class; - } - - @Override - public RIBean<?> getSpecializedBean() - { - return null; - } - - public String getName() - { - return null; - } - - public Set<Class<? extends Annotation>> getStereotypes() - { - return Collections.emptySet(); - } - - @Override - public Set<WBInjectionPoint<?, ?>> getAnnotatedInjectionPoints() - { - return Collections.emptySet(); - } - - public boolean isNullable() - { - return true; - } - - @Override - public boolean isPrimitive() - { - return false; - } - - @Override - public boolean isSpecializing() - { - return false; - } - - public boolean isPolicy() - { - return false; - } - - @Override - public boolean isProxyable() - { - return false; - } - - @Override - public String getId() - { - return id; - } - -} Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/EventBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java 2009-08-15 14:05:42 UTC (rev 3508) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/EventBean.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.bean.standard; +package org.jboss.webbeans.bean.builtin; import java.lang.annotation.Annotation; import java.lang.reflect.Type; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/ExtensionBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ExtensionBean.java 2009-08-15 14:05:42 UTC (rev 3508) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/ExtensionBean.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.bean.standard; +package org.jboss.webbeans.bean.builtin; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -31,7 +31,7 @@ * @author pmuir * */ -public class ExtensionBean extends AbstractStandardBean<Extension> +public class ExtensionBean extends AbstractBuiltInBean<Extension> { private final WBClass<Extension> clazz; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/FacadeBeanResolvableTransformer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/FacadeBeanResolvableTransformer.java 2009-08-15 14:05:42 UTC (rev 3508) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/FacadeBeanResolvableTransformer.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.bean.standard; +package org.jboss.webbeans.bean.builtin; import java.lang.annotation.Annotation; import java.lang.reflect.Type; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/InjectionPointBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InjectionPointBean.java 2009-08-15 14:05:42 UTC (rev 3508) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/InjectionPointBean.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.bean.standard; +package org.jboss.webbeans.bean.builtin; import java.lang.reflect.Type; import java.util.Arrays; @@ -32,7 +32,7 @@ * @author David Allen * */ -public class InjectionPointBean extends AbstractStandardBean<InjectionPoint> +public class InjectionPointBean extends AbstractBuiltInBean<InjectionPoint> { private static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(new Type[] { InjectionPoint.class })); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/InstanceBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java 2009-08-15 14:05:42 UTC (rev 3508) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/InstanceBean.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.bean.standard; +package org.jboss.webbeans.bean.builtin; import java.lang.annotation.Annotation; import java.lang.reflect.Type; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/InstanceImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceImpl.java 2009-08-15 14:05:42 UTC (rev 3508) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/InstanceImpl.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.bean.standard; +package org.jboss.webbeans.bean.builtin; import java.io.Serializable; import java.lang.annotation.Annotation; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/ManagerBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ManagerBean.java 2009-08-15 14:05:42 UTC (rev 3508) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/builtin/ManagerBean.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.bean.standard; +package org.jboss.webbeans.bean.builtin; import java.lang.reflect.Type; import java.util.Arrays; @@ -26,7 +26,7 @@ import org.jboss.webbeans.BeanManagerImpl; -public class ManagerBean extends AbstractStandardBean<BeanManagerImpl> +public class ManagerBean extends AbstractBuiltInBean<BeanManagerImpl> { private static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(BeanManagerImpl.class, BeanManager.class)); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java 2009-08-16 15:31:10 UTC (rev 3522) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -34,8 +34,8 @@ import org.jboss.webbeans.bean.ProducerFieldBean; import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.RIBean; -import org.jboss.webbeans.bean.standard.AbstractStandardBean; -import org.jboss.webbeans.bean.standard.ExtensionBean; +import org.jboss.webbeans.bean.builtin.AbstractBuiltInBean; +import org.jboss.webbeans.bean.builtin.ExtensionBean; import org.jboss.webbeans.ejb.EjbDescriptorCache; import org.jboss.webbeans.event.ObserverMethodImpl; import org.jboss.webbeans.introspector.WBClass; @@ -113,7 +113,7 @@ beans.add(bean); } - public void addBean(AbstractStandardBean<?> bean) + public void addBean(AbstractBuiltInBean<?> bean) { beans.add(bean); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/ExtensionBeanDeployer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/ExtensionBeanDeployer.java 2009-08-16 15:31:10 UTC (rev 3522) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/ExtensionBeanDeployer.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -22,7 +22,7 @@ import javax.enterprise.inject.spi.Extension; import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.bean.standard.ExtensionBean; +import org.jboss.webbeans.bean.builtin.ExtensionBean; import org.jboss.webbeans.ejb.EjbDescriptorCache; import org.jboss.webbeans.introspector.WBClass; import org.jboss.webbeans.resources.ClassTransformer; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-08-16 15:31:10 UTC (rev 3522) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -29,10 +29,10 @@ import org.jboss.webbeans.DefinitionException; import org.jboss.webbeans.DeploymentException; import org.jboss.webbeans.Validator; -import org.jboss.webbeans.bean.standard.EventBean; -import org.jboss.webbeans.bean.standard.InjectionPointBean; -import org.jboss.webbeans.bean.standard.InstanceBean; -import org.jboss.webbeans.bean.standard.ManagerBean; +import org.jboss.webbeans.bean.builtin.EventBean; +import org.jboss.webbeans.bean.builtin.InjectionPointBean; +import org.jboss.webbeans.bean.builtin.InstanceBean; +import org.jboss.webbeans.bean.builtin.ManagerBean; import org.jboss.webbeans.bootstrap.api.Bootstrap; import org.jboss.webbeans.bootstrap.api.Environments; import org.jboss.webbeans.bootstrap.api.helpers.AbstractBootstrap; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java 2009-08-16 15:31:10 UTC (rev 3522) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -26,7 +26,7 @@ import javax.enterprise.inject.TypeLiteral; import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.bean.standard.AbstractFacade; +import org.jboss.webbeans.bean.builtin.AbstractFacade; import org.jboss.webbeans.util.Strings; /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeBeanResolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeBeanResolver.java 2009-08-16 15:31:10 UTC (rev 3522) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeBeanResolver.java 2009-08-16 15:35:33 UTC (rev 3523) @@ -24,8 +24,8 @@ import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.bean.standard.EventBean; -import org.jboss.webbeans.bean.standard.InstanceBean; +import org.jboss.webbeans.bean.builtin.EventBean; +import org.jboss.webbeans.bean.builtin.InstanceBean; import org.jboss.webbeans.util.Beans; import org.jboss.webbeans.util.Reflections; import org.jboss.webbeans.util.collections.ConcurrentCache;