January 2009 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r1132 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-20 17:30:59 -0500 (Tue, 20 Jan 2009) New Revision: 1132 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java Log: enable more realization tests Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-01-20 21:13:55 UTC (rev 1131) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-01-20 22:30:59 UTC (rev 1132) @@ -8,6 +8,7 @@ import java.util.HashSet; import java.util.Set; +import javax.webbeans.BindingType; import javax.webbeans.Fires; import javax.webbeans.Initializer; import javax.webbeans.Observes; @@ -115,18 +116,20 @@ if (annotatedClass.isAnnotationPresent(Realizes.class)) { - registerProducerMethods(bean, annotatedClass.getSuperclass(), bean.getBindings()); - registerProducerFields(bean, annotatedClass.getSuperclass(), bean.getBindings()); + Set<Annotation> extraAnnotations = new HashSet<Annotation>(); + extraAnnotations.addAll(annotatedClass.getDeclaredMetaAnnotations(BindingType.class)); + registerProducerMethods(bean, annotatedClass.getSuperclass(), extraAnnotations); + registerProducerFields(bean, annotatedClass.getSuperclass(), extraAnnotations); } log.info("Web Bean: " + bean); } - private void registerProducerMethods(AbstractClassBean<?> declaringBean, AnnotatedClass<?> annotatedClass, Set<Annotation> extraBindings) + private void registerProducerMethods(AbstractClassBean<?> declaringBean, AnnotatedClass<?> annotatedClass, Set<Annotation> extraAnnotations) { for (AnnotatedMethod<?> method : annotatedClass.getDeclaredAnnotatedMethods(Produces.class)) { - ProducerMethodBean<?> bean = ProducerMethodBean.of(method.wrap(extraBindings), declaringBean, manager); + ProducerMethodBean<?> bean = ProducerMethodBean.of(method.wrap(extraAnnotations), declaringBean, manager); beans.add(bean); manager.getResolver().addInjectionPoints(bean.getAnnotatedInjectionPoints()); registerFacades(bean.getAnnotatedInjectionPoints()); @@ -134,11 +137,11 @@ } } - private void registerProducerFields(AbstractClassBean<?> declaringBean, AnnotatedClass<?> annotatedClass, Set<Annotation> extraBindings) + private void registerProducerFields(AbstractClassBean<?> declaringBean, AnnotatedClass<?> annotatedClass, Set<Annotation> extraAnnotations) { for (AnnotatedField<?> field : annotatedClass.getDeclaredAnnotatedFields(Produces.class)) { - ProducerFieldBean<?> bean = ProducerFieldBean.of(field.wrap(extraBindings), declaringBean, manager); + ProducerFieldBean<?> bean = ProducerFieldBean.of(field.wrap(extraAnnotations), declaringBean, manager); beans.add(bean); log.info("Web Bean: " + bean); }

16 years, 8 months

1
0
0 / 0

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

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-20 16:13:55 -0500 (Tue, 20 Jan 2009) New Revision: 1131 Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedAnnotation.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedClass.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedConstructor.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedField.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedMember.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedMethod.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedType.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotationStore.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedAnnotation.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedClass.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedConstructor.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedField.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedMember.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedMethod.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedParameter.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DisabledDeploymentType.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedAnnotation.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMember.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedType.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/MergedStereotypes.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java Log: realization (still some bugs) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -56,6 +56,7 @@ import org.jboss.webbeans.ejb.EjbDescriptorCache; import org.jboss.webbeans.ejb.spi.EjbResolver; import org.jboss.webbeans.event.EventManager; +import org.jboss.webbeans.event.ObserverImpl; import org.jboss.webbeans.injection.InjectionPointProvider; import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.AnnotatedItem; @@ -414,6 +415,12 @@ this.eventManager.addObserver(observer, eventType, bindings); return this; } + + public <T> Manager addObserver(ObserverImpl<T> observer) + { + addObserver(observer, observer.getEventType(), observer.getBindingsAsArray()); + return this; + } /** * Registers an observer for a given event type literal and binding types Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -39,7 +39,7 @@ import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.injection.InjectionPointImpl; import org.jboss.webbeans.introspector.AnnotatedItem; -import org.jboss.webbeans.introspector.jlr.AbstractAnnotatedItem.AnnotationMap; +import org.jboss.webbeans.introspector.jlr.AnnotationStore.AnnotationMap; import org.jboss.webbeans.literal.CurrentLiteral; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -62,7 +62,7 @@ public static <T> ProducerMethodBean<T> of(Method method, AbstractClassBean<?> declaringBean, ManagerImpl manager) { - return of(new AnnotatedMethodImpl<T>(method, declaringBean.getAnnotatedItem()), declaringBean, manager); + return of(AnnotatedMethodImpl.<T>of(method, declaringBean.getAnnotatedItem()), declaringBean, manager); } /** Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -4,16 +4,16 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.util.Collections; import java.util.HashSet; import java.util.Set; -import javax.webbeans.DefinitionException; import javax.webbeans.Fires; import javax.webbeans.Initializer; -import javax.webbeans.Observer; import javax.webbeans.Observes; import javax.webbeans.Obtains; import javax.webbeans.Produces; +import javax.webbeans.Realizes; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.AbstractBean; @@ -44,6 +44,8 @@ private static final LogProvider log = Logging.getLogProvider(BeanDeployer.class); + private static final Set<Annotation> EMPTY_BINDINGS = Collections.emptySet(); + private final Set<AbstractBean<?, ?>> beans; private final ManagerImpl manager; @@ -99,100 +101,90 @@ * * @param bean The bean representation */ - protected void createBean(AbstractClassBean<?> bean, AnnotatedClass<?> annotatedClass) + protected void createBean(AbstractClassBean<?> bean, final AnnotatedClass<?> annotatedClass) { beans.add(bean); manager.getResolver().addInjectionPoints(bean.getAnnotatedInjectionPoints()); - for (AnnotatedMethod<?> producerMethod : annotatedClass.getDeclaredAnnotatedMethods(Produces.class)) + registerProducerMethods(bean, annotatedClass, EMPTY_BINDINGS); + registerProducerFields(bean, annotatedClass, EMPTY_BINDINGS); + registerObserverMethods(bean, annotatedClass); + registerFacades(bean.getAnnotatedInjectionPoints()); + + if (annotatedClass.isAnnotationPresent(Realizes.class)) { - ProducerMethodBean<?> producerMethodBean = ProducerMethodBean.of(producerMethod, bean, manager); - beans.add(producerMethodBean); - manager.getResolver().addInjectionPoints(producerMethodBean.getAnnotatedInjectionPoints()); - registerEvents(producerMethodBean.getAnnotatedInjectionPoints(), beans); - log.info("Web Bean: " + producerMethodBean); + registerProducerMethods(bean, annotatedClass.getSuperclass(), bean.getBindings()); + registerProducerFields(bean, annotatedClass.getSuperclass(), bean.getBindings()); } - for (AnnotatedField<?> producerField : annotatedClass.getDeclaredAnnotatedFields(Produces.class)) + + log.info("Web Bean: " + bean); + } + + private void registerProducerMethods(AbstractClassBean<?> declaringBean, AnnotatedClass<?> annotatedClass, Set<Annotation> extraBindings) + { + for (AnnotatedMethod<?> method : annotatedClass.getDeclaredAnnotatedMethods(Produces.class)) { - ProducerFieldBean<?> producerFieldBean = ProducerFieldBean.of(producerField, bean, manager); - beans.add(producerFieldBean); - log.info("Web Bean: " + producerFieldBean); + ProducerMethodBean<?> bean = ProducerMethodBean.of(method.wrap(extraBindings), declaringBean, manager); + beans.add(bean); + manager.getResolver().addInjectionPoints(bean.getAnnotatedInjectionPoints()); + registerFacades(bean.getAnnotatedInjectionPoints()); + log.info("Web Bean: " + bean); } - for (AnnotatedItem<?, ?> injectionPoint : bean.getAnnotatedInjectionPoints()) + } + + private void registerProducerFields(AbstractClassBean<?> declaringBean, AnnotatedClass<?> annotatedClass, Set<Annotation> extraBindings) + { + for (AnnotatedField<?> field : annotatedClass.getDeclaredAnnotatedFields(Produces.class)) { - if (injectionPoint.isAnnotationPresent(Fires.class)) - { - registerEvent(injectionPoint, beans); - } - if (injectionPoint.isAnnotationPresent(Obtains.class)) - { - // TODO FIx this - @SuppressWarnings("unchecked") - InstanceBean<Object, Field> instanceBean = InstanceBean.of((AnnotatedItem) injectionPoint, manager); - beans.add(instanceBean); - log.info("Web Bean: " + instanceBean); - } + ProducerFieldBean<?> bean = ProducerFieldBean.of(field.wrap(extraBindings), declaringBean, manager); + beans.add(bean); + log.info("Web Bean: " + bean); } + } + + private void registerObserverMethods(AbstractClassBean<?> declaringBean, AnnotatedClass<?> annotatedClass) + { for (AnnotatedMethod<?> observerMethod : annotatedClass.getDeclaredMethodsWithAnnotatedParameters(Observes.class)) { - ObserverImpl<?> observer = ObserverImpl.of(observerMethod, bean, manager); - if (observerMethod.getAnnotatedParameters(Observes.class).size() == 1) + ObserverImpl<?> observer = ObserverImpl.of(observerMethod, declaringBean, manager); + manager.addObserver(observer); + } + } + + private void registerFacades(Set<AnnotatedItem<?, ?>> injectionPoints) + { + for (AnnotatedItem<?, ?> injectionPoint : injectionPoints) + { + if (injectionPoint.isAnnotationPresent(Fires.class)) { - registerObserver(observer, observerMethod.getAnnotatedParameters(Observes.class).get(0).getType(), observerMethod.getAnnotatedParameters(Observes.class).get(0).getBindingTypesAsArray()); + registerEvent(injectionPoint); } - else + if (injectionPoint.isAnnotationPresent(Obtains.class)) { - throw new DefinitionException("Observer method can only have one parameter annotated @Observes " + observer); + registerInstance(injectionPoint); } - } - log.info("Web Bean: " + bean); } - - /** - * Registers an observer with the getManager() - * - * @param observer The observer - * @param eventType The event type to observe - * @param bindings The binding types to observe on - */ - private <T> void registerObserver(Observer<T> observer, Class<?> eventType, Annotation[] bindings) + private void registerEvent(AnnotatedItem<?, ?> injectionPoint) { // TODO Fix this! @SuppressWarnings("unchecked") - Class<T> clazz = (Class<T>) eventType; - manager.addObserver(observer, clazz, bindings); + EventBean<Object, Method> bean = EventBean.of((AnnotatedItem) injectionPoint, manager); + beans.add(bean); + log.info("Web Bean: " + bean); } - - /** - * Iterates through the injection points and creates and registers any Event - * observables specified with the @Observable annotation - * - * @param injectionPoints A set of injection points to inspect - * @param beans A set of beans to add the Event beans to - */ - private void registerEvents(Set<AnnotatedItem<?, ?>> injectionPoints, Set<AbstractBean<?, ?>> beans) + + private void registerInstance(AnnotatedItem<?, ?> injectionPoint) { - for (AnnotatedItem<?, ?> injectionPoint : injectionPoints) - { - registerEvent(injectionPoint, beans); - } + // TODO FIx this + @SuppressWarnings("unchecked") + InstanceBean<Object, Field> bean = InstanceBean.of((AnnotatedItem) injectionPoint, manager); + beans.add(bean); + log.info("Web Bean: " + bean); } - - private void registerEvent(AnnotatedItem<?, ?> injectionPoint, Set<AbstractBean<?, ?>> beans) - { - if (injectionPoint.isAnnotationPresent(Fires.class)) - { - // TODO Fix this! - @SuppressWarnings("unchecked") - EventBean<Object, Method> eventBean = EventBean.of((AnnotatedItem) injectionPoint, manager); - beans.add(eventBean); - log.info("Web Bean: " + eventBean); - } - } /** * Indicates if the type is a simple Web Bean Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -17,6 +17,7 @@ package org.jboss.webbeans.event; +import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; @@ -68,11 +69,13 @@ NONE, BEFORE_COMPLETION, AFTER_COMPLETION, AFTER_FAILURE, AFTER_SUCCESS } - private Bean<?> observerBean; + private final Bean<?> observerBean; private final AnnotatedMethod<?> observerMethod; private TransactionObservationPhase transactionObservationPhase; - private boolean conditional; + private final boolean conditional; private ManagerImpl manager; + private final Class<T> eventType; + private final Annotation[] bindings; /** * Creates an observer @@ -95,14 +98,20 @@ * @param observerBean The observer bean * @param manager The Web Beans manager */ - public ObserverImpl(final AnnotatedMethod<?> observer, final Bean<?> observerBean, final ManagerImpl manager) + protected ObserverImpl(final AnnotatedMethod<?> observer, final Bean<?> observerBean, final ManagerImpl manager) { this.manager = manager; this.observerBean = observerBean; this.observerMethod = observer; - validateObserverMethod(); + checkObserverMethod(); + + @SuppressWarnings("unchecked") + Class<T> c = (Class<T>) observerMethod.getAnnotatedParameters(Observes.class).get(0).getType(); + this.eventType = c; + + this.bindings = observerMethod.getAnnotatedParameters(Observes.class).get(0).getBindingTypesAsArray(); initTransactionObservationPhase(); - conditional = !observerMethod.getAnnotatedParameters(IfExists.class).isEmpty(); + this.conditional = !observerMethod.getAnnotatedParameters(IfExists.class).isEmpty(); } private void initTransactionObservationPhase() @@ -141,13 +150,13 @@ /** * Performs validation of the observer method for compliance with the specifications. */ - private void validateObserverMethod() + private void checkObserverMethod() { // Make sure exactly one and only one parameter is annotated with Observes List<AnnotatedParameter<?>> eventObjects = this.observerMethod.getAnnotatedParameters(Observes.class); if (eventObjects.size() > 1) { - throw new DefinitionException(this + " is invalid because it contains more than event parameter"); + throw new DefinitionException(this + " is invalid because it contains more than event parameter annotated @Observes"); } // Make sure the event object above is not parameterized with a type // variable or wildcard @@ -304,4 +313,14 @@ return builder.toString(); } + public Class<T> getEventType() + { + return eventType; + } + + public Annotation[] getBindingsAsArray() + { + return bindings; + } + } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedAnnotation.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedAnnotation.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedAnnotation.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -43,4 +43,6 @@ */ public Set<AnnotatedMethod<?>> getAnnotatedMembers(Class<? extends Annotation> annotationType); + public AnnotatedAnnotation<T> wrap(Set<Annotation> annotations); + } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -151,5 +151,7 @@ public boolean isNonStaticMemberClass(); public boolean isParameterizedType(); + + public AnnotatedClass<T> wrap(Set<Annotation> annotations); } \ No newline at end of file Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -20,6 +20,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.util.List; +import java.util.Set; import org.jboss.webbeans.ManagerImpl; @@ -64,5 +65,7 @@ * @return An abstraction of the declaring class */ public AnnotatedType<T> getDeclaringClass(); + + public AnnotatedConstructor<T> wrap(Set<Annotation> annotations); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -17,7 +17,9 @@ package org.jboss.webbeans.introspector; +import java.lang.annotation.Annotation; import java.lang.reflect.Field; +import java.util.Set; import javax.webbeans.manager.Manager; @@ -97,4 +99,6 @@ public boolean isTransient(); + public AnnotatedField<T> wrap(Set<Annotation> annotations); + } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -183,5 +183,7 @@ * @return The name */ public String getName(); + + public AnnotatedItem<T, S> wrap(Set<Annotation> annotations); } \ No newline at end of file Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMember.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMember.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMember.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -16,7 +16,9 @@ */ package org.jboss.webbeans.introspector; +import java.lang.annotation.Annotation; import java.lang.reflect.Member; +import java.util.Set; /** * AnnotedMember provides enhanced access to an annotated member * @@ -28,4 +30,6 @@ public S getMember(); + public AnnotatedMember<T, S> wrap(Set<Annotation> annotations); + } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -130,5 +130,7 @@ public boolean isEquivalent(Method method); public Method getAnnotatedMethod(); + + public AnnotatedMethod<T> wrap(Set<Annotation> annotations); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -17,6 +17,9 @@ package org.jboss.webbeans.introspector; +import java.lang.annotation.Annotation; +import java.util.Set; + import javax.webbeans.manager.Manager; @@ -38,4 +41,6 @@ public T getValue(Manager manager); public AnnotatedMember<?, ?> getDeclaringMember(); + + public AnnotatedParameter<T> wrap(Set<Annotation> annotations); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedType.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedType.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedType.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -17,6 +17,9 @@ package org.jboss.webbeans.introspector; +import java.lang.annotation.Annotation; +import java.util.Set; + /** * AnnotatedType provides a uniform access to a type defined either in Java or * XML @@ -40,5 +43,7 @@ * @return true if equivalent */ public boolean isEquivalent(Class<?> clazz); + + public AnnotatedType<T> wrap(Set<Annotation> annotations); } Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedAnnotation.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedAnnotation.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedAnnotation.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,27 @@ +package org.jboss.webbeans.introspector; + +import java.lang.annotation.Annotation; +import java.util.Set; + +public abstract class ForwardingAnnotatedAnnotation<T extends Annotation> extends ForwardingAnnotatedType<T> implements AnnotatedAnnotation<T> +{ + + @Override + protected abstract AnnotatedAnnotation<T> delegate(); + + public Set<AnnotatedMethod<?>> getAnnotatedMembers(Class<? extends Annotation> annotationType) + { + return delegate().getAnnotatedMembers(annotationType); + } + + public Set<AnnotatedMethod<?>> getMembers() + { + return delegate().getMembers(); + } + + public AnnotatedAnnotation<T> wrap(Set<Annotation> annotations) + { + throw new UnsupportedOperationException(); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedAnnotation.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedClass.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedClass.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedClass.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,98 @@ +package org.jboss.webbeans.introspector; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.List; +import java.util.Set; + +public abstract class ForwardingAnnotatedClass<T> extends ForwardingAnnotatedItem<T, Class<T>> implements AnnotatedClass<T> +{ + + protected abstract AnnotatedClass<T> delegate(); + + public Set<AnnotatedConstructor<T>> getAnnotatedConstructors(Class<? extends Annotation> annotationType) + { + return delegate().getAnnotatedConstructors(annotationType); + } + + public Set<AnnotatedField<?>> getAnnotatedFields(Class<? extends Annotation> annotationType) + { + return delegate().getAnnotatedFields(annotationType); + } + + public Set<AnnotatedMethod<?>> getAnnotatedMethods(Class<? extends Annotation> annotationType) + { + return delegate().getAnnotatedMethods(annotationType); + } + + public AnnotatedConstructor<T> getConstructor(List<Class<?>> arguments) + { + return delegate().getConstructor(arguments); + } + + public Set<AnnotatedConstructor<T>> getConstructors() + { + return delegate().getConstructors(); + } + + public Set<AnnotatedField<?>> getDeclaredAnnotatedFields(Class<? extends Annotation> annotationType) + { + return delegate().getDeclaredAnnotatedFields(annotationType); + } + + public Set<AnnotatedMethod<?>> getDeclaredAnnotatedMethods(Class<? extends Annotation> annotationType) + { + return delegate().getDeclaredAnnotatedMethods(annotationType); + } + + public Set<AnnotatedMethod<?>> getDeclaredMethodsWithAnnotatedParameters(Class<? extends Annotation> annotationType) + { + return delegate().getDeclaredMethodsWithAnnotatedParameters(annotationType); + } + + public Set<AnnotatedField<?>> getFields() + { + return delegate().getFields(); + } + + public Set<AnnotatedField<?>> getMetaAnnotatedFields(Class<? extends Annotation> metaAnnotationType) + { + return delegate().getMetaAnnotatedFields(metaAnnotationType); + } + + public AnnotatedMethod<?> getMethod(Method method) + { + return delegate().getMethod(method); + } + + public Set<AnnotatedMethod<?>> getMethodsWithAnnotatedParameters(Class<? extends Annotation> annotationType) + { + return delegate().getMethodsWithAnnotatedParameters(annotationType); + } + + public AnnotatedClass<?> getSuperclass() + { + return delegate().getSuperclass(); + } + + public boolean isNonStaticMemberClass() + { + return delegate().isNonStaticMemberClass(); + } + + public boolean isParameterizedType() + { + return delegate().isParameterizedType(); + } + + public boolean isEquivalent(Class<?> clazz) + { + return delegate().isEquivalent(clazz); + } + + public AnnotatedClass<T> wrap(Set<Annotation> annotations) + { + throw new UnsupportedOperationException(); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedClass.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedConstructor.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedConstructor.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedConstructor.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,43 @@ +package org.jboss.webbeans.introspector; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Constructor; +import java.util.List; +import java.util.Set; + +import org.jboss.webbeans.ManagerImpl; + +public abstract class ForwardingAnnotatedConstructor<T> extends ForwardingAnnotatedMember<T, Constructor<T>> implements AnnotatedConstructor<T> +{ + + @Override + protected abstract AnnotatedConstructor<T> delegate(); + + public List<AnnotatedParameter<?>> getAnnotatedParameters(Class<? extends Annotation> annotationType) + { + return delegate().getAnnotatedParameters(annotationType); + } + + public AnnotatedType<T> getDeclaringClass() + { + return delegate().getDeclaringClass(); + } + + public List<AnnotatedParameter<?>> getParameters() + { + return delegate().getParameters(); + } + + public T newInstance(ManagerImpl manager) + { + return delegate().newInstance(manager); + } + + public AnnotatedConstructor<T> wrap(Set<Annotation> annotations) + { + throw new UnsupportedOperationException(); + } + + + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedConstructor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedField.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedField.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedField.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,66 @@ +package org.jboss.webbeans.introspector; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.util.Set; + +import javax.webbeans.manager.Manager; + +public abstract class ForwardingAnnotatedField<T> extends ForwardingAnnotatedMember<T, Field> implements AnnotatedField<T> +{ + + @Override + protected abstract AnnotatedField<T> delegate(); + + public T get(Object instance) + { + return delegate().get(instance); + } + + public Field getAnnotatedField() + { + return delegate().getAnnotatedField(); + } + + public AnnotatedType<?> getDeclaringClass() + { + return delegate().getDeclaringClass(); + } + + public String getPropertyName() + { + return delegate().getPropertyName(); + } + + public void inject(Object declaringInstance, Manager manager) + { + delegate().inject(declaringInstance, manager); + } + + public void inject(Object declaringInstance, Object value) + { + delegate().inject(declaringInstance, value); + } + + public void injectIntoInstance(Object declaringInstance, Object value) + { + delegate().injectIntoInstance(declaringInstance, value); + } + + public void injectIntoInstance(Object declaringInstance, Manager manager) + { + delegate().injectIntoInstance(declaringInstance, manager); + } + + public boolean isTransient() + { + return delegate().isTransient(); + } + + public AnnotatedField<T> wrap(Set<Annotation> annotations) + { + throw new UnsupportedOperationException(); + } + + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedField.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -200,6 +200,11 @@ * * @return The annotated item */ - public abstract AnnotatedItem<T, S> delegate(); + protected abstract AnnotatedItem<T, S> delegate(); + + public AnnotatedItem<T, S> wrap(Set<Annotation> annotations) + { + throw new UnsupportedOperationException(); + } } Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedMember.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedMember.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedMember.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,24 @@ +package org.jboss.webbeans.introspector; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Member; +import java.util.Set; + +public abstract class ForwardingAnnotatedMember<T, S extends Member> extends ForwardingAnnotatedItem<T, S> implements AnnotatedMember<T, S> +{ + + @Override + protected abstract AnnotatedMember<T, S> delegate(); + + public S getMember() + { + return delegate().getMember(); + } + + @Override + public AnnotatedMember<T, S> wrap(Set<Annotation> annotations) + { + throw new UnsupportedOperationException(); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedMember.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedMethod.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedMethod.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedMethod.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,76 @@ +package org.jboss.webbeans.introspector; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.List; +import java.util.Set; + +import org.jboss.webbeans.ManagerImpl; + +public abstract class ForwardingAnnotatedMethod<T> extends ForwardingAnnotatedMember<T, Method> implements AnnotatedMethod<T> +{ + + @Override + protected abstract AnnotatedMethod<T> delegate(); + + public Method getAnnotatedMethod() + { + return delegate().getAnnotatedMethod(); + } + + public List<AnnotatedParameter<?>> getAnnotatedParameters(Class<? extends Annotation> metaAnnotationType) + { + return delegate().getAnnotatedParameters(metaAnnotationType); + } + + public AnnotatedType<?> getDeclaringClass() + { + return delegate().getDeclaringClass(); + } + + public Class<?>[] getParameterTypesAsArray() + { + return delegate().getParameterTypesAsArray(); + } + + public List<AnnotatedParameter<?>> getParameters() + { + return delegate().getParameters(); + } + + public String getPropertyName() + { + return delegate().getPropertyName(); + } + + public T invoke(Object instance, ManagerImpl manager) + { + return delegate().invoke(instance, manager); + } + + public T invoke(Object instance, Object... parameters) + { + return delegate().invoke(instance, parameters); + } + + public T invokeOnInstance(Object instance, ManagerImpl manager) + { + return delegate().invokeOnInstance(instance, manager); + } + + public T invokeWithSpecialValue(Object instance, Class<? extends Annotation> specialParam, Object specialVal, ManagerImpl manager) + { + return delegate().invokeWithSpecialValue(instance, specialParam, specialVal, manager); + } + + public boolean isEquivalent(Method method) + { + return delegate().isEquivalent(method); + } + + public AnnotatedMethod<T> wrap(Set<Annotation> annotations) + { + throw new UnsupportedOperationException(); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedMethod.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,29 @@ +package org.jboss.webbeans.introspector; + +import java.lang.annotation.Annotation; +import java.util.Set; + +import javax.webbeans.manager.Manager; + +public abstract class ForwardingAnnotatedParameter<T> extends ForwardingAnnotatedItem<T, Object> implements AnnotatedParameter<T> +{ + + @Override + protected abstract AnnotatedParameter<T> delegate(); + + public AnnotatedMember<?, ?> getDeclaringMember() + { + return delegate().getDeclaringMember(); + } + + public T getValue(Manager manager) + { + return delegate().getValue(manager); + } + + public AnnotatedParameter<T> wrap(Set<Annotation> annotations) + { + throw new UnsupportedOperationException(); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedType.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedType.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedType.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,30 @@ +package org.jboss.webbeans.introspector; + +import java.lang.annotation.Annotation; +import java.util.Set; + + + +public abstract class ForwardingAnnotatedType<T> extends ForwardingAnnotatedItem<T, Class<T>> implements AnnotatedType<T> +{ + + @Override + protected abstract AnnotatedType<T> delegate(); + + public AnnotatedType<?> getSuperclass() + { + return delegate().getSuperclass(); + } + + public boolean isEquivalent(Class<?> clazz) + { + return delegate().isEquivalent(clazz); + } + + @Override + public AnnotatedType<T> wrap(Set<Annotation> annotations) + { + throw new UnsupportedOperationException(); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -18,13 +18,10 @@ package org.jboss.webbeans.introspector.jlr; import java.lang.annotation.Annotation; -import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Type; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import java.util.Set; import javax.webbeans.BindingType; @@ -33,11 +30,8 @@ import org.jboss.webbeans.literal.CurrentLiteral; import org.jboss.webbeans.util.Proxies; import org.jboss.webbeans.util.Reflections; -import org.jboss.webbeans.util.Strings; import org.jboss.webbeans.util.Types; -import com.google.common.collect.ForwardingMap; - /** * Represents functionality common for all annotated items, mainly different * mappings of the annotations and meta-annotations @@ -52,168 +46,26 @@ * * @see org.jboss.webbeans.introspector.AnnotatedItem */ -public abstract class AbstractAnnotatedItem<T, S> implements AnnotatedItem<T, S> +public abstract class AbstractAnnotatedItem<T, S> implements WrappableAnnotatedItem<T, S> { - - /** - * Represents a mapping from a annotation type to an annotation - * implementation - */ - public static class AnnotationMap extends ForwardingMap<Class<? extends Annotation>, Annotation> + + interface WrappableAnnotatedItem<T, S> extends AnnotatedItem<T, S> { - private final Map<Class<? extends Annotation>, Annotation> delegate; - - public AnnotationMap() - { - delegate = new HashMap<Class<? extends Annotation>, Annotation>(); - } - - @Override - protected Map<Class<? extends Annotation>, Annotation> delegate() - { - return delegate; - } - - /** - * Gets a string representation of the Map - * - * @return A string representation - */ - @Override - public String toString() - { - return Strings.mapToString("AnnotationMap (annotation type -> annotation): ", delegate); - } - + + AnnotationStore getAnnotationStore(); + } - /** - * Represents a mapping from a annotation (meta-annotation) to a set of - * annotations - * - */ - private static class MetaAnnotationMap extends ForwardingMap<Class<? extends Annotation>, Set<Annotation>> - { - private final Map<Class<? extends Annotation>, Set<Annotation>> delegate; - - public MetaAnnotationMap() - { - delegate = new HashMap<Class<? extends Annotation>, Set<Annotation>>(); - } - - @Override - protected Map<Class<? extends Annotation>, Set<Annotation>> delegate() - { - return delegate; - } - - /** - * Gets the set of annotations matching the given annotation type - * - * @param key The meta-annotation to match - * @returns The set of matching annotations containing this - * meta-annotation - */ - @Override - public Set<Annotation> get(Object key) - { - Set<Annotation> annotations = super.get(key); - return annotations != null ? annotations : new HashSet<Annotation>(); - } - - /** - * Adds an annotation under the meta-annotation type key - * - * @param key The meta-annotation type - * @param value The annotation - */ - public void put(Class<? extends Annotation> key, Annotation value) - { - Set<Annotation> annotations = super.get(key); - if (annotations == null) - { - annotations = new HashSet<Annotation>(); - super.put(key, annotations); - } - annotations.add(value); - } - - /** - * Gets a string representation of the Map - * - * @return A string representation - */ - @Override - public String toString() - { - return Strings.mapToString("MetaAnnotationMap (annotation type -> annotation set: ", delegate); - } - - } - // The array of default binding types private static final Annotation[] DEFAULT_BINDING_ARRAY = { new CurrentLiteral() }; // The set of default binding types private static final Set<Annotation> DEFAULT_BINDING = new HashSet<Annotation>(Arrays.asList(DEFAULT_BINDING_ARRAY)); - + // Cached string representation private String toString; + private final AnnotationStore annotationStore; /** - * Static helper method for building annotation map from an annotated element - * - * @param element The element to examine - * @return The annotation map - */ - protected static AnnotationMap buildAnnotationMap(AnnotatedElement element) - { - return buildAnnotationMap(element.getAnnotations()); - } - - /** - * Static helper method for building annotation map from an annotated element - * - * @param element The element to examine - * @return The annotation map - */ - protected static AnnotationMap buildDeclaredAnnotationMap(AnnotatedElement element) - { - return buildAnnotationMap(element.getDeclaredAnnotations()); - } - - /** - * Builds the annotation map (annotation type -> annotation) - * - * @param annotations The array of annotations to map - * @return The annotation map - */ - protected static AnnotationMap buildAnnotationMap(Annotation[] annotations) - { - AnnotationMap annotationMap = new AnnotationMap(); - for (Annotation annotation : annotations) - { - annotationMap.put(annotation.annotationType(), annotation); - } - return annotationMap; - } - - // The annotation map (annotation type -> annotation) of the item - private final AnnotationMap annotationMap; - // The meta-annotation map (annotation type -> set of annotations containing - // meta-annotation) of the item - private final MetaAnnotationMap metaAnnotationMap; - // The set of all annotations on the item - private final Set<Annotation> annotationSet; - - // The annotation map (annotation type -> annotation) of the item - private final AnnotationMap declaredAnnotationMap; - // The meta-annotation map (annotation type -> set of annotations containing - // meta-annotation) of the item - private final MetaAnnotationMap declaredMetaAnnotationMap; - // The set of all annotations on the item - private final Set<Annotation> declaredAnnotationSet; - - /** * Constructor * * Also builds the meta-annotation map. Throws a NullPointerException if @@ -222,52 +74,14 @@ * @param annotationMap A map of annotation to register * */ - public AbstractAnnotatedItem(AnnotationMap annotationMap, AnnotationMap declaredAnnotationMap) + public AbstractAnnotatedItem(AnnotationStore annotatedItemHelper) { - if (annotationMap == null) - { - throw new NullPointerException("annotationMap cannot be null"); - } - this.annotationMap = annotationMap; - this.annotationSet = new HashSet<Annotation>(); - this.metaAnnotationMap = new MetaAnnotationMap(); - for (Annotation annotation : annotationMap.values()) - { - for (Annotation metaAnnotation : annotation.annotationType().getAnnotations()) - { - // Only map meta-annotations we are interested in - if (MAPPED_METAANNOTATIONS.contains(metaAnnotation.annotationType())) - { - metaAnnotationMap.put(metaAnnotation.annotationType(), annotation); - } - } - annotationSet.add(annotation); - } - - if (declaredAnnotationMap == null) - { - throw new NullPointerException("declaredAnnotationMap cannot be null"); - } - this.declaredAnnotationMap = declaredAnnotationMap; - this.declaredAnnotationSet = new HashSet<Annotation>(); - this.declaredMetaAnnotationMap = new MetaAnnotationMap(); - for (Annotation annotation : declaredAnnotationMap.values()) - { - for (Annotation metaAnnotation : annotation.annotationType().getAnnotations()) - { - // Only map meta-annotations we are interested in - if (MAPPED_METAANNOTATIONS.contains(metaAnnotation.annotationType())) - { - declaredMetaAnnotationMap.put(metaAnnotation.annotationType(), annotation); - } - } - declaredAnnotationSet.add(annotation); - } + this.annotationStore = annotatedItemHelper; } - public AbstractAnnotatedItem(AnnotationMap annotationMap) + public AnnotationStore getAnnotationStore() { - this(annotationMap, annotationMap); + return annotationStore; } /** @@ -280,7 +94,7 @@ */ public <A extends Annotation> A getAnnotation(Class<? extends A> annotationType) { - return annotationType.cast(annotationMap.get(annotationType)); + return annotationType.cast(getAnnotationStore().getAnnotationMap().get(annotationType)); } /** @@ -294,12 +108,12 @@ */ public Set<Annotation> getMetaAnnotations(Class<? extends Annotation> metaAnnotationType) { - return Collections.unmodifiableSet(metaAnnotationMap.get(metaAnnotationType)); + return Collections.unmodifiableSet(getAnnotationStore().getMetaAnnotationMap().get(metaAnnotationType)); } public Set<Annotation> getDeclaredMetaAnnotations(Class<? extends Annotation> metaAnnotationType) { - return Collections.unmodifiableSet(declaredMetaAnnotationMap.get(metaAnnotationType)); + return Collections.unmodifiableSet(getAnnotationStore().getDeclaredMetaAnnotationMap().get(metaAnnotationType)); } /** @@ -330,7 +144,7 @@ */ public Set<Annotation> getAnnotations() { - return Collections.unmodifiableSet(annotationSet); + return getAnnotationStore().getAnnotationSet(); } /** @@ -343,20 +157,10 @@ */ public boolean isAnnotationPresent(Class<? extends Annotation> annotatedType) { - return annotationMap.containsKey(annotatedType); + return getAnnotationStore().getAnnotationMap().containsKey(annotatedType); } /** - * Gets the annotation map - * - * @return The annotation map - */ - protected Map<Class<? extends Annotation>, Annotation> getAnnotationMap() - { - return Collections.unmodifiableMap(annotationMap); - } - - /** * Compares two AbstractAnnotatedItems * * @param other The other item Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -34,6 +34,7 @@ import org.jboss.webbeans.injection.InjectionPointProvider; import org.jboss.webbeans.introspector.AnnotatedMember; import org.jboss.webbeans.introspector.AnnotatedParameter; +import org.jboss.webbeans.introspector.ForwardingAnnotatedMember; import org.jboss.webbeans.util.Reflections; import org.jboss.webbeans.util.Strings; @@ -51,6 +52,12 @@ */ public abstract class AbstractAnnotatedMember<T, S extends Member> extends AbstractAnnotatedItem<T, S> implements AnnotatedMember<T, S> { + + static abstract class WrappableForwardingAnnotatedMember<T, S extends Member> extends ForwardingAnnotatedMember<T, S> implements WrappableAnnotatedItem<T, S> + { + + } + /** * An annotation type -> list of annotations map */ @@ -107,9 +114,9 @@ * * @param annotationMap The annotation map */ - public AbstractAnnotatedMember(AnnotationMap annotationMap, AnnotationMap declaredAnnotationMap, Member member) + public AbstractAnnotatedMember(AnnotationStore annotatedItemHelper, Member member) { - super(annotationMap, declaredAnnotationMap); + super(annotatedItemHelper); name = member.getName(); _public = Modifier.isPublic(member.getModifiers()); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -33,6 +33,7 @@ */ public abstract class AbstractAnnotatedType<T> extends AbstractAnnotatedItem<T, Class<T>> { + // The superclass abstraction of the type private final AnnotatedClass<?> superclass; // The name of the type @@ -47,9 +48,9 @@ * * @param annotationMap The annotation map */ - public AbstractAnnotatedType(AnnotationMap annotationMap, AnnotationMap declaredAnnotationMap, Class<T> type) + public AbstractAnnotatedType(AnnotationStore annotatedItemHelper, Class<T> type) { - super(annotationMap, declaredAnnotationMap); + super(annotatedItemHelper); this.name = type.getName(); if (type.getSuperclass() != null) { @@ -61,11 +62,6 @@ } this._public = Modifier.isFinal(type.getModifiers()); } - - public AbstractAnnotatedType(AnnotationMap annotationMap, Class<T> type) - { - this(annotationMap, annotationMap, type); - } /** * Indicates if the type is static Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -28,6 +28,7 @@ import org.jboss.webbeans.introspector.AnnotatedAnnotation; import org.jboss.webbeans.introspector.AnnotatedMethod; +import org.jboss.webbeans.introspector.ForwardingAnnotatedAnnotation; import org.jboss.webbeans.util.Strings; import com.google.common.collect.ForwardingMap; @@ -41,9 +42,21 @@ * * @param <T> */ -public class AnnotatedAnnotationImpl<T extends Annotation> extends AbstractAnnotatedType<T> implements AnnotatedAnnotation<T> +public class AnnotatedAnnotationImpl<T extends Annotation> extends AbstractAnnotatedType<T> implements AnnotatedAnnotation<T>, WrappableAnnotatedAnnotation<T> { + abstract static class ForwardingWrappableAnnotatedAnnotation<T extends Annotation> extends ForwardingAnnotatedAnnotation<T> implements WrappableAnnotatedType<T> + { + + @Override + protected abstract WrappableAnnotatedAnnotation<T> delegate(); + + public AnnotationStore getAnnotationStore() + { + return delegate().getAnnotationStore(); + } + } + /** * A (annotation type -> set of method abstractions with annotation) map */ @@ -106,13 +119,13 @@ */ public AnnotatedAnnotationImpl(Class<T> annotationType) { - super(buildAnnotationMap(annotationType), buildDeclaredAnnotationMap(annotationType), annotationType); + super(AnnotationStore.of(annotationType), annotationType); this.clazz = annotationType; members = new HashSet<AnnotatedMethod<?>>(); annotatedMembers = new AnnotatedMemberMap(); for (Method member : clazz.getDeclaredMethods()) { - AnnotatedMethod<?> annotatedMethod = new AnnotatedMethodImpl<Object>(member, this); + AnnotatedMethod<?> annotatedMethod = AnnotatedMethodImpl.of(member, this); members.add(annotatedMethod); for (Annotation annotation : annotatedMethod.getAnnotations()) { @@ -193,4 +206,19 @@ return clazz; } + public AnnotatedAnnotation<T> wrap(Set<Annotation> annotations) + { + final WrappableAnnotatedAnnotation<T> delegate = this; + return new ForwardingWrappableAnnotatedAnnotation<T>() + { + + @Override + protected WrappableAnnotatedAnnotation<T> delegate() + { + return delegate; + } + + }; + } + } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -37,6 +37,7 @@ import org.jboss.webbeans.introspector.AnnotatedConstructor; import org.jboss.webbeans.introspector.AnnotatedField; import org.jboss.webbeans.introspector.AnnotatedMethod; +import org.jboss.webbeans.introspector.ForwardingAnnotatedClass; import org.jboss.webbeans.util.Names; import org.jboss.webbeans.util.Reflections; import org.jboss.webbeans.util.Strings; @@ -52,9 +53,22 @@ * * @param <T> */ -public class AnnotatedClassImpl<T> extends AbstractAnnotatedType<T> implements AnnotatedClass<T> +public class AnnotatedClassImpl<T> extends AbstractAnnotatedType<T> implements AnnotatedClass<T>, WrappableAnnotatedClass<T> { + abstract static class ForwardingWrappableAnnotatedClass<T> extends ForwardingAnnotatedClass<T> implements WrappableAnnotatedClass<T> + { + + @Override + protected abstract WrappableAnnotatedClass<T> delegate(); + + + public AnnotationStore getAnnotationStore() + { + return delegate().getAnnotationStore(); + } + } + /** * A (annotation type -> set of field abstractions with annotation/meta * annotation) map @@ -280,7 +294,7 @@ private AnnotatedClassImpl(Class<T> rawType, Type type, Annotation[] annotations, Annotation[] declaredAnnotations) { - super(buildAnnotationMap(annotations), buildAnnotationMap(declaredAnnotations), rawType); + super(AnnotationStore.of(annotations, declaredAnnotations), rawType); this.clazz = rawType; if (type instanceof ParameterizedType) { @@ -373,7 +387,7 @@ method.setAccessible(true); } - AnnotatedMethod<?> annotatedMethod = new AnnotatedMethodImpl<Object>(method, this); + AnnotatedMethod<?> annotatedMethod = AnnotatedMethodImpl.of(method, this); this.methods.add(annotatedMethod); if (c == clazz) { @@ -613,4 +627,19 @@ return toString; } + public AnnotatedClass<T> wrap(Set<Annotation> annotations) + { + final WrappableAnnotatedClass<T> delegate = this; + return new ForwardingWrappableAnnotatedClass<T>() + { + + @Override + protected WrappableAnnotatedClass<T> delegate() + { + return delegate; + } + + }; + } + } \ No newline at end of file Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Set; import javax.webbeans.ExecutionException; @@ -31,6 +32,7 @@ import org.jboss.webbeans.introspector.AnnotatedConstructor; import org.jboss.webbeans.introspector.AnnotatedParameter; import org.jboss.webbeans.introspector.AnnotatedType; +import org.jboss.webbeans.introspector.ForwardingAnnotatedConstructor; import org.jboss.webbeans.util.Names; /** @@ -42,8 +44,23 @@ * * @param <T> */ -public class AnnotatedConstructorImpl<T> extends AbstractAnnotatedMember<T, Constructor<T>> implements AnnotatedConstructor<T> +public class AnnotatedConstructorImpl<T> extends AbstractAnnotatedMember<T, Constructor<T>> implements WrappableAnnotatedConstructor<T> { + + static abstract class ForwardingWrappableAnnotatedConstructor<T> extends ForwardingAnnotatedConstructor<T> implements WrappableAnnotatedConstructor<T> + { + + @Override + protected abstract WrappableAnnotatedConstructor<T> delegate(); + + public AnnotationStore getAnnotationStore() + { + // TODO Auto-generated method stub + return null; + } + + } + // The type arguments private static final Type[] actualTypeArguments = new Type[0]; // The underlying constructor @@ -75,7 +92,7 @@ */ public AnnotatedConstructorImpl(Constructor<T> constructor, AnnotatedType<T> declaringClass) { - super(buildAnnotationMap(constructor), buildDeclaredAnnotationMap(constructor), constructor); + super(AnnotationStore.of(constructor), constructor); this.constructor = constructor; this.declaringClass = declaringClass; @@ -268,5 +285,20 @@ toString = "Annotated method " + Names.constructor2String(constructor); return toString; } + + public WrappableAnnotatedConstructor<T> wrap(Set<Annotation> annotations) + { + final WrappableAnnotatedConstructor<T> delegate = this; + return new ForwardingWrappableAnnotatedConstructor<T>() + { + @Override + protected WrappableAnnotatedConstructor<T> delegate() + { + return delegate; + } + + }; + } + } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -17,14 +17,17 @@ package org.jboss.webbeans.introspector.jlr; +import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; +import java.util.Set; import javax.webbeans.manager.Manager; import org.jboss.webbeans.introspector.AnnotatedField; import org.jboss.webbeans.introspector.AnnotatedType; +import org.jboss.webbeans.introspector.ForwardingAnnotatedField; import org.jboss.webbeans.util.Names; import org.jboss.webbeans.util.Reflections; @@ -37,8 +40,22 @@ * * @param <T> */ -public class AnnotatedFieldImpl<T> extends AbstractAnnotatedMember<T, Field> implements AnnotatedField<T> +public class AnnotatedFieldImpl<T> extends AbstractAnnotatedMember<T, Field> implements WrappableAnnotatedField<T> { + + static abstract class ForwardingWrappableAnnotatedField<T> extends ForwardingAnnotatedField<T> implements WrappableAnnotatedField<T> + { + + @Override + protected abstract WrappableAnnotatedField<T> delegate(); + + public AnnotationStore getAnnotationStore() + { + return delegate().getAnnotationStore(); + } + + } + // The actual type arguments private final Type[] actualTypeArguments; // The underlying field @@ -60,7 +77,7 @@ */ public AnnotatedFieldImpl(Field field, AnnotatedType<?> declaringClass) { - super(buildAnnotationMap(field), buildDeclaredAnnotationMap(field), field); + super(AnnotationStore.of(field), field); this.field = field; field.setAccessible(true); this.declaringClass = declaringClass; @@ -186,5 +203,34 @@ toString = "Annotated field " + Names.field2String(field); return toString; } + + public AnnotatedField<T> wrap(Set<Annotation> annotations) + { + if (annotations.size() > 0) + { + final WrappableAnnotatedField<T> delegate = this; + final AnnotationStore annotationStore = AnnotationStore.wrap(getAnnotationStore(), annotations, annotations); + return new ForwardingWrappableAnnotatedField<T>() + { + + @Override + protected WrappableAnnotatedField<T> delegate() + { + return delegate; + } + + @Override + public AnnotationStore getAnnotationStore() + { + return annotationStore; + } + + }; + } + else + { + return this; + } + } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -25,11 +25,13 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Set; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.introspector.AnnotatedParameter; import org.jboss.webbeans.introspector.AnnotatedType; +import org.jboss.webbeans.introspector.ForwardingAnnotatedMethod; import org.jboss.webbeans.util.Names; import org.jboss.webbeans.util.Reflections; @@ -42,9 +44,22 @@ * * @param <T> */ -public class AnnotatedMethodImpl<T> extends AbstractAnnotatedMember<T, Method> implements AnnotatedMethod<T> +public class AnnotatedMethodImpl<T> extends AbstractAnnotatedMember<T, Method> implements AnnotatedMethod<T>, WrappableAnnotatedMethod<T> { + abstract static class ForwardingWrappableAnnotatedMethod<T> extends ForwardingAnnotatedMethod<T> implements WrappableAnnotatedMethod<T> + { + + @Override + protected abstract WrappableAnnotatedMethod<T> delegate(); + + public AnnotationStore getAnnotationStore() + { + return delegate().getAnnotationStore(); + } + + } + // The actual type arguments private final Type[] actualTypeArguments; // The underlying method @@ -64,7 +79,28 @@ // Cached string representation private String toString; + + public static <T> AnnotatedMethodImpl<T> of(Method method, AnnotatedType<?> declaringClass) + { + return new AnnotatedMethodImpl<T>(method, declaringClass); + } + + public static <T> AnnotatedMethod<T> wrap(final AnnotatedMethod<T> annotatedMethod, final Set<Annotation> extraAnnotations) + { + return new ForwardingAnnotatedMethod<T>() + { + @Override + protected AnnotatedMethod<T> delegate() + { + return annotatedMethod; + } + + + + }; + } + /** * Constructor * @@ -75,9 +111,9 @@ * @param declaringClass The declaring class abstraction */ @SuppressWarnings("unchecked") - public AnnotatedMethodImpl(Method method, AnnotatedType<?> declaringClass) + protected AnnotatedMethodImpl(Method method, AnnotatedType<?> declaringClass) { - super(buildAnnotationMap(method), buildDeclaredAnnotationMap(method), method); + super(AnnotationStore.of(method), method); this.method = method; this.declaringClass = declaringClass; if (method.getGenericReturnType() instanceof ParameterizedType) @@ -321,5 +357,35 @@ toString = "Annotated method " + Names.method2String(method); return toString; } + + public AnnotatedMethod<T> wrap(Set<Annotation> annotations) + { + if (annotations.size() > 0) + { + final WrappableAnnotatedMethod<T> delegate = this; + final AnnotationStore annotationStore = AnnotationStore.wrap(getAnnotationStore(), annotations, annotations); + return new ForwardingWrappableAnnotatedMethod<T>() + { + + @Override + protected WrappableAnnotatedMethod<T> delegate() + { + return delegate; + } + + @Override + public AnnotationStore getAnnotationStore() + { + return annotationStore; + } + + }; + } + else + { + return this; + } + } + } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -19,12 +19,14 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.util.Set; import javax.webbeans.BindingType; import javax.webbeans.manager.Manager; import org.jboss.webbeans.introspector.AnnotatedMember; import org.jboss.webbeans.introspector.AnnotatedParameter; +import org.jboss.webbeans.introspector.ForwardingAnnotatedParameter; /** * Represents a parameter @@ -35,8 +37,22 @@ * * @param <T> */ -public class AnnotatedParameterImpl<T> extends AbstractAnnotatedItem<T, Object> implements AnnotatedParameter<T> +public class AnnotatedParameterImpl<T> extends AbstractAnnotatedItem<T, Object> implements WrappableAnnotatedParameter<T> { + + static abstract class ForwardingWrappableAnnotatedParameter<T> extends ForwardingAnnotatedParameter<T> implements WrappableAnnotatedParameter<T> + { + + @Override + protected abstract WrappableAnnotatedParameter<T> delegate(); + + public AnnotationStore getAnnotationStore() + { + return delegate().getAnnotationStore(); + } + + } + // The type private final Class<T> type; // The actual type arguments @@ -64,7 +80,7 @@ */ public AnnotatedParameterImpl(Annotation[] annotations, Class<T> type, AnnotatedMember<?, ?> declaringMember) { - super(buildAnnotationMap(annotations)); + super(AnnotationStore.of(annotations, annotations)); this.type = type; this.declaringMember = declaringMember; } @@ -187,5 +203,21 @@ { return declaringMember; } + + public AnnotatedParameter<T> wrap(Set<Annotation> annotations) + { + final WrappableAnnotatedParameter<T> delegate = this; + + return new ForwardingWrappableAnnotatedParameter<T>() + { + + @Override + protected WrappableAnnotatedParameter<T> delegate() + { + return delegate; + } + + }; + } } Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotationStore.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotationStore.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotationStore.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,292 @@ +package org.jboss.webbeans.introspector.jlr; + +import static org.jboss.webbeans.introspector.AnnotatedItem.MAPPED_METAANNOTATIONS; + +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.jboss.webbeans.util.Strings; + +import com.google.common.collect.ForwardingMap; + +public class AnnotationStore +{ + /** + * Represents a mapping from a annotation type to an annotation + * implementation + */ + public static class AnnotationMap extends ForwardingMap<Class<? extends Annotation>, Annotation> + { + private final Map<Class<? extends Annotation>, Annotation> delegate; + + public AnnotationMap() + { + delegate = new HashMap<Class<? extends Annotation>, Annotation>(); + } + + @Override + protected Map<Class<? extends Annotation>, Annotation> delegate() + { + return delegate; + } + + /** + * Gets a string representation of the Map + * + * @return A string representation + */ + @Override + public String toString() + { + return Strings.mapToString("AnnotationMap (annotation type -> annotation): ", delegate); + } + + } + + /** + * Represents a mapping from a annotation (meta-annotation) to a set of + * annotations + * + */ + private static class MetaAnnotationMap extends ForwardingMap<Class<? extends Annotation>, Set<Annotation>> + { + private final Map<Class<? extends Annotation>, Set<Annotation>> delegate; + + public MetaAnnotationMap() + { + delegate = new HashMap<Class<? extends Annotation>, Set<Annotation>>(); + } + + @Override + protected Map<Class<? extends Annotation>, Set<Annotation>> delegate() + { + return delegate; + } + + /** + * Gets the set of annotations matching the given annotation type + * + * @param key The meta-annotation to match + * @returns The set of matching annotations containing this + * meta-annotation + */ + @Override + public Set<Annotation> get(Object key) + { + Set<Annotation> annotations = super.get(key); + return annotations != null ? annotations : new HashSet<Annotation>(); + } + + /** + * Adds an annotation under the meta-annotation type key + * + * @param key The meta-annotation type + * @param value The annotation + */ + public void put(Class<? extends Annotation> key, Annotation value) + { + Set<Annotation> annotations = super.get(key); + if (annotations == null) + { + annotations = new HashSet<Annotation>(); + super.put(key, annotations); + } + annotations.add(value); + } + + /** + * Gets a string representation of the Map + * + * @return A string representation + */ + @Override + public String toString() + { + return Strings.mapToString("MetaAnnotationMap (annotation type -> annotation set: ", delegate); + } + + } + + /** + * Builds the annotation map (annotation type -> annotation) + * + * @param annotations The array of annotations to map + * @return The annotation map + */ + protected static AnnotationMap buildAnnotationMap(Annotation[] annotations) + { + AnnotationMap annotationMap = new AnnotationMap(); + for (Annotation annotation : annotations) + { + annotationMap.put(annotation.annotationType(), annotation); + } + return annotationMap; + } + + /** + * Builds the annotation map (annotation type -> annotation) + * + * @param annotations The array of annotations to map + * @return The annotation map + */ + protected static AnnotationMap buildAnnotationMap(Iterable<Annotation> annotations) + { + AnnotationMap annotationMap = new AnnotationMap(); + for (Annotation annotation : annotations) + { + annotationMap.put(annotation.annotationType(), annotation); + } + return annotationMap; + } + + /** + * Build an AnnotatedItemHelper from a class + * + * @param annotatedElement + * @return + */ + public static AnnotationStore of(AnnotatedElement annotatedElement) + { + return new AnnotationStore(buildAnnotationMap(annotatedElement.getAnnotations()), buildAnnotationMap(annotatedElement.getDeclaredAnnotations())); + } + + public static AnnotationStore of(Annotation[] annotations, Annotation[] declaredAnnotations) + { + return new AnnotationStore(buildAnnotationMap(annotations), buildAnnotationMap(declaredAnnotations)); + } + + public static AnnotationStore wrap(AnnotationStore annotationStore, Set<Annotation> annotations, Set<Annotation> declaredAnnotations) + { + AnnotationMap annotationMap = new AnnotationMap(); + annotationMap.putAll(buildAnnotationMap(annotations)); + annotationMap.putAll(annotationStore.getAnnotationMap()); + + AnnotationMap declaredAnnotationMap = new AnnotationMap(); + declaredAnnotationMap.putAll(buildAnnotationMap(declaredAnnotations)); + declaredAnnotationMap.putAll(annotationStore.getDeclaredAnnotationMap()); + + return new AnnotationStore(annotationMap, declaredAnnotationMap); + } + + // The annotation map (annotation type -> annotation) of the item + private final AnnotationMap annotationMap; + // The meta-annotation map (annotation type -> set of annotations containing + // meta-annotation) of the item + private final MetaAnnotationMap metaAnnotationMap; + // The set of all annotations on the item + private final Set<Annotation> annotationSet; + + // The annotation map (annotation type -> annotation) of the item + private final AnnotationMap declaredAnnotationMap; + // The meta-annotation map (annotation type -> set of annotations containing + // meta-annotation) of the item + private final MetaAnnotationMap declaredMetaAnnotationMap; + // The set of all annotations on the item + private final Set<Annotation> declaredAnnotationSet; + + /** + * Constructor + * + * Also builds the meta-annotation map. Throws a NullPointerException if + * trying to register a null map + * + * @param annotationMap A map of annotation to register + * + */ + protected AnnotationStore(AnnotationMap annotationMap, AnnotationMap declaredAnnotationMap) + { + if (annotationMap == null) + { + throw new NullPointerException("annotationMap cannot be null"); + } + this.annotationMap = annotationMap; + this.annotationSet = new HashSet<Annotation>(); + this.metaAnnotationMap = new MetaAnnotationMap(); + for (Annotation annotation : annotationMap.values()) + { + for (Annotation metaAnnotation : annotation.annotationType().getAnnotations()) + { + // Only map meta-annotations we are interested in + if (MAPPED_METAANNOTATIONS.contains(metaAnnotation.annotationType())) + { + metaAnnotationMap.put(metaAnnotation.annotationType(), annotation); + } + } + annotationSet.add(annotation); + } + + if (declaredAnnotationMap == null) + { + throw new NullPointerException("declaredAnnotationMap cannot be null"); + } + this.declaredAnnotationMap = declaredAnnotationMap; + this.declaredAnnotationSet = new HashSet<Annotation>(); + this.declaredMetaAnnotationMap = new MetaAnnotationMap(); + for (Annotation annotation : declaredAnnotationMap.values()) + { + for (Annotation metaAnnotation : annotation.annotationType().getAnnotations()) + { + // Only map meta-annotations we are interested in + if (MAPPED_METAANNOTATIONS.contains(metaAnnotation.annotationType())) + { + declaredMetaAnnotationMap.put(metaAnnotation.annotationType(), annotation); + } + } + declaredAnnotationSet.add(annotation); + } + } + + /* (non-Javadoc) + * @see org.jboss.webbeans.introspector.jlr.AnnotationStore#getAnnotationMap() + */ + public Map<Class<? extends Annotation>, Annotation> getAnnotationMap() + { + return Collections.unmodifiableMap(annotationMap); + } + + /* (non-Javadoc) + * @see org.jboss.webbeans.introspector.jlr.AnnotationStore#getAnnotationSet() + */ + public Set<Annotation> getAnnotationSet() + { + return Collections.unmodifiableSet(annotationSet); + } + + /* (non-Javadoc) + * @see org.jboss.webbeans.introspector.jlr.AnnotationStore#getMetaAnnotationMap() + */ + public Map<Class<? extends Annotation>, Set<Annotation>> getMetaAnnotationMap() + { + return Collections.unmodifiableMap(metaAnnotationMap); + } + + /* (non-Javadoc) + * @see org.jboss.webbeans.introspector.jlr.AnnotationStore#getDeclaredAnnotationMap() + */ + public Map<Class<? extends Annotation>, Annotation> getDeclaredAnnotationMap() + { + return Collections.unmodifiableMap(declaredAnnotationMap); + } + + /* (non-Javadoc) + * @see org.jboss.webbeans.introspector.jlr.AnnotationStore#getDeclaredAnnotationSet() + */ + public Set<Annotation> getDeclaredAnnotationSet() + { + return Collections.unmodifiableSet(declaredAnnotationSet); + } + + /* (non-Javadoc) + * @see org.jboss.webbeans.introspector.jlr.AnnotationStore#getDeclaredMetaAnnotationMap() + */ + public Map<Class<? extends Annotation>, Set<Annotation>> getDeclaredMetaAnnotationMap() + { + return Collections.unmodifiableMap(declaredMetaAnnotationMap); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotationStore.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedAnnotation.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedAnnotation.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedAnnotation.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.introspector.jlr; + +import java.lang.annotation.Annotation; + +import org.jboss.webbeans.introspector.AnnotatedAnnotation; + +interface WrappableAnnotatedAnnotation<T extends Annotation> extends AnnotatedAnnotation<T>, WrappableAnnotatedType<T> +{ + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedAnnotation.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedClass.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedClass.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedClass.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,8 @@ +package org.jboss.webbeans.introspector.jlr; + +import org.jboss.webbeans.introspector.AnnotatedClass; + +public interface WrappableAnnotatedClass<T> extends AnnotatedClass<T>, WrappableAnnotatedType<T> +{ + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedClass.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedConstructor.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedConstructor.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedConstructor.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.introspector.jlr; + +import java.lang.reflect.Constructor; + +import org.jboss.webbeans.introspector.AnnotatedConstructor; + +interface WrappableAnnotatedConstructor<T> extends AnnotatedConstructor<T>, WrappableAnnotatedItem<T, Constructor<T>> +{ + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedConstructor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedField.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedField.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedField.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.introspector.jlr; + +import java.lang.reflect.Field; + +import org.jboss.webbeans.introspector.AnnotatedField; + +interface WrappableAnnotatedField<T> extends AnnotatedField<T>, WrappableAnnotatedItem<T, Field> +{ + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedField.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedItem.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedItem.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.introspector.jlr; + +import org.jboss.webbeans.introspector.AnnotatedItem; + +interface WrappableAnnotatedItem<T, S> extends AnnotatedItem<T, S> +{ + + AnnotationStore getAnnotationStore(); + +} \ No newline at end of file Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedItem.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedMember.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedMember.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedMember.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.introspector.jlr; + +import java.lang.reflect.Member; + +import org.jboss.webbeans.introspector.AnnotatedMember; + +interface WrappableAnnotatedMember<T, S extends Member> extends AnnotatedMember<T, S>, WrappableAnnotatedItem<T, S> +{ + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedMember.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedMethod.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedMethod.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedMethod.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.introspector.jlr; + +import java.lang.reflect.Method; + +import org.jboss.webbeans.introspector.AnnotatedMember; +import org.jboss.webbeans.introspector.AnnotatedMethod; + +interface WrappableAnnotatedMethod<T> extends AnnotatedMethod<T>, WrappableAnnotatedItem<T, Method> +{ + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedMethod.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedParameter.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedParameter.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedParameter.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,8 @@ +package org.jboss.webbeans.introspector.jlr; + +import org.jboss.webbeans.introspector.AnnotatedParameter; + +interface WrappableAnnotatedParameter<T> extends AnnotatedParameter<T>, WrappableAnnotatedItem<T, Object> +{ + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedParameter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedType.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedType.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedType.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,8 @@ +package org.jboss.webbeans.introspector.jlr; + +import org.jboss.webbeans.introspector.AnnotatedType; + +interface WrappableAnnotatedType<T> extends AnnotatedType<T>, WrappableAnnotatedItem<T, Class<T>> +{ + +} \ No newline at end of file Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/WrappableAnnotatedType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/MergedStereotypes.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/MergedStereotypes.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/MergedStereotypes.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -22,7 +22,7 @@ import java.util.Set; import org.jboss.webbeans.MetaDataCache; -import org.jboss.webbeans.introspector.jlr.AbstractAnnotatedItem.AnnotationMap; +import org.jboss.webbeans.introspector.jlr.AnnotationStore.AnnotationMap; /** * Meta model for the merged stereotype for a bean Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -1,7 +1,11 @@ package org.jboss.webbeans.test.tck; +import java.lang.annotation.Annotation; +import java.util.List; + import javax.webbeans.manager.Manager; +import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.tck.api.Containers; import org.jboss.webbeans.test.mock.MockBootstrap; import org.jboss.webbeans.test.mock.MockWebBeanDiscovery; @@ -9,11 +13,21 @@ public class ContainersImpl implements Containers { - public Manager deploy(Class<?>... classes) + public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, Class<?>... classes) { MockBootstrap bootstrap = new MockBootstrap(); bootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(classes)); bootstrap.boot(); - return bootstrap.getManager(); + ManagerImpl manager = bootstrap.getManager(); + if (enabledDeploymentTypes != null) + { + manager.setEnabledDeploymentTypes(enabledDeploymentTypes); + } + return manager; } + + public Manager deploy(java.lang.Class<?>... classes) + { + return deploy(null, classes); + } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -11,16 +11,20 @@ public class ManagersImpl implements Managers { - - public Manager createManager() + + public Manager createManager(List<Class<? extends Annotation>> enabledDeploymentTypes) { new MockBootstrap(); + if (enabledDeploymentTypes != null) + { + CurrentManager.rootManager().setEnabledDeploymentTypes(enabledDeploymentTypes); + } return CurrentManager.rootManager(); } - - public void setEnabledDeploymentTypes(List<Class<? extends Annotation>> enabledDeploymentTypes) + + public Manager createManager() { - CurrentManager.rootManager().setEnabledDeploymentTypes(enabledDeploymentTypes); + return createManager(null); } public List<Class<? extends Annotation>> getEnabledDeploymentTypes() Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java 2009-01-20 20:33:41 UTC (rev 1130) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -67,7 +67,7 @@ //AnnotatedClass<Tuna> annotatedItem = new SimpleAnnotatedClass<Tuna>(Tuna.class, annotations); // TODO This should test a real class tuna = createSimpleBean(Tuna.class); - om = new AnnotatedMethodImpl<Object>(AnObserver.class.getMethod("observe", new Class[] { Event.class }), AnnotatedClassImpl.of(AnObserver.class)); + om = AnnotatedMethodImpl.of(AnObserver.class.getMethod("observe", new Class[] { Event.class }), AnnotatedClassImpl.of(AnObserver.class)); AnObserver observerInstance = new AnObserver(); // TODO Fix this Observer<Event> observer = new MockObserverImpl<Event>(tuna, om, Event.class); Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java 2009-01-20 20:33:41 UTC (rev 1130) +++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -1,5 +1,8 @@ package org.jboss.webbeans.tck.api; +import java.lang.annotation.Annotation; +import java.util.List; + import javax.webbeans.manager.Manager; /** @@ -34,6 +37,8 @@ * @param classes the classes to deploy * @return the manager created as a result of initializing the container */ + public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, Class<?>...classes); + public Manager deploy(Class<?>...classes); } Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java 2009-01-20 20:33:41 UTC (rev 1130) +++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Managers.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -19,22 +19,23 @@ public static final String PROPERTY_NAME = Managers.class.getName(); /** + * Get a new Manager instance * - * @param enabledDeploymentTypes + * @return the Manager */ - void setEnabledDeploymentTypes(List<Class<? extends Annotation>> enabledDeploymentTypes); + Manager createManager(List<Class<? extends Annotation>> enabledDeploymentTypes); /** - * Returns a list of the enabled deployment types for the current manager + * Get a new Manager instance * - * @return + * @return the Manager */ - List<Class<? extends Annotation>> getEnabledDeploymentTypes(); + Manager createManager(); /** - * Get a new Manager instance + * Returns a list of the enabled deployment types for the current manager * - * @return the Manager + * @return */ - Manager createManager(); + List<Class<? extends Annotation>> getEnabledDeploymentTypes(); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-01-20 20:33:41 UTC (rev 1130) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -68,8 +68,14 @@ @BeforeMethod public final void before() { - manager = configuration().getManagers().createManager(); - configuration().getManagers().setEnabledDeploymentTypes(getEnabledDeploymentTypes()); + if (getEnabledDeploymentTypes().size() > 0) + { + manager = configuration().getManagers().createManager(getEnabledDeploymentTypes()); + } + else + { + manager = configuration().getManagers().createManager(); + } } @AfterMethod @@ -100,17 +106,24 @@ protected void deployBeans(Class<?>... classes) { - manager = configuration().getContainers().deploy(classes); + if (getEnabledDeploymentTypes().size() > 0) + { + manager = configuration().getContainers().deploy(getEnabledDeploymentTypes(), classes); + } + else + { + manager = configuration().getContainers().deploy(classes); + } } - protected List<Class<? extends Annotation>> getStandardDeploymentTypes() + protected final List<Class<? extends Annotation>> getStandardDeploymentTypes() { return new ArrayList<Class<? extends Annotation>>(STANDARD_DEPLOYMENT_TYPES); } protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { - return getStandardDeploymentTypes(); + return Collections.emptyList(); } protected byte[] serialize(Object instance) throws IOException Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,25 @@ +package org.jboss.webbeans.tck.unit.definition.deployment; + +import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; + +import java.util.Arrays; + +import javax.webbeans.DeploymentException; + +import org.jboss.webbeans.tck.AbstractTest; +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.testng.annotations.Test; + +public class BrokenDeploymentTypeTest extends AbstractTest +{ + + @SuppressWarnings("unchecked") + @Test(expectedExceptions=DeploymentException.class) @SpecAssertion(section="2.5.6") + public void testStandardMustBeDeclared() + { + + manager = configuration().getContainers().deploy(Arrays.asList(AnotherDeploymentType.class, HornedAnimalDeploymentType.class), Dog.class); + } + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,35 @@ +package org.jboss.webbeans.tck.unit.definition.deployment; + +import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; + +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.List; + +import javax.webbeans.Standard; + +import org.jboss.webbeans.tck.AbstractTest; +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.testng.annotations.Test; + +public class CustomDeploymentTypeTest extends AbstractTest +{ + + @Override + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + return Arrays.asList(Standard.class, AnotherDeploymentType.class, + HornedAnimalDeploymentType.class); + } + + @SuppressWarnings("unchecked") + @Test @SpecAssertion(section={"2.5.6", "2.5.7"}) + public void testCustomDeploymentTypes() + { + assert configuration().getManagers().getEnabledDeploymentTypes().size() == 3; + assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class); + assert configuration().getManagers().getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-01-20 20:33:41 UTC (rev 1130) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -1,16 +1,12 @@ package org.jboss.webbeans.tck.unit.definition.deployment; -import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; - import java.lang.annotation.Annotation; import java.lang.reflect.Method; -import java.util.Arrays; import java.util.List; import javax.webbeans.DefinitionException; import javax.webbeans.DeploymentException; import javax.webbeans.Production; -import javax.webbeans.Standard; import javax.webbeans.UnsatisfiedDependencyException; import javax.webbeans.manager.Bean; @@ -116,37 +112,15 @@ @SuppressWarnings("unchecked") @Test(groups="beanLifecycle", expectedExceptions=UnsatisfiedDependencyException.class) @SpecAssertion(section="2.5.6") public void testBeanWithDisabledDeploymentTypeNotInstantiated() - { - configuration().getManagers().setEnabledDeploymentTypes( - Arrays.asList(Standard.class, AnotherDeploymentType.class, - HornedAnimalDeploymentType.class)); - + { Bean<RedSnapper> bean = createSimpleBean(RedSnapper.class); manager.addBean(bean); manager.getInstanceByType(RedSnapper.class); } - @SuppressWarnings("unchecked") - @Test @SpecAssertion(section={"2.5.6", "2.5.7"}) - public void testCustomDeploymentTypes() - { - configuration().getManagers().setEnabledDeploymentTypes( - Arrays.asList(Standard.class, AnotherDeploymentType.class, - HornedAnimalDeploymentType.class)); - assert configuration().getManagers().getEnabledDeploymentTypes().size() == 3; - assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); - assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class); - assert configuration().getManagers().getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class); - } + - @SuppressWarnings("unchecked") - @Test(expectedExceptions=DeploymentException.class) @SpecAssertion(section="2.5.6") - public void testStandardMustBeDeclared() - { - configuration().getManagers().setEnabledDeploymentTypes( - Arrays.asList(AnotherDeploymentType.class, HornedAnimalDeploymentType.class)); - } - + @Test(groups={"stub", "webbeansxml"}, expectedExceptions=DeploymentException.class) @SpecAssertion(section="2.5.6") public void testMultipleDeployElementsCannotBeDefined() { Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DisabledDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DisabledDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DisabledDeploymentType.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.unit.definition.deployment; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface DisabledDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DisabledDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/RedSnapper.java 2009-01-20 20:33:41 UTC (rev 1130) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/RedSnapper.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -4,6 +4,7 @@ @FishStereotype @RequestScoped +@DisabledDeploymentType class RedSnapper implements Animal { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java 2009-01-20 20:33:41 UTC (rev 1130) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java 2009-01-20 21:13:55 UTC (rev 1131) @@ -2,6 +2,10 @@ import static org.jboss.webbeans.tck.impl.util.Reflections.annotationSetMatches; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.List; + import javax.webbeans.AnnotationLiteral; import javax.webbeans.RequestScoped; @@ -12,12 +16,22 @@ public class RealizationTest extends AbstractTest { - @Test(groups="broken") @SpecAssertion(section="4.1") + @Override + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>(); + deploymentTypes.addAll(getStandardDeploymentTypes()); + deploymentTypes.add(AnotherDeploymentType.class); + deploymentTypes.add(FarmAnimalDeploymentType.class); + return deploymentTypes; + } + + @Test @SpecAssertion(section="4.1") public void testRealizedBeanWithProducerMethodHasSameScope() { deployBeans(Cow.class); - assert manager.resolveByType(Dung.class).size() == 1; - assert manager.resolveByType(Dung.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert manager.resolveByType(Dung.class, new AnnotationLiteral<Smelly>(){}).size() == 1; + assert manager.resolveByType(Dung.class, new AnnotationLiteral<Smelly>(){}).iterator().next().getScopeType().equals(RequestScoped.class); } @Test(groups="broken") @SpecAssertion(section="4.1") @@ -46,7 +60,7 @@ assert annotationSetMatches(manager.resolveByType(Dung.class).iterator().next().getBindings(), Smelly.class, Tame.class); } - @Test(groups="broken") @SpecAssertion(section="4.1") + @Test @SpecAssertion(section="4.1") public void testRealizedBeanWithProducerMethodHasSameStereotypes() { deployBeans(LabradorKennel.class);

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1130 - in doc/trunk/reference: en-US and 8 other directories.

by webbeans-commits＠lists.jboss.org

Author: nico.ben Date: 2009-01-20 15:33:41 -0500 (Tue, 20 Jan 2009) New Revision: 1130 Modified: doc/trunk/reference/de-DE/ee.po doc/trunk/reference/de-DE/events.po doc/trunk/reference/de-DE/injection.po doc/trunk/reference/de-DE/interceptors.po doc/trunk/reference/de-DE/intro.po doc/trunk/reference/de-DE/part3.po doc/trunk/reference/de-DE/scopescontexts.po doc/trunk/reference/en-US/ee.xml doc/trunk/reference/en-US/events.xml doc/trunk/reference/en-US/injection.xml doc/trunk/reference/en-US/interceptors.xml doc/trunk/reference/en-US/intro.xml doc/trunk/reference/en-US/part3.xml doc/trunk/reference/en-US/scopescontexts.xml doc/trunk/reference/es-ES/ee.po doc/trunk/reference/es-ES/events.po doc/trunk/reference/es-ES/injection.po doc/trunk/reference/es-ES/interceptors.po doc/trunk/reference/es-ES/intro.po doc/trunk/reference/es-ES/part3.po doc/trunk/reference/es-ES/scopescontexts.po doc/trunk/reference/fr-FR/ee.po doc/trunk/reference/fr-FR/events.po doc/trunk/reference/fr-FR/injection.po doc/trunk/reference/fr-FR/interceptors.po doc/trunk/reference/fr-FR/intro.po doc/trunk/reference/fr-FR/part3.po doc/trunk/reference/fr-FR/scopescontexts.po doc/trunk/reference/it-IT/ee.po doc/trunk/reference/it-IT/events.po doc/trunk/reference/it-IT/injection.po doc/trunk/reference/it-IT/interceptors.po doc/trunk/reference/it-IT/intro.po doc/trunk/reference/it-IT/part3.po doc/trunk/reference/it-IT/scopescontexts.po doc/trunk/reference/ja-JP/ee.po doc/trunk/reference/ja-JP/events.po doc/trunk/reference/ja-JP/injection.po doc/trunk/reference/ja-JP/interceptors.po doc/trunk/reference/ja-JP/intro.po doc/trunk/reference/ja-JP/part3.po doc/trunk/reference/ja-JP/scopescontexts.po doc/trunk/reference/ko-KR/ee.po doc/trunk/reference/ko-KR/events.po doc/trunk/reference/ko-KR/injection.po doc/trunk/reference/ko-KR/interceptors.po doc/trunk/reference/ko-KR/intro.po doc/trunk/reference/ko-KR/part3.po doc/trunk/reference/ko-KR/scopescontexts.po doc/trunk/reference/pt-BR/ee.po doc/trunk/reference/pt-BR/events.po doc/trunk/reference/pt-BR/injection.po doc/trunk/reference/pt-BR/interceptors.po doc/trunk/reference/pt-BR/intro.po doc/trunk/reference/pt-BR/part3.po doc/trunk/reference/pt-BR/scopescontexts.po doc/trunk/reference/zh-CN/ee.po doc/trunk/reference/zh-CN/events.po doc/trunk/reference/zh-CN/injection.po doc/trunk/reference/zh-CN/interceptors.po doc/trunk/reference/zh-CN/intro.po doc/trunk/reference/zh-CN/part3.po doc/trunk/reference/zh-CN/scopescontexts.po doc/trunk/reference/zh-TW/ee.po doc/trunk/reference/zh-TW/events.po doc/trunk/reference/zh-TW/injection.po doc/trunk/reference/zh-TW/interceptors.po doc/trunk/reference/zh-TW/intro.po doc/trunk/reference/zh-TW/part3.po doc/trunk/reference/zh-TW/scopescontexts.po Log: Inserted space before and after  Modified: doc/trunk/reference/de-DE/ee.po =================================================================== --- doc/trunk/reference/de-DE/ee.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/de-DE/ee.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -311,7 +311,7 @@ #, no-c-format msgid "" "Web Beans doesn't define any special deployment archive. You can package Web " -"Beans in JARs, EJB-JARs or WARsany deployment location in the " +"Beans in JARs, EJB-JARs or WARs  any deployment location in the " "application classpath. However, each archive that contains Web Beans must " "include a file named <literal>web-beans.xml</literal> in the <literal>META-" "INF</literal> or <literal>WEB-INF</literal> directory. The file may be " Modified: doc/trunk/reference/de-DE/events.po =================================================================== --- doc/trunk/reference/de-DE/events.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/de-DE/events.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -117,7 +117,7 @@ #: events.xml:48 #, no-c-format msgid "" -"An observer method need not specify any event bindingsin this case it " +"An observer method need not specify any event bindings  in this case it " "is interested in <emphasis>all</emphasis> events of a particular type. If it " "does specify event bindings, it is only interested in events which also have " "those event bindings." Modified: doc/trunk/reference/de-DE/injection.po =================================================================== --- doc/trunk/reference/de-DE/injection.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/de-DE/injection.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -653,8 +653,8 @@ #, no-c-format msgid "" "If you've been paying attention, you're probably wondering how the Web Bean " -"manager decides which implementation<literal>ExternalPaymentProcessor</" -"literal> or <literal>MockPaymentProcessor</literal>to choose. Consider " +"manager decides which implementation  <literal>ExternalPaymentProcessor</" +"literal> or <literal>MockPaymentProcessor</literal>  to choose. Consider " "what happens when the manager encounters this injection point:" msgstr "" @@ -794,7 +794,7 @@ msgid "" "To fix an <literal>UnsatisfiedDependencyException</literal>, simply provide " "a Web Bean which implements the API type and has the binding types of the " -"injection pointor enable the deployment type of a Web Bean that " +"injection point  or enable the deployment type of a Web Bean that " "already implements the API type and has the binding types." msgstr "" @@ -973,7 +973,7 @@ #, no-c-format msgid "" "If the binding type has an annotation member, we can't use an anonymous " -"subclass of <literal>AnnotationLiteral</literal>instead we'll need to " +"subclass of <literal>AnnotationLiteral</literal>  instead we'll need to " "create a named subclass:" msgstr "" @@ -1053,8 +1053,8 @@ #: injection.xml:442 #, no-c-format msgid "" -"There are certain kinds of dependent objectsWeb Beans with scope " -"<literal>@Dependent</literal>that need to know something about the " +"There are certain kinds of dependent objects  Web Beans with scope " +"<literal>@Dependent</literal>  that need to know something about the " "object or injection point into which they are injected in order to be able " "to do what they do. For example:" msgstr "" Modified: doc/trunk/reference/de-DE/interceptors.po =================================================================== --- doc/trunk/reference/de-DE/interceptors.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/de-DE/interceptors.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -486,7 +486,7 @@ msgid "" "Well, fortunately, Web Beans works around this missing feature of Java. We " "may annotate one interceptor binding type with other interceptor binding " -"types. The interceptor bindings are transitiveany Web Bean with the " +"types. The interceptor bindings are transitive  any Web Bean with the " "first interceptor binding inherits the interceptor bindings declared as meta-" "annotations." msgstr "" @@ -560,7 +560,7 @@ #: interceptors.xml:212 #, no-c-format msgid "" -"the interceptor ordering is non-globalit is determined by the order in " +"the interceptor ordering is non-global  it is determined by the order in " "which interceptors are listed at the class level." msgstr "" Modified: doc/trunk/reference/de-DE/intro.po =================================================================== --- doc/trunk/reference/de-DE/intro.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/de-DE/intro.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -49,14 +49,14 @@ "Furthermore, every EJB 3-style session bean is a Web Bean. Sure, the " "JavaBeans and EJBs you've been writing every day have not been able to take " "advantage of the new services defined by the Web Beans specification, but " -"you'll be able to use every one of them as Web Beansinjecting them " +"you'll be able to use every one of them as Web Beans  injecting them " "into other Web Beans, configuring them via the Web Beans XML configuration " -"facility, even adding interceptors and decorators to themwithout " +"facility, even adding interceptors and decorators to them  without " "touching your existing code." msgstr "" "Mit bestimmten, ganz besonderen Ausnahmen ist jede Java-Klasse mit einem Konstruktor, die keine Parameter akzeptiert ein Web Bean. Das beinhaltet jedes JavaBean. " "Desweiteren ist jedes EJB 3-artige Session Bean ein Web Bean. Sicher, die von Ihnen täglich geschriebenen " -"JavaBeans und EJBs konnten die neuen, in der Web Beans Spezifikation definierten Dienste nicht nutzen, aber Sie werden diese allesamt benutzen können können, das Web Beansdiese in andere " +"JavaBeans und EJBs konnten die neuen, in der Web Beans Spezifikation definierten Dienste nicht nutzen, aber Sie werden diese allesamt benutzen können können, das Web Beans  diese in andere " "Web Beans einspeisen, diese via der Web Beans XML-Konfigurationseinrichtung konfigurieren " "und diesen sogar Interzeptoren und Dekoratoren hinzufügen, ohne den bestehenden Code anzurühren." @@ -252,14 +252,14 @@ "At system initialization time, the Web Bean manager must validate that " "exactly one Web Bean exists which satisfies each injection point. In our " "example, if no implementation of <literal>Translator</literal> " -"availableif the <literal>SentenceTranslator</literal> EJB was not " -"deployedthe Web Bean manager would throw an " +"available  if the <literal>SentenceTranslator</literal> EJB was not " +"deployed  the Web Bean manager would throw an " "<literal>UnsatisfiedDependencyException</literal>. If more than one " "implementation of <literal>Translator</literal> was available, the Web Bean " "manager would throw an <literal>AmbiguousDependencyException</literal>." msgstr "" "Zum Zeitpunkt der Systeminitialisierung muss der Web Bean Manager validieren, dass genau ein " -"Web Bean existiert, das jedem Einspeisungspunkt gerecht wird. Für unser Beispiel bedeutet das, wenn keine Implementierung von <literal>Translator</literal> verfügbar istwenn der <literal>SentenceTranslator</literal> EJB nicht deployt wurdedass der Web Bean Manager eine <literal>UnsatisfiedDependencyException</literal> melden würde. Wäre mehr als eine Implementierung von <literal>Translator</literal> verfügbar, so würde der Web Bean " +"Web Bean existiert, das jedem Einspeisungspunkt gerecht wird. Für unser Beispiel bedeutet das, wenn keine Implementierung von <literal>Translator</literal> verfügbar ist  wenn der <literal>SentenceTranslator</literal> EJB nicht deployt wurde  dass der Web Bean Manager eine <literal>UnsatisfiedDependencyException</literal> melden würde. Wäre mehr als eine Implementierung von <literal>Translator</literal> verfügbar, so würde der Web Bean " "Manager eine <literal>AmbiguousDependencyException</literal> melden." #. Tag: title @@ -387,8 +387,8 @@ #, no-c-format msgid "" "Note that not all clients of a Web Bean are Web Beans. Other objects such as " -"Servlets or Message-Driven Beanswhich are by nature not injectable, " -"contextual objectsmay also obtain references to Web Beans by injection." +"Servlets or Message-Driven Beans  which are by nature not injectable, " +"contextual objects  may also obtain references to Web Beans by injection." msgstr "" #. Tag: para @@ -759,7 +759,7 @@ #: intro.xml:289 #, no-c-format msgid "" -"In this case, the name defaults to <literal>shoppingCart</literal>the " +"In this case, the name defaults to <literal>shoppingCart</literal>  the " "unqualified class name, with the first character changed to lowercase." msgstr "" @@ -908,8 +908,8 @@ msgid "" "The specification says that all EJB 3-style session and singleton beans are " "<emphasis>enterprise</emphasis> Web Beans. Message driven beans are not Web " -"Beanssince they are not intended to be injected into other " -"objectsbut they can take advantage of most of the functionality of Web " +"Beans  since they are not intended to be injected into other " +"objects  but they can take advantage of most of the functionality of Web " "Beans, including dependency injection and interceptors." msgstr "" Modified: doc/trunk/reference/de-DE/part3.po =================================================================== --- doc/trunk/reference/de-DE/part3.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/de-DE/part3.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -28,8 +28,8 @@ #, no-c-format msgid "" "You don't see string-based identifiers in Web Beans code, not because the " -"framework is hiding them from you using clever defaulting rulesso-" -"called \"configuration by convention\"but because there are simply no " +"framework is hiding them from you using clever defaulting rules  so-" +"called \"configuration by convention\"  but because there are simply no " "strings there to begin with!" msgstr "" Modified: doc/trunk/reference/de-DE/scopescontexts.po =================================================================== --- doc/trunk/reference/de-DE/scopescontexts.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/de-DE/scopescontexts.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -421,7 +421,7 @@ "The Web Bean manager is permitted to destroy a conversation and all state " "held in its context at any time in order to preserve resources. A Web Bean " "manager implementation will normally do this on the basis of some kind of " -"timeoutthough this is not required by the Web Beans specification. The " +"timeout  though this is not required by the Web Beans specification. The " "timeout is the period of inactivity before the conversation is destroyed." msgstr "" Modified: doc/trunk/reference/en-US/ee.xml =================================================================== --- doc/trunk/reference/en-US/ee.xml 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/en-US/ee.xml 2009-01-20 20:33:41 UTC (rev 1130) @@ -170,7 +170,7 @@ <title>Packaging and deployment</title> <para>Web Beans doesn't define any special deployment archive. You can package - Web Beans in JARs, EJB-JARs or WARsany deployment location in the application + Web Beans in JARs, EJB-JARs or WARs  any deployment location in the application classpath. However, each archive that contains Web Beans must include a file named <literal>web-beans.xml</literal> in the <literal>META-INF</literal> or <literal>WEB-INF</literal> directory. The file may be empty. Web Beans deployed in Modified: doc/trunk/reference/en-US/events.xml =================================================================== --- doc/trunk/reference/en-US/events.xml 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/en-US/events.xml 2009-01-20 20:33:41 UTC (rev 1130) @@ -48,7 +48,7 @@ <programlisting role="JAVA"><![CDATA[public void afterDocumentUpdate(@Observes @Updated Document document) { ... }]]></programlisting> - <para>An observer method need not specify any event bindingsin this case it + <para>An observer method need not specify any event bindings  in this case it is interested in <emphasis>all</emphasis> events of a particular type. If it does specify event bindings, it is only interested in events which also have those event bindings.</para> Modified: doc/trunk/reference/en-US/injection.xml =================================================================== --- doc/trunk/reference/en-US/injection.xml 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/en-US/injection.xml 2009-01-20 20:33:41 UTC (rev 1130) @@ -324,8 +324,8 @@ <title>Deployment type precedence</title> <para>If you've been paying attention, you're probably wondering how the Web Bean -manager decides which implementation<literal>ExternalPaymentProcessor</literal> -or <literal>MockPaymentProcessor</literal>to choose. Consider what happens when +manager decides which implementation  <literal>ExternalPaymentProcessor</literal> +or <literal>MockPaymentProcessor</literal>  to choose. Consider what happens when the manager encounters this injection point:</para> <programlisting role="JAVA"><![CDATA[@Current PaymentProcessor paymentProcessor]]></programlisting> @@ -402,7 +402,7 @@ <para>To fix an <literal>UnsatisfiedDependencyException</literal>, simply provide a Web Bean which implements the API type and has the binding types of the injection - pointor enable the deployment type of a Web Bean that already implements the + point  or enable the deployment type of a Web Bean that already implements the API type and has the binding types.</para> <para>To fix an <literal>AmbiguousDependencyException</literal>, introduce a @@ -489,7 +489,7 @@ new AnnotationLiteral<CreditCard>(){});]]></programlisting> <para>If the binding type has an annotation member, we can't use an anonymous subclass of - <literal>AnnotationLiteral</literal>instead we'll need to create a named subclass:</para> + <literal>AnnotationLiteral</literal>  instead we'll need to create a named subclass:</para> <programlisting role="JAVA"><![CDATA[abstract class CreditCardBinding extends AnnotationLiteral<CreditCard> @@ -525,8 +525,8 @@ <section> <title>The <literal>InjectionPoint</literal> object</title> - <para>There are certain kinds of dependent objectsWeb Beans with scope - <literal>@Dependent</literal>that need to know something about the object or injection + <para>There are certain kinds of dependent objects  Web Beans with scope + <literal>@Dependent</literal>  that need to know something about the object or injection point into which they are injected in order to be able to do what they do. For example:</para> <itemizedlist> Modified: doc/trunk/reference/en-US/interceptors.xml =================================================================== --- doc/trunk/reference/en-US/interceptors.xml 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/en-US/interceptors.xml 2009-01-20 20:33:41 UTC (rev 1130) @@ -232,7 +232,7 @@ <para>Well, fortunately, Web Beans works around this missing feature of Java. We may annotate one interceptor binding type with other interceptor binding - types. The interceptor bindings are transitiveany Web Bean with the first + types. The interceptor bindings are transitive  any Web Bean with the first interceptor binding inherits the interceptor bindings declared as meta-annotations.</para> <programlisting role="JAVA"><![CDATA[@Transactional @Secure @@ -268,7 +268,7 @@ <para>interceptors may not be easily disabled at deployment time, and</para> </listitem> <listitem> - <para>the interceptor ordering is non-globalit is determined + <para>the interceptor ordering is non-global  it is determined by the order in which interceptors are listed at the class level.</para> </listitem> </itemizedlist> Modified: doc/trunk/reference/en-US/intro.xml =================================================================== --- doc/trunk/reference/en-US/intro.xml 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/en-US/intro.xml 2009-01-20 20:33:41 UTC (rev 1130) @@ -17,9 +17,9 @@ JavaBean. Furthermore, every EJB 3-style session bean is a Web Bean. Sure, the JavaBeans and EJBs you've been writing every day have not been able to take advantage of the new services defined by the Web Beans specification, - but you'll be able to use every one of them as Web Beansinjecting them + but you'll be able to use every one of them as Web Beans  injecting them into other Web Beans, configuring them via the Web Beans XML configuration - facility, even adding interceptors and decorators to themwithout + facility, even adding interceptors and decorators to them  without touching your existing code.</para> <para>Suppose that we have two existing Java classes, that we've been using @@ -97,8 +97,8 @@ <para>At system initialization time, the Web Bean manager must validate that exactly one Web Bean exists which satisfies each injection point. In our example, - if no implementation of <literal>Translator</literal> availableif the - <literal>SentenceTranslator</literal> EJB was not deployedthe Web Bean + if no implementation of <literal>Translator</literal> available  if the + <literal>SentenceTranslator</literal> EJB was not deployed  the Web Bean manager would throw an <literal>UnsatisfiedDependencyException</literal>. If more than one implementation of <literal>Translator</literal> was available, the Web Bean manager would throw an @@ -173,8 +173,8 @@ see in <xref linkend="deploymenttypes"/>.</para> <para>Note that not all clients of a Web Bean are Web Beans. Other objects - such as Servlets or Message-Driven Beanswhich are by nature not injectable, - contextual objectsmay also obtain references to Web Beans by injection.</para> + such as Servlets or Message-Driven Beans  which are by nature not injectable, + contextual objects  may also obtain references to Web Beans by injection.</para> <para>Enough hand-waving. More formally, according to the spec:</para> @@ -328,7 +328,7 @@ <programlisting role="JAVA"><![CDATA[@SessionScoped @Named public class ShoppingCart { ... }]]></programlisting> - <para>In this case, the name defaults to <literal>shoppingCart</literal>the + <para>In this case, the name defaults to <literal>shoppingCart</literal>  the unqualified class name, with the first character changed to lowercase.</para> </section> @@ -404,8 +404,8 @@ <para>The specification says that all EJB 3-style session and singleton beans are <emphasis>enterprise</emphasis> Web Beans. Message driven beans are not - Web Beanssince they are not intended to be injected into other - objectsbut they can take advantage of most of the functionality of Web + Web Beans  since they are not intended to be injected into other + objects  but they can take advantage of most of the functionality of Web Beans, including dependency injection and interceptors.</para> <para>Every local interface of an enterprise Web Bean that does not have a Modified: doc/trunk/reference/en-US/part3.xml =================================================================== --- doc/trunk/reference/en-US/part3.xml 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/en-US/part3.xml 2009-01-20 20:33:41 UTC (rev 1130) @@ -8,8 +8,8 @@ contained in typesafe Java constructs that may be validated by the compiler.</para> <para>You don't see string-based identifiers in Web Beans code, not because the - framework is hiding them from you using clever defaulting rulesso-called - "configuration by convention"but because there are simply no strings there + framework is hiding them from you using clever defaulting rules  so-called + "configuration by convention"  but because there are simply no strings there to begin with!</para> <para>The obvious benefit of this approach is that <emphasis>any</emphasis> IDE can Modified: doc/trunk/reference/en-US/scopescontexts.xml =================================================================== --- doc/trunk/reference/en-US/scopescontexts.xml 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/en-US/scopescontexts.xml 2009-01-20 20:33:41 UTC (rev 1130) @@ -236,7 +236,7 @@ <para>The Web Bean manager is permitted to destroy a conversation and all state held in its context at any time in order to preserve resources. A Web Bean manager implementation will normally do this on the basis of some kind of - timeoutthough this is not required by the Web Beans specification. + timeout  though this is not required by the Web Beans specification. The timeout is the period of inactivity before the conversation is destroyed.</para> <para>The <literal>Conversation</literal> object provides a method to set Modified: doc/trunk/reference/es-ES/ee.po =================================================================== --- doc/trunk/reference/es-ES/ee.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/es-ES/ee.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -412,7 +412,7 @@ #, no-c-format msgid "" "Web Beans doesn't define any special deployment archive. You can package Web " -"Beans in JARs, EJB-JARs or WARsany deployment location in the " +"Beans in JARs, EJB-JARs or WARs  any deployment location in the " "application classpath. However, each archive that contains Web Beans must " "include a file named <literal>web-beans.xml</literal> in the <literal>META-" "INF</literal> or <literal>WEB-INF</literal> directory. The file may be " @@ -420,7 +420,7 @@ "xml</literal> file will not be available for use in the application." msgstr "" "Web Beans no define ningún despliegue especial de archivo. Se puede empaquetar Web " -"Beans en JAR, EJB-JAR o WARcualquier ubicación de despliegue en la aplicación classpath. No obstante, cada archivo que contiene Web Beans debe incluir un archivo llamado <literal>web-beans.xml</literal> en <literal>META-INF</literal> o en el directorio <literal>WEB-INF</literal>. El archivo puede estar vacío. Los Web Beans desplegados en archivos que no tienen un archivo <literal>web-beans." +"Beans en JAR, EJB-JAR o WAR  cualquier ubicación de despliegue en la aplicación classpath. No obstante, cada archivo que contiene Web Beans debe incluir un archivo llamado <literal>web-beans.xml</literal> en <literal>META-INF</literal> o en el directorio <literal>WEB-INF</literal>. El archivo puede estar vacío. Los Web Beans desplegados en archivos que no tienen un archivo <literal>web-beans." "xml</literal> no estarán disponibles para uso en la aplicación." #. Tag: para Modified: doc/trunk/reference/es-ES/events.po =================================================================== --- doc/trunk/reference/es-ES/events.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/es-ES/events.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -133,11 +133,11 @@ #: events.xml:48 #, no-c-format msgid "" -"An observer method need not specify any event bindingsin this case it " +"An observer method need not specify any event bindings  in this case it " "is interested in <emphasis>all</emphasis> events of a particular type. If it " "does specify event bindings, it is only interested in events which also have " "those event bindings." -msgstr "Un método de observador no necesita especificar ningún enlace de evento en este caso está interesado en <emphasis>todos</emphasis> los eventos de un tipo determinado. Si no especifica enlaces de eventos, sólo está interesado en eventos que también tienen esos enlaces de eventos." +msgstr "Un método de observador no necesita especificar ningún enlace de evento  en este caso está interesado en <emphasis>todos</emphasis> los eventos de un tipo determinado. Si no especifica enlaces de eventos, sólo está interesado en eventos que también tienen esos enlaces de eventos." #. Tag: para #: events.xml:53 Modified: doc/trunk/reference/es-ES/injection.po =================================================================== --- doc/trunk/reference/es-ES/injection.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/es-ES/injection.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -766,13 +766,13 @@ #, no-c-format msgid "" "If you've been paying attention, you're probably wondering how the Web Bean " -"manager decides which implementation<literal>ExternalPaymentProcessor</" -"literal> or <literal>MockPaymentProcessor</literal>to choose. Consider " +"manager decides which implementation  <literal>ExternalPaymentProcessor</" +"literal> or <literal>MockPaymentProcessor</literal>  to choose. Consider " "what happens when the manager encounters this injection point:" msgstr "" "Si ha prestado atención, probablemente se estará preguntando cómo escoge Web Bean " -"la aplicación<literal>ExternalPaymentProcessor</" -"literal> o <literal>MockPaymentProcessor</literal>. Piense en lo que sucede cuando el administrador encuentra este punto de inyección:" +"la aplicación  <literal>ExternalPaymentProcessor</" +"literal> o <literal>MockPaymentProcessor</literal>  . Piense en lo que sucede cuando el administrador encuentra este punto de inyección:" #. Tag: programlisting #: injection.xml:251 @@ -917,9 +917,9 @@ msgid "" "To fix an <literal>UnsatisfiedDependencyException</literal>, simply provide " "a Web Bean which implements the API type and has the binding types of the " -"injection pointor enable the deployment type of a Web Bean that " +"injection point  or enable the deployment type of a Web Bean that " "already implements the API type and has the binding types." -msgstr "Para corregir una <literal>UnsatisfiedDependencyException</literal>, basta con proporcionar un Web Bean que implemente el tipo API y tenga los tipos de enlace del punto de inyeccióno permita el tipo de despliegue de un Web Bean que ya implemente el tipo API y tenga los tipos de enlace." +msgstr "Para corregir una <literal>UnsatisfiedDependencyException</literal>, basta con proporcionar un Web Bean que implemente el tipo API y tenga los tipos de enlace del punto de inyección  o permita el tipo de despliegue de un Web Bean que ya implemente el tipo API y tenga los tipos de enlace." #. Tag: para #: injection.xml:328 @@ -1111,9 +1111,9 @@ #, no-c-format msgid "" "If the binding type has an annotation member, we can't use an anonymous " -"subclass of <literal>AnnotationLiteral</literal>instead we'll need to " +"subclass of <literal>AnnotationLiteral</literal>  instead we'll need to " "create a named subclass:" -msgstr "Si el tipo de vinculación tiene un miembro de anotación, no podemos utilizar una subclase anónima de <literal>AnnotationLiteral</literal>en su lugar, necesitaremos crear una subclase llamada:" +msgstr "Si el tipo de vinculación tiene un miembro de anotación, no podemos utilizar una subclase anónima de <literal>AnnotationLiteral</literal>  en su lugar, necesitaremos crear una subclase llamada:" #. Tag: programlisting #: injection.xml:413 @@ -1210,11 +1210,11 @@ #: injection.xml:442 #, no-c-format msgid "" -"There are certain kinds of dependent objectsWeb Beans with scope " -"<literal>@Dependent</literal>that need to know something about the " +"There are certain kinds of dependent objects  Web Beans with scope " +"<literal>@Dependent</literal>  that need to know something about the " "object or injection point into which they are injected in order to be able " "to do what they do. For example:" -msgstr "Hay algunas clases de objetoscon ámbito <literal>@Dependent</literal>que necesitan saber algo acerca del objeto o punto de inyección dentro del cual son inyectados para poder hacer lo que hacen. Por ejemplo:" +msgstr "Hay algunas clases de objetos  con ámbito <literal>@Dependent</literal>  que necesitan saber algo acerca del objeto o punto de inyección dentro del cual son inyectados para poder hacer lo que hacen. Por ejemplo:" #. Tag: para #: injection.xml:448 Modified: doc/trunk/reference/es-ES/interceptors.po =================================================================== --- doc/trunk/reference/es-ES/interceptors.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/es-ES/interceptors.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -568,10 +568,10 @@ msgid "" "Well, fortunately, Web Beans works around this missing feature of Java. We " "may annotate one interceptor binding type with other interceptor binding " -"types. The interceptor bindings are transitiveany Web Bean with the " +"types. The interceptor bindings are transitive  any Web Bean with the " "first interceptor binding inherits the interceptor bindings declared as meta-" "annotations." -msgstr "Bueno, afortunadamente, Web Beans funciona en torno a esta característica de Java. Podemos anotar un interceptor de tipo de enlace con otros tipos de interceptores de enlace. Los enlaces de interceptor son transitivoscualquier Web Bean con el primer enlace de interceptor hereda los enlaces de interceptor declarados como meta-anotaciones." +msgstr "Bueno, afortunadamente, Web Beans funciona en torno a esta característica de Java. Podemos anotar un interceptor de tipo de enlace con otros tipos de interceptores de enlace. Los enlaces de interceptor son transitivos  cualquier Web Bean con el primer enlace de interceptor hereda los enlaces de interceptor declarados como meta-anotaciones." #. Tag: programlisting #: interceptors.xml:186 @@ -655,9 +655,9 @@ #: interceptors.xml:212 #, no-c-format msgid "" -"the interceptor ordering is non-globalit is determined by the order in " +"the interceptor ordering is non-global  it is determined by the order in " "which interceptors are listed at the class level." -msgstr "la orden del interceptor es no-globales determinada por la orden en que se listan los interceptores en el nivel de clase." +msgstr "la orden del interceptor es no-global  es determinada por la orden en que se listan los interceptores en el nivel de clase." #. Tag: para #: interceptors.xml:217 Modified: doc/trunk/reference/es-ES/intro.po =================================================================== --- doc/trunk/reference/es-ES/intro.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/es-ES/intro.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -48,11 +48,11 @@ "Furthermore, every EJB 3-style session bean is a Web Bean. Sure, the " "JavaBeans and EJBs you've been writing every day have not been able to take " "advantage of the new services defined by the Web Beans specification, but " -"you'll be able to use every one of them as Web Beansinjecting them " +"you'll be able to use every one of them as Web Beans  injecting them " "into other Web Beans, configuring them via the Web Beans XML configuration " -"facility, even adding interceptors and decorators to themwithout " +"facility, even adding interceptors and decorators to them  without " "touching your existing code." -msgstr "Con determinadas excepciones, muy especiales, toda clase de Java con un constructor que no acepte parámetros es un Web Bean. Esto incluye cada JavaBean. Además, cada sesión estilo EJB 3 es un Web Bean. Por supuesto, los JavaBeans y EJB que usted ha escrito a diario no han podido aprovechar los nuevos servicios definidos por la especificación de Web Beans, pero podrá utilizar cada uno de ellos como Web Beansinyectándolos en otros Web Beans, configurándolos a través de los servicios de configuración, incluso agregándoles interceptores y decoradoressin tocar su código existente." +msgstr "Con determinadas excepciones, muy especiales, toda clase de Java con un constructor que no acepte parámetros es un Web Bean. Esto incluye cada JavaBean. Además, cada sesión estilo EJB 3 es un Web Bean. Por supuesto, los JavaBeans y EJB que usted ha escrito a diario no han podido aprovechar los nuevos servicios definidos por la especificación de Web Beans, pero podrá utilizar cada uno de ellos como Web Beans  inyectándolos en otros Web Beans, configurándolos a través de los servicios de configuración, incluso agregándoles interceptores y decoradores  sin tocar su código existente." #. Tag: para #: intro.xml:25 @@ -245,12 +245,12 @@ "At system initialization time, the Web Bean manager must validate that " "exactly one Web Bean exists which satisfies each injection point. In our " "example, if no implementation of <literal>Translator</literal> " -"availableif the <literal>SentenceTranslator</literal> EJB was not " -"deployedthe Web Bean manager would throw an " +"available  if the <literal>SentenceTranslator</literal> EJB was not " +"deployed  the Web Bean manager would throw an " "<literal>UnsatisfiedDependencyException</literal>. If more than one " "implementation of <literal>Translator</literal> was available, the Web Bean " "manager would throw an <literal>AmbiguousDependencyException</literal>." -msgstr "En el momento de inicialización, el administrador de Web Bean debe confirmar que exista exactamente un Web Bean que complete cada punto de inyección. En nuestro ejemplo, si no estaba disponible ninguna implementación de <literal>Translator</literal> si el EJB de <literal>SentenceTranslator</literal> no estaba desplegadoel administrador de Web Bean produciría una <literal>UnsatisfiedDependencyException</literal>. Si más de una implementación de <literal>Translator</literal> estuviera disponible, el administrador de Web Bean produciría una <literal>AmbiguousDependencyException</literal>." +msgstr "En el momento de inicialización, el administrador de Web Bean debe confirmar que exista exactamente un Web Bean que complete cada punto de inyección. En nuestro ejemplo, si no estaba disponible ninguna implementación de <literal>Translator</literal>  si el EJB de <literal>SentenceTranslator</literal> no estaba desplegado  el administrador de Web Bean produciría una <literal>UnsatisfiedDependencyException</literal>. Si más de una implementación de <literal>Translator</literal> estuviera disponible, el administrador de Web Bean produciría una <literal>AmbiguousDependencyException</literal>." #. Tag: title #: intro.xml:80 @@ -382,11 +382,11 @@ #, no-c-format msgid "" "Note that not all clients of a Web Bean are Web Beans. Other objects such as " -"Servlets or Message-Driven Beanswhich are by nature not injectable, " -"contextual objectsmay also obtain references to Web Beans by injection." +"Servlets or Message-Driven Beans  which are by nature not injectable, " +"contextual objects  may also obtain references to Web Beans by injection." msgstr "" "Observe que todos los clientes de una Web Bean son Web Beans. Otros objetos tales como " -"Servlets o Message-Driven Beanslos cuales son por naturaleza no inyectables, objetos contextualestambién pueden obtener referencias a Web Beans por inyección." +"Servlets o Message-Driven Beans  los cuales son por naturaleza no inyectables, objetos contextuales  también pueden obtener referencias a Web Beans por inyección." #. Tag: para #: intro.xml:149 @@ -765,9 +765,9 @@ #: intro.xml:289 #, no-c-format msgid "" -"In this case, the name defaults to <literal>shoppingCart</literal>the " +"In this case, the name defaults to <literal>shoppingCart</literal>  the " "unqualified class name, with the first character changed to lowercase." -msgstr "En este caso, el nombre predetermina al <literal>shoppingCart</literal>el nombre de clase no calificado, con el primer caracter cambiado a minúsculas." +msgstr "En este caso, el nombre predetermina al <literal>shoppingCart</literal>  el nombre de clase no calificado, con el primer caracter cambiado a minúsculas." #. Tag: title #: intro.xml:295 @@ -919,13 +919,13 @@ msgid "" "The specification says that all EJB 3-style session and singleton beans are " "<emphasis>enterprise</emphasis> Web Beans. Message driven beans are not Web " -"Beanssince they are not intended to be injected into other " -"objectsbut they can take advantage of most of the functionality of Web " +"Beans  since they are not intended to be injected into other " +"objects  but they can take advantage of most of the functionality of Web " "Beans, including dependency injection and interceptors." msgstr "" "La especificación dice que todos los beans de sesión estilo EJB 3- y singleton son " "<emphasis>empresariales</emphasis>. Los mensajes de beans no son Web " -"Beansporque no están diseñados para ser inyectados en otros objetospero pueden aprovechar la mayoría de las funcionalidades de los Web Beans, incluyendo la inyección de dependencia y los interceptores." +"Beans  porque no están diseñados para ser inyectados en otros objetos  pero pueden aprovechar la mayoría de las funcionalidades de los Web Beans, incluyendo la inyección de dependencia y los interceptores." #. Tag: para #: intro.xml:366 Modified: doc/trunk/reference/es-ES/part3.po =================================================================== --- doc/trunk/reference/es-ES/part3.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/es-ES/part3.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -25,8 +25,8 @@ #. Tag: para #: part3.xml:10 #, no-c-format -msgid "You don't see string-based identifiers in Web Beans code, not because the framework is hiding them from you using clever defaulting rulesso-called \"configuration by convention\"but because there are simply no strings there to begin with!" -msgstr "No necesita ver los identificadores de cadena en código de Web Beans, no porque el marco los esté escondiendo del uso inteligente de las reglasllamadas\"configuración por convención\"sino porque simplemente ¡no hay cadenas con qué comenzar!" +msgid "You don't see string-based identifiers in Web Beans code, not because the framework is hiding them from you using clever defaulting rules  so-called \"configuration by convention\"  but because there are simply no strings there to begin with!" +msgstr "No necesita ver los identificadores de cadena en código de Web Beans, no porque el marco los esté escondiendo del uso inteligente de las reglas  llamadas\"configuración por convención\"  sino porque simplemente ¡no hay cadenas con qué comenzar!" #. Tag: para #: part3.xml:15 Modified: doc/trunk/reference/es-ES/scopescontexts.po =================================================================== --- doc/trunk/reference/es-ES/scopescontexts.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/es-ES/scopescontexts.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -473,9 +473,9 @@ "The Web Bean manager is permitted to destroy a conversation and all state " "held in its context at any time in order to preserve resources. A Web Bean " "manager implementation will normally do this on the basis of some kind of " -"timeoutthough this is not required by the Web Beans specification. The " +"timeout  though this is not required by the Web Beans specification. The " "timeout is the period of inactivity before the conversation is destroyed." -msgstr "Con el fin de preservar recursos, el administrador de Web Bean puede destruir una conversación y todo el estado en su contexto en cualquier momento. Una implementación del administrador de Web Bean normalmente hace esto con base en alguna clase de pausaaunque la especificación de Web Beans no lo requiere. La pausa es el periodo de inactividad anterior a la destrucción de la conversación." +msgstr "Con el fin de preservar recursos, el administrador de Web Bean puede destruir una conversación y todo el estado en su contexto en cualquier momento. Una implementación del administrador de Web Bean normalmente hace esto con base en alguna clase de pausa  aunque la especificación de Web Beans no lo requiere. La pausa es el periodo de inactividad anterior a la destrucción de la conversación." #. Tag: para #: scopescontexts.xml:208 Modified: doc/trunk/reference/fr-FR/ee.po =================================================================== --- doc/trunk/reference/fr-FR/ee.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/fr-FR/ee.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -311,7 +311,7 @@ #, no-c-format msgid "" "Web Beans doesn't define any special deployment archive. You can package Web " -"Beans in JARs, EJB-JARs or WARsany deployment location in the " +"Beans in JARs, EJB-JARs or WARs  any deployment location in the " "application classpath. However, each archive that contains Web Beans must " "include a file named <literal>web-beans.xml</literal> in the <literal>META-" "INF</literal> or <literal>WEB-INF</literal> directory. The file may be " Modified: doc/trunk/reference/fr-FR/events.po =================================================================== --- doc/trunk/reference/fr-FR/events.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/fr-FR/events.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -117,7 +117,7 @@ #: events.xml:48 #, no-c-format msgid "" -"An observer method need not specify any event bindingsin this case it " +"An observer method need not specify any event bindings  in this case it " "is interested in <emphasis>all</emphasis> events of a particular type. If it " "does specify event bindings, it is only interested in events which also have " "those event bindings." Modified: doc/trunk/reference/fr-FR/injection.po =================================================================== --- doc/trunk/reference/fr-FR/injection.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/fr-FR/injection.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -653,8 +653,8 @@ #, no-c-format msgid "" "If you've been paying attention, you're probably wondering how the Web Bean " -"manager decides which implementation<literal>ExternalPaymentProcessor</" -"literal> or <literal>MockPaymentProcessor</literal>to choose. Consider " +"manager decides which implementation  <literal>ExternalPaymentProcessor</" +"literal> or <literal>MockPaymentProcessor</literal>  to choose. Consider " "what happens when the manager encounters this injection point:" msgstr "" @@ -794,7 +794,7 @@ msgid "" "To fix an <literal>UnsatisfiedDependencyException</literal>, simply provide " "a Web Bean which implements the API type and has the binding types of the " -"injection pointor enable the deployment type of a Web Bean that " +"injection point  or enable the deployment type of a Web Bean that " "already implements the API type and has the binding types." msgstr "" @@ -973,7 +973,7 @@ #, no-c-format msgid "" "If the binding type has an annotation member, we can't use an anonymous " -"subclass of <literal>AnnotationLiteral</literal>instead we'll need to " +"subclass of <literal>AnnotationLiteral</literal>  instead we'll need to " "create a named subclass:" msgstr "" @@ -1053,8 +1053,8 @@ #: injection.xml:442 #, no-c-format msgid "" -"There are certain kinds of dependent objectsWeb Beans with scope " -"<literal>@Dependent</literal>that need to know something about the " +"There are certain kinds of dependent objects  Web Beans with scope " +"<literal>@Dependent</literal>  that need to know something about the " "object or injection point into which they are injected in order to be able " "to do what they do. For example:" msgstr "" Modified: doc/trunk/reference/fr-FR/interceptors.po =================================================================== --- doc/trunk/reference/fr-FR/interceptors.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/fr-FR/interceptors.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -486,7 +486,7 @@ msgid "" "Well, fortunately, Web Beans works around this missing feature of Java. We " "may annotate one interceptor binding type with other interceptor binding " -"types. The interceptor bindings are transitiveany Web Bean with the " +"types. The interceptor bindings are transitive  any Web Bean with the " "first interceptor binding inherits the interceptor bindings declared as meta-" "annotations." msgstr "" @@ -560,7 +560,7 @@ #: interceptors.xml:212 #, no-c-format msgid "" -"the interceptor ordering is non-globalit is determined by the order in " +"the interceptor ordering is non-global  it is determined by the order in " "which interceptors are listed at the class level." msgstr "" Modified: doc/trunk/reference/fr-FR/intro.po =================================================================== --- doc/trunk/reference/fr-FR/intro.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/fr-FR/intro.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -45,9 +45,9 @@ "Furthermore, every EJB 3-style session bean is a Web Bean. Sure, the " "JavaBeans and EJBs you've been writing every day have not been able to take " "advantage of the new services defined by the Web Beans specification, but " -"you'll be able to use every one of them as Web Beansinjecting them " +"you'll be able to use every one of them as Web Beans  injecting them " "into other Web Beans, configuring them via the Web Beans XML configuration " -"facility, even adding interceptors and decorators to themwithout " +"facility, even adding interceptors and decorators to them  without " "touching your existing code." msgstr "" @@ -202,8 +202,8 @@ "At system initialization time, the Web Bean manager must validate that " "exactly one Web Bean exists which satisfies each injection point. In our " "example, if no implementation of <literal>Translator</literal> " -"availableif the <literal>SentenceTranslator</literal> EJB was not " -"deployedthe Web Bean manager would throw an " +"available  if the <literal>SentenceTranslator</literal> EJB was not " +"deployed  the Web Bean manager would throw an " "<literal>UnsatisfiedDependencyException</literal>. If more than one " "implementation of <literal>Translator</literal> was available, the Web Bean " "manager would throw an <literal>AmbiguousDependencyException</literal>." @@ -330,8 +330,8 @@ #, no-c-format msgid "" "Note that not all clients of a Web Bean are Web Beans. Other objects such as " -"Servlets or Message-Driven Beanswhich are by nature not injectable, " -"contextual objectsmay also obtain references to Web Beans by injection." +"Servlets or Message-Driven Beans  which are by nature not injectable, " +"contextual objects  may also obtain references to Web Beans by injection." msgstr "" #. Tag: para @@ -681,7 +681,7 @@ #: intro.xml:289 #, no-c-format msgid "" -"In this case, the name defaults to <literal>shoppingCart</literal>the " +"In this case, the name defaults to <literal>shoppingCart</literal>  the " "unqualified class name, with the first character changed to lowercase." msgstr "" @@ -825,8 +825,8 @@ msgid "" "The specification says that all EJB 3-style session and singleton beans are " "<emphasis>enterprise</emphasis> Web Beans. Message driven beans are not Web " -"Beanssince they are not intended to be injected into other " -"objectsbut they can take advantage of most of the functionality of Web " +"Beans  since they are not intended to be injected into other " +"objects  but they can take advantage of most of the functionality of Web " "Beans, including dependency injection and interceptors." msgstr "" Modified: doc/trunk/reference/fr-FR/part3.po =================================================================== --- doc/trunk/reference/fr-FR/part3.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/fr-FR/part3.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -28,8 +28,8 @@ #, no-c-format msgid "" "You don't see string-based identifiers in Web Beans code, not because the " -"framework is hiding them from you using clever defaulting rulesso-" -"called \"configuration by convention\"but because there are simply no " +"framework is hiding them from you using clever defaulting rules  so-" +"called \"configuration by convention\"  but because there are simply no " "strings there to begin with!" msgstr "" Modified: doc/trunk/reference/fr-FR/scopescontexts.po =================================================================== --- doc/trunk/reference/fr-FR/scopescontexts.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/fr-FR/scopescontexts.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -421,7 +421,7 @@ "The Web Bean manager is permitted to destroy a conversation and all state " "held in its context at any time in order to preserve resources. A Web Bean " "manager implementation will normally do this on the basis of some kind of " -"timeoutthough this is not required by the Web Beans specification. The " +"timeout  though this is not required by the Web Beans specification. The " "timeout is the period of inactivity before the conversation is destroyed." msgstr "" Modified: doc/trunk/reference/it-IT/ee.po =================================================================== --- doc/trunk/reference/it-IT/ee.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/it-IT/ee.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -329,8 +329,8 @@ #. Tag: para #: ee.xml:108 #, no-c-format -msgid "Web Beans doesn't define any special deployment archive. You can package Web Beans in JARs, EJB-JARs or WARsany deployment location in the application classpath. However, each archive that contains Web Beans must include a file named <literal>web-beans.xml</literal> in the <literal>META-INF</literal> or <literal>WEB-INF</literal> directory. The file may be empty. Web Beans deployed in archives that do not have a <literal>web-beans.xml</literal> file will not be available for use in the application." -msgstr "Web Beans non definisce nessuno archivio speciale per il deploy. Si può impacchettare i Web Beans in JAR, EJB-JAR o WARqualsiasi locazione di deploy nel classpath dell'applicazione. Comunque ciascun archivio che contiene Web Beans devi includere un file chiamato <literal>web-beans.xml</literal> nella directory <literal>META-INF</literal> o <literal>WEB-INF</literal>. Il file può essere vuoto. I Web Beans collocati negli archivi che non hanno un file <literal>web-beans.xml</literal> non saranno disponibili per l'uso nell'applicazione." +msgid "Web Beans doesn't define any special deployment archive. You can package Web Beans in JARs, EJB-JARs or WARs  any deployment location in the application classpath. However, each archive that contains Web Beans must include a file named <literal>web-beans.xml</literal> in the <literal>META-INF</literal> or <literal>WEB-INF</literal> directory. The file may be empty. Web Beans deployed in archives that do not have a <literal>web-beans.xml</literal> file will not be available for use in the application." +msgstr "Web Beans non definisce nessuno archivio speciale per il deploy. Si può impacchettare i Web Beans in JAR, EJB-JAR o WAR  qualsiasi locazione di deploy nel classpath dell'applicazione. Comunque ciascun archivio che contiene Web Beans devi includere un file chiamato <literal>web-beans.xml</literal> nella directory <literal>META-INF</literal> o <literal>WEB-INF</literal>. Il file può essere vuoto. I Web Beans collocati negli archivi che non hanno un file <literal>web-beans.xml</literal> non saranno disponibili per l'uso nell'applicazione." #. Tag: para #: ee.xml:116 Modified: doc/trunk/reference/it-IT/events.po =================================================================== --- doc/trunk/reference/it-IT/events.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/it-IT/events.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -97,8 +97,8 @@ #. Tag: para #: events.xml:48 #, no-c-format -msgid "An observer method need not specify any event bindingsin this case it is interested in <emphasis>all</emphasis> events of a particular type. If it does specify event bindings, it is only interested in events which also have those event bindings." -msgstr "Un metodo osservatore non ha bisogno di specificare alcun binding di eventoin questo caso è interessato a <emphasis>tutti</emphasis> gli eventi di un particolare tipo. Se specifica dei binding di evento, è solamente interessato agli eventi che hanno anche gli stessi binding di evento." +msgid "An observer method need not specify any event bindings  in this case it is interested in <emphasis>all</emphasis> events of a particular type. If it does specify event bindings, it is only interested in events which also have those event bindings." +msgstr "Un metodo osservatore non ha bisogno di specificare alcun binding di evento  in questo caso è interessato a <emphasis>tutti</emphasis> gli eventi di un particolare tipo. Se specifica dei binding di evento, è solamente interessato agli eventi che hanno anche gli stessi binding di evento." #. Tag: para #: events.xml:53 Modified: doc/trunk/reference/it-IT/injection.po =================================================================== --- doc/trunk/reference/it-IT/injection.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/it-IT/injection.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -6,7 +6,7 @@ "Project-Id-Version: master.xml\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2008-12-19 20:26+0000\n" -"PO-Revision-Date: 2009-01-06 15:50+0100\n" +"PO-Revision-Date: 2009-01-20 21:28+0100\n" "Last-Translator: Nicola Benaglia <nico.benaz(a)gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -673,7 +673,7 @@ #: injection.xml:246 #, no-c-format msgid "If you've been paying attention, you're probably wondering how the Web Bean manager decides which implementation<literal>ExternalPaymentProcessor</literal> or <literal>MockPaymentProcessor</literal>to choose. Consider what happens when the manager encounters this injection point:" -msgstr "Se avete prestato attenzione, vi state probabilmente chiedendo come il manager Web Bean decida quale implementatione<literal>ExternalPaymentProcessor</literal> o <literal>MockPaymentProcessor</literal>scegliere. Si consideri cosa succede quando il manager incontra questo punto di iniezione:" +msgstr "Se avete prestato attenzione, vi state probabilmente chiedendo come il manager Web Bean decida quale implementazione  <literal>ExternalPaymentProcessor</literal> o <literal>MockPaymentProcessor</literal>  scegliere. Si consideri cosa succede quando il manager incontra questo punto di iniezione:" #. Tag: programlisting #: injection.xml:251 Modified: doc/trunk/reference/it-IT/interceptors.po =================================================================== --- doc/trunk/reference/it-IT/interceptors.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/it-IT/interceptors.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -502,8 +502,8 @@ #. Tag: para #: interceptors.xml:181 #, no-c-format -msgid "Well, fortunately, Web Beans works around this missing feature of Java. We may annotate one interceptor binding type with other interceptor binding types. The interceptor bindings are transitiveany Web Bean with the first interceptor binding inherits the interceptor bindings declared as meta-annotations." -msgstr "Fortunatamente Web Beans provvede a questa mancanza di Java. E' possibile annotare un tipo di interceptor binding con altri tipi di interceptor binding. Gli interceptor binding sono transitiviqualsiasi Web Bean con il primo interceptor binding eredita gli interceptor binding dichiarati come meta-annotazioni." +msgid "Well, fortunately, Web Beans works around this missing feature of Java. We may annotate one interceptor binding type with other interceptor binding types. The interceptor bindings are transitive  any Web Bean with the first interceptor binding inherits the interceptor bindings declared as meta-annotations." +msgstr "Fortunatamente Web Beans provvede a questa mancanza di Java. E' possibile annotare un tipo di interceptor binding con altri tipi di interceptor binding. Gli interceptor binding sono transitivi  qualsiasi Web Bean con il primo interceptor binding eredita gli interceptor binding dichiarati come meta-annotazioni." #. Tag: programlisting #: interceptors.xml:186 @@ -574,8 +574,8 @@ #. Tag: para #: interceptors.xml:212 #, no-c-format -msgid "the interceptor ordering is non-globalit is determined by the order in which interceptors are listed at the class level." -msgstr "l'ordinamento degli interceptor è non-globaleè determinata dall'ordine in cui gli interceptor sono elencati al livello di classe." +msgid "the interceptor ordering is non-global  it is determined by the order in which interceptors are listed at the class level." +msgstr "l'ordinamento degli interceptor è non-globale  è determinata dall'ordine in cui gli interceptor sono elencati al livello di classe." #. Tag: para #: interceptors.xml:217 Modified: doc/trunk/reference/it-IT/intro.po =================================================================== --- doc/trunk/reference/it-IT/intro.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/it-IT/intro.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -35,8 +35,8 @@ #. Tag: para #: intro.xml:15 #, no-c-format -msgid "With certain, very special exceptions, every Java class with a constructor that accepts no parameters is a Web Bean. That includes every JavaBean. Furthermore, every EJB 3-style session bean is a Web Bean. Sure, the JavaBeans and EJBs you've been writing every day have not been able to take advantage of the new services defined by the Web Beans specification, but you'll be able to use every one of them as Web Beansinjecting them into other Web Beans, configuring them via the Web Beans XML configuration facility, even adding interceptors and decorators to themwithout touching your existing code." -msgstr "Con alcune eccezioni molto particolari, ogni classe Java con un costruttore che non accetta parametri è un Web Bean. Questo include ogni JavaBean. Inoltre, ogni session bean di stile EJB3 è un Web Bean. Sicuramente i JavaBean e gli EJB3 che si sono sempre scritti non erano in grado di sfruttare i nuovi servizi definiti dalla specifica Web Beans, ma si sarà presto in grado di usare ciascuno di essi come Web Beaniniettandoli in altri Web Beans, configurandoli tramite strumenti di configurazione XML Web Bean, e perfino aggiungendo a loro interceptor e decoratorisenza toccare il codice esistente." +msgid "With certain, very special exceptions, every Java class with a constructor that accepts no parameters is a Web Bean. That includes every JavaBean. Furthermore, every EJB 3-style session bean is a Web Bean. Sure, the JavaBeans and EJBs you've been writing every day have not been able to take advantage of the new services defined by the Web Beans specification, but you'll be able to use every one of them as Web Beans  injecting them into other Web Beans, configuring them via the Web Beans XML configuration facility, even adding interceptors and decorators to them  without touching your existing code." +msgstr "Con alcune eccezioni molto particolari, ogni classe Java con un costruttore che non accetta parametri è un Web Bean. Questo include ogni JavaBean. Inoltre, ogni session bean di stile EJB3 è un Web Bean. Sicuramente i JavaBean e gli EJB3 che si sono sempre scritti non erano in grado di sfruttare i nuovi servizi definiti dalla specifica Web Beans, ma si sarà presto in grado di usare ciascuno di essi come Web Bean  iniettandoli in altri Web Beans, configurandoli tramite strumenti di configurazione XML Web Bean, e perfino aggiungendo a loro interceptor e decoratori  senza toccare il codice esistente." #. Tag: para #: intro.xml:25 @@ -195,8 +195,8 @@ #. Tag: para #: intro.xml:68 #, no-c-format -msgid "At system initialization time, the Web Bean manager must validate that exactly one Web Bean exists which satisfies each injection point. In our example, if no implementation of <literal>Translator</literal> availableif the <literal>SentenceTranslator</literal> EJB was not deployedthe Web Bean manager would throw an <literal>UnsatisfiedDependencyException</literal>. If more than one implementation of <literal>Translator</literal> was available, the Web Bean manager would throw an <literal>AmbiguousDependencyException</literal>." -msgstr "In fase di inizializzazione del sistema, il manager Web Bean deve convalidare che esattamente un solo Web Bean esista e soddisfi ciascun punto di iniezione. Nell'esempio, se nessuna implementazione di <literal>Translator</literal> fosse disponibilese l'EJB <literal>SentenceTranslator</literal> non venisse deployatoil manager Web Bean lancerebbe una <literal>UnsatisfiedDependencyException</literal>. Se più di un'implementazione di <literal>Translator</literal> fosse disponibile, il manager Web Bean lancerebbe una <literal>AmbiguousDependencyException</literal>." +msgid "At system initialization time, the Web Bean manager must validate that exactly one Web Bean exists which satisfies each injection point. In our example, if no implementation of <literal>Translator</literal> available  if the <literal>SentenceTranslator</literal> EJB was not deployed  the Web Bean manager would throw an <literal>UnsatisfiedDependencyException</literal>. If more than one implementation of <literal>Translator</literal> was available, the Web Bean manager would throw an <literal>AmbiguousDependencyException</literal>." +msgstr "In fase di inizializzazione del sistema, il manager Web Bean deve convalidare che esattamente un solo Web Bean esista e soddisfi ciascun punto di iniezione. Nell'esempio, se nessuna implementazione di <literal>Translator</literal> fosse disponibile  se l'EJB <literal>SentenceTranslator</literal> non venisse deployato  il manager Web Bean lancerebbe una <literal>UnsatisfiedDependencyException</literal>. Se più di un'implementazione di <literal>Translator</literal> fosse disponibile, il manager Web Bean lancerebbe una <literal>AmbiguousDependencyException</literal>." #. Tag: title #: intro.xml:80 @@ -279,8 +279,8 @@ #. Tag: para #: intro.xml:145 #, no-c-format -msgid "Note that not all clients of a Web Bean are Web Beans. Other objects such as Servlets or Message-Driven Beanswhich are by nature not injectable, contextual objectsmay also obtain references to Web Beans by injection." -msgstr "Si noti che non tutti i client dei un Web Bean sono Web Bean. Altri oggetti come Servlet o Message-Driven Beansche sono per natura non iniettabili, oggetti contestualipossono pure ottenere riferimenti a Web Bean tramite iniezione." +msgid "Note that not all clients of a Web Bean are Web Beans. Other objects such as Servlets or Message-Driven Beans  which are by nature not injectable, contextual objects  may also obtain references to Web Beans by injection." +msgstr "Si noti che non tutti i client dei un Web Bean sono Web Bean. Altri oggetti come Servlet o Message-Driven Beans  che sono per natura non iniettabili, oggetti contestuali  possono pure ottenere riferimenti a Web Bean tramite iniezione." # Tolto "Enough hand-waving." #. Tag: para @@ -588,8 +588,8 @@ #. Tag: para #: intro.xml:289 #, no-c-format -msgid "In this case, the name defaults to <literal>shoppingCart</literal>the unqualified class name, with the first character changed to lowercase." -msgstr "In questo caso il nome di default è <literal>shoppingCart</literal>il nome della classe non qualificata, con il primo carattere messo in minuscolo." +msgid "In this case, the name defaults to <literal>shoppingCart</literal>  the unqualified class name, with the first character changed to lowercase." +msgstr "In questo caso il nome di default è <literal>shoppingCart</literal>  il nome della classe non qualificata, con il primo carattere messo in minuscolo." #. Tag: title #: intro.xml:295 @@ -713,8 +713,8 @@ #. Tag: para #: intro.xml:360 #, no-c-format -msgid "The specification says that all EJB 3-style session and singleton beans are <emphasis>enterprise</emphasis> Web Beans. Message driven beans are not Web Beanssince they are not intended to be injected into other objectsbut they can take advantage of most of the functionality of Web Beans, including dependency injection and interceptors." -msgstr "La specifica dice che tutti i bean di sessione stile EJB3 e quelli singleton sono Web Bean <emphasis>enterprise</emphasis>. I bean message driven non sono Web Beanpoiché non sono intesi per essere iniettati in altri oggettima possono sfruttare la maggior parte della funzionalità dei Web Bean, inclusi dependency injection e interceptor." +msgid "The specification says that all EJB 3-style session and singleton beans are <emphasis>enterprise</emphasis> Web Beans. Message driven beans are not Web Beans  since they are not intended to be injected into other objects  but they can take advantage of most of the functionality of Web Beans, including dependency injection and interceptors." +msgstr "La specifica dice che tutti i bean di sessione stile EJB3 e quelli singleton sono Web Bean <emphasis>enterprise</emphasis>. I bean message driven non sono Web Bean  poiché non sono intesi per essere iniettati in altri oggetti  ma possono sfruttare la maggior parte della funzionalità dei Web Bean, inclusi dependency injection e interceptor." # bean class local view = ? #. Tag: para Modified: doc/trunk/reference/it-IT/part3.po =================================================================== --- doc/trunk/reference/it-IT/part3.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/it-IT/part3.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -23,8 +23,8 @@ #. Tag: para #: part3.xml:10 #, no-c-format -msgid "You don't see string-based identifiers in Web Beans code, not because the framework is hiding them from you using clever defaulting rulesso-called \"configuration by convention\"but because there are simply no strings there to begin with!" -msgstr "Non si vedono identificatori di tipo stringa nel codice basato su Web Beans, non perché il framework li nasconde usando regole intelligenti nell'assegnamento dei valori di defaultla cosiddetta \"configurazione per convenzione (configuration by convention)\"ma semplicemente perché non ci sono stringhe, tanto per cominciare!" +msgid "You don't see string-based identifiers in Web Beans code, not because the framework is hiding them from you using clever defaulting rules  so-called \"configuration by convention\"  but because there are simply no strings there to begin with!" +msgstr "Non si vedono identificatori di tipo stringa nel codice basato su Web Beans, non perché il framework li nasconde usando regole intelligenti nell'assegnamento dei valori di default  la cosiddetta \"configurazione per convenzione (configuration by convention)\"  ma semplicemente perché non ci sono stringhe, tanto per cominciare!" # senza che sia necessario realizzare dei tools appositi #. Tag: para Modified: doc/trunk/reference/it-IT/scopescontexts.po =================================================================== --- doc/trunk/reference/it-IT/scopescontexts.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/it-IT/scopescontexts.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -382,8 +382,8 @@ #. Tag: para #: scopescontexts.xml:202 #, no-c-format -msgid "The Web Bean manager is permitted to destroy a conversation and all state held in its context at any time in order to preserve resources. A Web Bean manager implementation will normally do this on the basis of some kind of timeoutthough this is not required by the Web Beans specification. The timeout is the period of inactivity before the conversation is destroyed." -msgstr "Al manager Web Bean è permesso di distruggere una conversazione e tutto lo stato mantenuto nel contesto in qualsiasi momento al fine di preservare le risorse. Un'implementazione di un manager Web Bean eseguirà questo sulla base di un qualche timeoutsebbene non sia richiesto dalla specifica Web Beans. Il timeout è il periodo di inattività prima che la conversazione venga distrutta." +msgid "The Web Bean manager is permitted to destroy a conversation and all state held in its context at any time in order to preserve resources. A Web Bean manager implementation will normally do this on the basis of some kind of timeout  though this is not required by the Web Beans specification. The timeout is the period of inactivity before the conversation is destroyed." +msgstr "Al manager Web Bean è permesso di distruggere una conversazione e tutto lo stato mantenuto nel contesto in qualsiasi momento al fine di preservare le risorse. Un'implementazione di un manager Web Bean eseguirà questo sulla base di un qualche timeout  sebbene non sia richiesto dalla specifica Web Beans. Il timeout è il periodo di inattività prima che la conversazione venga distrutta." #. Tag: para #: scopescontexts.xml:208 Modified: doc/trunk/reference/ja-JP/ee.po =================================================================== --- doc/trunk/reference/ja-JP/ee.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ja-JP/ee.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -311,7 +311,7 @@ #, no-c-format msgid "" "Web Beans doesn't define any special deployment archive. You can package Web " -"Beans in JARs, EJB-JARs or WARsany deployment location in the " +"Beans in JARs, EJB-JARs or WARs  any deployment location in the " "application classpath. However, each archive that contains Web Beans must " "include a file named <literal>web-beans.xml</literal> in the <literal>META-" "INF</literal> or <literal>WEB-INF</literal> directory. The file may be " Modified: doc/trunk/reference/ja-JP/events.po =================================================================== --- doc/trunk/reference/ja-JP/events.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ja-JP/events.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -117,7 +117,7 @@ #: events.xml:48 #, no-c-format msgid "" -"An observer method need not specify any event bindingsin this case it " +"An observer method need not specify any event bindings  in this case it " "is interested in <emphasis>all</emphasis> events of a particular type. If it " "does specify event bindings, it is only interested in events which also have " "those event bindings." Modified: doc/trunk/reference/ja-JP/injection.po =================================================================== --- doc/trunk/reference/ja-JP/injection.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ja-JP/injection.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -653,8 +653,8 @@ #, no-c-format msgid "" "If you've been paying attention, you're probably wondering how the Web Bean " -"manager decides which implementation<literal>ExternalPaymentProcessor</" -"literal> or <literal>MockPaymentProcessor</literal>to choose. Consider " +"manager decides which implementation  <literal>ExternalPaymentProcessor</" +"literal> or <literal>MockPaymentProcessor</literal>  to choose. Consider " "what happens when the manager encounters this injection point:" msgstr "" @@ -794,7 +794,7 @@ msgid "" "To fix an <literal>UnsatisfiedDependencyException</literal>, simply provide " "a Web Bean which implements the API type and has the binding types of the " -"injection pointor enable the deployment type of a Web Bean that " +"injection point  or enable the deployment type of a Web Bean that " "already implements the API type and has the binding types." msgstr "" @@ -973,7 +973,7 @@ #, no-c-format msgid "" "If the binding type has an annotation member, we can't use an anonymous " -"subclass of <literal>AnnotationLiteral</literal>instead we'll need to " +"subclass of <literal>AnnotationLiteral</literal>  instead we'll need to " "create a named subclass:" msgstr "" @@ -1053,8 +1053,8 @@ #: injection.xml:442 #, no-c-format msgid "" -"There are certain kinds of dependent objectsWeb Beans with scope " -"<literal>@Dependent</literal>that need to know something about the " +"There are certain kinds of dependent objects  Web Beans with scope " +"<literal>@Dependent</literal>  that need to know something about the " "object or injection point into which they are injected in order to be able " "to do what they do. For example:" msgstr "" Modified: doc/trunk/reference/ja-JP/interceptors.po =================================================================== --- doc/trunk/reference/ja-JP/interceptors.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ja-JP/interceptors.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -486,7 +486,7 @@ msgid "" "Well, fortunately, Web Beans works around this missing feature of Java. We " "may annotate one interceptor binding type with other interceptor binding " -"types. The interceptor bindings are transitiveany Web Bean with the " +"types. The interceptor bindings are transitive  any Web Bean with the " "first interceptor binding inherits the interceptor bindings declared as meta-" "annotations." msgstr "" @@ -560,7 +560,7 @@ #: interceptors.xml:212 #, no-c-format msgid "" -"the interceptor ordering is non-globalit is determined by the order in " +"the interceptor ordering is non-global  it is determined by the order in " "which interceptors are listed at the class level." msgstr "" Modified: doc/trunk/reference/ja-JP/intro.po =================================================================== --- doc/trunk/reference/ja-JP/intro.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ja-JP/intro.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -45,9 +45,9 @@ "Furthermore, every EJB 3-style session bean is a Web Bean. Sure, the " "JavaBeans and EJBs you've been writing every day have not been able to take " "advantage of the new services defined by the Web Beans specification, but " -"you'll be able to use every one of them as Web Beansinjecting them " +"you'll be able to use every one of them as Web Beans  injecting them " "into other Web Beans, configuring them via the Web Beans XML configuration " -"facility, even adding interceptors and decorators to themwithout " +"facility, even adding interceptors and decorators to them  without " "touching your existing code." msgstr "" @@ -202,8 +202,8 @@ "At system initialization time, the Web Bean manager must validate that " "exactly one Web Bean exists which satisfies each injection point. In our " "example, if no implementation of <literal>Translator</literal> " -"availableif the <literal>SentenceTranslator</literal> EJB was not " -"deployedthe Web Bean manager would throw an " +"available  if the <literal>SentenceTranslator</literal> EJB was not " +"deployed  the Web Bean manager would throw an " "<literal>UnsatisfiedDependencyException</literal>. If more than one " "implementation of <literal>Translator</literal> was available, the Web Bean " "manager would throw an <literal>AmbiguousDependencyException</literal>." @@ -330,8 +330,8 @@ #, no-c-format msgid "" "Note that not all clients of a Web Bean are Web Beans. Other objects such as " -"Servlets or Message-Driven Beanswhich are by nature not injectable, " -"contextual objectsmay also obtain references to Web Beans by injection." +"Servlets or Message-Driven Beans  which are by nature not injectable, " +"contextual objects  may also obtain references to Web Beans by injection." msgstr "" #. Tag: para @@ -681,7 +681,7 @@ #: intro.xml:289 #, no-c-format msgid "" -"In this case, the name defaults to <literal>shoppingCart</literal>the " +"In this case, the name defaults to <literal>shoppingCart</literal>  the " "unqualified class name, with the first character changed to lowercase." msgstr "" @@ -825,8 +825,8 @@ msgid "" "The specification says that all EJB 3-style session and singleton beans are " "<emphasis>enterprise</emphasis> Web Beans. Message driven beans are not Web " -"Beanssince they are not intended to be injected into other " -"objectsbut they can take advantage of most of the functionality of Web " +"Beans  since they are not intended to be injected into other " +"objects  but they can take advantage of most of the functionality of Web " "Beans, including dependency injection and interceptors." msgstr "" Modified: doc/trunk/reference/ja-JP/part3.po =================================================================== --- doc/trunk/reference/ja-JP/part3.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ja-JP/part3.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -28,8 +28,8 @@ #, no-c-format msgid "" "You don't see string-based identifiers in Web Beans code, not because the " -"framework is hiding them from you using clever defaulting rulesso-" -"called \"configuration by convention\"but because there are simply no " +"framework is hiding them from you using clever defaulting rules  so-" +"called \"configuration by convention\"  but because there are simply no " "strings there to begin with!" msgstr "" Modified: doc/trunk/reference/ja-JP/scopescontexts.po =================================================================== --- doc/trunk/reference/ja-JP/scopescontexts.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ja-JP/scopescontexts.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -421,7 +421,7 @@ "The Web Bean manager is permitted to destroy a conversation and all state " "held in its context at any time in order to preserve resources. A Web Bean " "manager implementation will normally do this on the basis of some kind of " -"timeoutthough this is not required by the Web Beans specification. The " +"timeout  though this is not required by the Web Beans specification. The " "timeout is the period of inactivity before the conversation is destroyed." msgstr "" Modified: doc/trunk/reference/ko-KR/ee.po =================================================================== --- doc/trunk/reference/ko-KR/ee.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ko-KR/ee.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -407,14 +407,14 @@ #, no-c-format msgid "" "Web Beans doesn't define any special deployment archive. You can package Web " -"Beans in JARs, EJB-JARs or WARsany deployment location in the " +"Beans in JARs, EJB-JARs or WARs  any deployment location in the " "application classpath. However, each archive that contains Web Beans must " "include a file named <literal>web-beans.xml</literal> in the <literal>META-" "INF</literal> or <literal>WEB-INF</literal> directory. The file may be " "empty. Web Beans deployed in archives that do not have a <literal>web-beans." "xml</literal> file will not be available for use in the application." msgstr "" -"Web Beans는 특정 배포 아카이브를 지정하지 않습니다. JAR, EJB-JAR 또는 WAR에 있는 Web Beans  애플리케이션 classpath에 있는 배포 위치를 패키지화할 수 있습니다. 하지만 Web Beans이 있는 각각의 아카이브에는 <literal>META-INF</literal> 또는 <literal>WEB-INF</literal> 디렉토리에 있는 <literal>web-beans.xml</literal>라는 파일이 들어 있어야 합니다. 파일은 비어 있을 수 도 있습니다. <literal>web-beans." +"Web Beans는 특정 배포 아카이브를 지정하지 않습니다. JAR, EJB-JAR 또는 WAR에 있는 Web Beans  애플리케이션 classpath에 있는 배포 위치를 패키지화할 수 있습니다. 하지만 Web Beans이 있는 각각의 아카이브에는 <literal>META-INF</literal> 또는 <literal>WEB-INF</literal> 디렉토리에 있는 <literal>web-beans.xml</literal>라는 파일이 들어 있어야 합니다. 파일은 비어 있을 수 도 있습니다. <literal>web-beans." "xml</literal> 파일이 없는 아카이브에 배포된 Web Beans는 애플리케이션에서 사용할 수 없습니다. " #. Tag: para Modified: doc/trunk/reference/ko-KR/events.po =================================================================== --- doc/trunk/reference/ko-KR/events.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ko-KR/events.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -138,11 +138,11 @@ #: events.xml:48 #, no-c-format msgid "" -"An observer method need not specify any event bindingsin this case it " +"An observer method need not specify any event bindings  in this case it " "is interested in <emphasis>all</emphasis> events of a particular type. If it " "does specify event bindings, it is only interested in events which also have " "those event bindings." -msgstr "옵저버 방식은 어떤 이벤트 바인딩도 지정할 필요가 없습니다이러한 경우 특정 유형의 <emphasis>모든</emphasis> 이벤트에 관심을 갖게 됩니다. 이벤트 바인딩을 지정하지 않을 경우, 이러한 이벤트 바인딩이 있는 이벤트에만 관심을 갖게 됩니다. " +msgstr "옵저버 방식은 어떤 이벤트 바인딩도 지정할 필요가 없습니다  이러한 경우 특정 유형의 <emphasis>모든</emphasis> 이벤트에 관심을 갖게 됩니다. 이벤트 바인딩을 지정하지 않을 경우, 이러한 이벤트 바인딩이 있는 이벤트에만 관심을 갖게 됩니다. " #. Tag: para #: events.xml:53 Modified: doc/trunk/reference/ko-KR/injection.po =================================================================== --- doc/trunk/reference/ko-KR/injection.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ko-KR/injection.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -766,8 +766,8 @@ #, no-c-format msgid "" "If you've been paying attention, you're probably wondering how the Web Bean " -"manager decides which implementation<literal>ExternalPaymentProcessor</" -"literal> or <literal>MockPaymentProcessor</literal>to choose. Consider " +"manager decides which implementation  <literal>ExternalPaymentProcessor</" +"literal> or <literal>MockPaymentProcessor</literal>  to choose. Consider " "what happens when the manager encounters this injection point:" msgstr "" @@ -906,7 +906,7 @@ msgid "" "To fix an <literal>UnsatisfiedDependencyException</literal>, simply provide " "a Web Bean which implements the API type and has the binding types of the " -"injection pointor enable the deployment type of a Web Bean that " +"injection point  or enable the deployment type of a Web Bean that " "already implements the API type and has the binding types." msgstr "" @@ -1091,7 +1091,7 @@ #, no-c-format msgid "" "If the binding type has an annotation member, we can't use an anonymous " -"subclass of <literal>AnnotationLiteral</literal>instead we'll need to " +"subclass of <literal>AnnotationLiteral</literal>  instead we'll need to " "create a named subclass:" msgstr "" @@ -1180,8 +1180,8 @@ #: injection.xml:442 #, no-c-format msgid "" -"There are certain kinds of dependent objectsWeb Beans with scope " -"<literal>@Dependent</literal>that need to know something about the " +"There are certain kinds of dependent objects  Web Beans with scope " +"<literal>@Dependent</literal>  that need to know something about the " "object or injection point into which they are injected in order to be able " "to do what they do. For example:" msgstr "" Modified: doc/trunk/reference/ko-KR/interceptors.po =================================================================== --- doc/trunk/reference/ko-KR/interceptors.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ko-KR/interceptors.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -569,10 +569,10 @@ msgid "" "Well, fortunately, Web Beans works around this missing feature of Java. We " "may annotate one interceptor binding type with other interceptor binding " -"types. The interceptor bindings are transitiveany Web Bean with the " +"types. The interceptor bindings are transitive  any Web Bean with the " "first interceptor binding inherits the interceptor bindings declared as meta-" "annotations." -msgstr "다행히도 Web Beans는 이러한 생략된 Java의 기능을 해결하여 하나의 인터셉터 바인딩 유형을 다른 인터셉터 바인딩 유형과 어노테이션할 수 있습니다. 인터셉터 바인딩은 트렌젝션 가능하여  첫번째 인터셉터 바인딩이 있는 Web Bean은 메타 어노테이션으로 명시된 인터셉터 바인딩을 상속할 수 있습니다. " +msgstr "다행히도 Web Beans는 이러한 생략된 Java의 기능을 해결하여 하나의 인터셉터 바인딩 유형을 다른 인터셉터 바인딩 유형과 어노테이션할 수 있습니다. 인터셉터 바인딩은 트렌젝션 가능하여  첫번째 인터셉터 바인딩이 있는 Web Bean은 메타 어노테이션으로 명시된 인터셉터 바인딩을 상속할 수 있습니다. " #. Tag: programlisting #: interceptors.xml:186 @@ -653,9 +653,9 @@ #: interceptors.xml:212 #, no-c-format msgid "" -"the interceptor ordering is non-globalit is determined by the order in " +"the interceptor ordering is non-global  it is determined by the order in " "which interceptors are listed at the class level." -msgstr "인터셉터 순서는 비전역적입니다이는 클래스 레벨로 열거된 인터셉터 순서에 의해 결정됩니다. " +msgstr "인터셉터 순서는 비전역적입니다  이는 클래스 레벨로 열거된 인터셉터 순서에 의해 결정됩니다. " #. Tag: para #: interceptors.xml:217 Modified: doc/trunk/reference/ko-KR/intro.po =================================================================== --- doc/trunk/reference/ko-KR/intro.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ko-KR/intro.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -53,9 +53,9 @@ "Furthermore, every EJB 3-style session bean is a Web Bean. Sure, the " "JavaBeans and EJBs you've been writing every day have not been able to take " "advantage of the new services defined by the Web Beans specification, but " -"you'll be able to use every one of them as Web Beansinjecting them " +"you'll be able to use every one of them as Web Beans  injecting them " "into other Web Beans, configuring them via the Web Beans XML configuration " -"facility, even adding interceptors and decorators to themwithout " +"facility, even adding interceptors and decorators to them  without " "touching your existing code." msgstr "" @@ -248,8 +248,8 @@ "At system initialization time, the Web Bean manager must validate that " "exactly one Web Bean exists which satisfies each injection point. In our " "example, if no implementation of <literal>Translator</literal> " -"availableif the <literal>SentenceTranslator</literal> EJB was not " -"deployedthe Web Bean manager would throw an " +"available  if the <literal>SentenceTranslator</literal> EJB was not " +"deployed  the Web Bean manager would throw an " "<literal>UnsatisfiedDependencyException</literal>. If more than one " "implementation of <literal>Translator</literal> was available, the Web Bean " "manager would throw an <literal>AmbiguousDependencyException</literal>." @@ -375,8 +375,8 @@ #, no-c-format msgid "" "Note that not all clients of a Web Bean are Web Beans. Other objects such as " -"Servlets or Message-Driven Beanswhich are by nature not injectable, " -"contextual objectsmay also obtain references to Web Beans by injection." +"Servlets or Message-Driven Beans  which are by nature not injectable, " +"contextual objects  may also obtain references to Web Beans by injection." msgstr "" #. Tag: para @@ -743,7 +743,7 @@ #: intro.xml:289 #, no-c-format msgid "" -"In this case, the name defaults to <literal>shoppingCart</literal>the " +"In this case, the name defaults to <literal>shoppingCart</literal>  the " "unqualified class name, with the first character changed to lowercase." msgstr "" @@ -892,8 +892,8 @@ msgid "" "The specification says that all EJB 3-style session and singleton beans are " "<emphasis>enterprise</emphasis> Web Beans. Message driven beans are not Web " -"Beanssince they are not intended to be injected into other " -"objectsbut they can take advantage of most of the functionality of Web " +"Beans  since they are not intended to be injected into other " +"objects  but they can take advantage of most of the functionality of Web " "Beans, including dependency injection and interceptors." msgstr "" Modified: doc/trunk/reference/ko-KR/part3.po =================================================================== --- doc/trunk/reference/ko-KR/part3.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ko-KR/part3.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -26,8 +26,8 @@ #. Tag: para #: part3.xml:10 #, no-c-format -msgid "You don't see string-based identifiers in Web Beans code, not because the framework is hiding them from you using clever defaulting rulesso-called \"configuration by convention\"but because there are simply no strings there to begin with!" -msgstr "Web Beans 코드에서 문자열 기반 식별자를 보실 수 없습니다. 그 이유는 프레임워크가 \"관례에 의한 설정\"이라고 부르는 기본값 규칙을 사용하여 이를 숨기려하기 때문이 아니라 시작할 수 있는 문자열이 없기 때문입니다! " +msgid "You don't see string-based identifiers in Web Beans code, not because the framework is hiding them from you using clever defaulting rules  so-called \"configuration by convention\"  but because there are simply no strings there to begin with!" +msgstr "Web Beans 코드에서 문자열 기반 식별자를 보실 수 없습니다. 그 이유는 프레임워크가  \"관례에 의한 설정\"이라고 부르는  기본값 규칙을 사용하여 이를 숨기려하기 때문이 아니라 시작할 수 있는 문자열이 없기 때문입니다! " #. Tag: para #: part3.xml:15 Modified: doc/trunk/reference/ko-KR/scopescontexts.po =================================================================== --- doc/trunk/reference/ko-KR/scopescontexts.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/ko-KR/scopescontexts.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -463,7 +463,7 @@ "The Web Bean manager is permitted to destroy a conversation and all state " "held in its context at any time in order to preserve resources. A Web Bean " "manager implementation will normally do this on the basis of some kind of " -"timeoutthough this is not required by the Web Beans specification. The " +"timeout  though this is not required by the Web Beans specification. The " "timeout is the period of inactivity before the conversation is destroyed." msgstr "" Modified: doc/trunk/reference/pt-BR/ee.po =================================================================== --- doc/trunk/reference/pt-BR/ee.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/pt-BR/ee.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -311,7 +311,7 @@ #, no-c-format msgid "" "Web Beans doesn't define any special deployment archive. You can package Web " -"Beans in JARs, EJB-JARs or WARsany deployment location in the " +"Beans in JARs, EJB-JARs or WARs  any deployment location in the " "application classpath. However, each archive that contains Web Beans must " "include a file named <literal>web-beans.xml</literal> in the <literal>META-" "INF</literal> or <literal>WEB-INF</literal> directory. The file may be " Modified: doc/trunk/reference/pt-BR/events.po =================================================================== --- doc/trunk/reference/pt-BR/events.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/pt-BR/events.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -117,7 +117,7 @@ #: events.xml:48 #, no-c-format msgid "" -"An observer method need not specify any event bindingsin this case it " +"An observer method need not specify any event bindings  in this case it " "is interested in <emphasis>all</emphasis> events of a particular type. If it " "does specify event bindings, it is only interested in events which also have " "those event bindings." Modified: doc/trunk/reference/pt-BR/injection.po =================================================================== --- doc/trunk/reference/pt-BR/injection.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/pt-BR/injection.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -653,8 +653,8 @@ #, no-c-format msgid "" "If you've been paying attention, you're probably wondering how the Web Bean " -"manager decides which implementation<literal>ExternalPaymentProcessor</" -"literal> or <literal>MockPaymentProcessor</literal>to choose. Consider " +"manager decides which implementation  <literal>ExternalPaymentProcessor</" +"literal> or <literal>MockPaymentProcessor</literal>  to choose. Consider " "what happens when the manager encounters this injection point:" msgstr "" @@ -794,7 +794,7 @@ msgid "" "To fix an <literal>UnsatisfiedDependencyException</literal>, simply provide " "a Web Bean which implements the API type and has the binding types of the " -"injection pointor enable the deployment type of a Web Bean that " +"injection point  or enable the deployment type of a Web Bean that " "already implements the API type and has the binding types." msgstr "" @@ -973,7 +973,7 @@ #, no-c-format msgid "" "If the binding type has an annotation member, we can't use an anonymous " -"subclass of <literal>AnnotationLiteral</literal>instead we'll need to " +"subclass of <literal>AnnotationLiteral</literal>  instead we'll need to " "create a named subclass:" msgstr "" @@ -1053,8 +1053,8 @@ #: injection.xml:442 #, no-c-format msgid "" -"There are certain kinds of dependent objectsWeb Beans with scope " -"<literal>@Dependent</literal>that need to know something about the " +"There are certain kinds of dependent objects  Web Beans with scope " +"<literal>@Dependent</literal>  that need to know something about the " "object or injection point into which they are injected in order to be able " "to do what they do. For example:" msgstr "" Modified: doc/trunk/reference/pt-BR/interceptors.po =================================================================== --- doc/trunk/reference/pt-BR/interceptors.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/pt-BR/interceptors.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -486,7 +486,7 @@ msgid "" "Well, fortunately, Web Beans works around this missing feature of Java. We " "may annotate one interceptor binding type with other interceptor binding " -"types. The interceptor bindings are transitiveany Web Bean with the " +"types. The interceptor bindings are transitive  any Web Bean with the " "first interceptor binding inherits the interceptor bindings declared as meta-" "annotations." msgstr "" @@ -560,7 +560,7 @@ #: interceptors.xml:212 #, no-c-format msgid "" -"the interceptor ordering is non-globalit is determined by the order in " +"the interceptor ordering is non-global  it is determined by the order in " "which interceptors are listed at the class level." msgstr "" Modified: doc/trunk/reference/pt-BR/intro.po =================================================================== --- doc/trunk/reference/pt-BR/intro.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/pt-BR/intro.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -45,9 +45,9 @@ "Furthermore, every EJB 3-style session bean is a Web Bean. Sure, the " "JavaBeans and EJBs you've been writing every day have not been able to take " "advantage of the new services defined by the Web Beans specification, but " -"you'll be able to use every one of them as Web Beansinjecting them " +"you'll be able to use every one of them as Web Beans  injecting them " "into other Web Beans, configuring them via the Web Beans XML configuration " -"facility, even adding interceptors and decorators to themwithout " +"facility, even adding interceptors and decorators to them  without " "touching your existing code." msgstr "" @@ -202,8 +202,8 @@ "At system initialization time, the Web Bean manager must validate that " "exactly one Web Bean exists which satisfies each injection point. In our " "example, if no implementation of <literal>Translator</literal> " -"availableif the <literal>SentenceTranslator</literal> EJB was not " -"deployedthe Web Bean manager would throw an " +"available  if the <literal>SentenceTranslator</literal> EJB was not " +"deployed  the Web Bean manager would throw an " "<literal>UnsatisfiedDependencyException</literal>. If more than one " "implementation of <literal>Translator</literal> was available, the Web Bean " "manager would throw an <literal>AmbiguousDependencyException</literal>." @@ -330,8 +330,8 @@ #, no-c-format msgid "" "Note that not all clients of a Web Bean are Web Beans. Other objects such as " -"Servlets or Message-Driven Beanswhich are by nature not injectable, " -"contextual objectsmay also obtain references to Web Beans by injection." +"Servlets or Message-Driven Beans  which are by nature not injectable, " +"contextual objects  may also obtain references to Web Beans by injection." msgstr "" #. Tag: para @@ -681,7 +681,7 @@ #: intro.xml:289 #, no-c-format msgid "" -"In this case, the name defaults to <literal>shoppingCart</literal>the " +"In this case, the name defaults to <literal>shoppingCart</literal>  the " "unqualified class name, with the first character changed to lowercase." msgstr "" @@ -825,8 +825,8 @@ msgid "" "The specification says that all EJB 3-style session and singleton beans are " "<emphasis>enterprise</emphasis> Web Beans. Message driven beans are not Web " -"Beanssince they are not intended to be injected into other " -"objectsbut they can take advantage of most of the functionality of Web " +"Beans  since they are not intended to be injected into other " +"objects  but they can take advantage of most of the functionality of Web " "Beans, including dependency injection and interceptors." msgstr "" Modified: doc/trunk/reference/pt-BR/part3.po =================================================================== --- doc/trunk/reference/pt-BR/part3.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/pt-BR/part3.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -28,8 +28,8 @@ #, no-c-format msgid "" "You don't see string-based identifiers in Web Beans code, not because the " -"framework is hiding them from you using clever defaulting rulesso-" -"called \"configuration by convention\"but because there are simply no " +"framework is hiding them from you using clever defaulting rules  so-" +"called \"configuration by convention\"  but because there are simply no " "strings there to begin with!" msgstr "" Modified: doc/trunk/reference/pt-BR/scopescontexts.po =================================================================== --- doc/trunk/reference/pt-BR/scopescontexts.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/pt-BR/scopescontexts.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -421,7 +421,7 @@ "The Web Bean manager is permitted to destroy a conversation and all state " "held in its context at any time in order to preserve resources. A Web Bean " "manager implementation will normally do this on the basis of some kind of " -"timeoutthough this is not required by the Web Beans specification. The " +"timeout  though this is not required by the Web Beans specification. The " "timeout is the period of inactivity before the conversation is destroyed." msgstr "" Modified: doc/trunk/reference/zh-CN/ee.po =================================================================== --- doc/trunk/reference/zh-CN/ee.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-CN/ee.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -311,7 +311,7 @@ #, no-c-format msgid "" "Web Beans doesn't define any special deployment archive. You can package Web " -"Beans in JARs, EJB-JARs or WARsany deployment location in the " +"Beans in JARs, EJB-JARs or WARs  any deployment location in the " "application classpath. However, each archive that contains Web Beans must " "include a file named <literal>web-beans.xml</literal> in the <literal>META-" "INF</literal> or <literal>WEB-INF</literal> directory. The file may be " Modified: doc/trunk/reference/zh-CN/events.po =================================================================== --- doc/trunk/reference/zh-CN/events.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-CN/events.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -117,7 +117,7 @@ #: events.xml:48 #, no-c-format msgid "" -"An observer method need not specify any event bindingsin this case it " +"An observer method need not specify any event bindings  in this case it " "is interested in <emphasis>all</emphasis> events of a particular type. If it " "does specify event bindings, it is only interested in events which also have " "those event bindings." Modified: doc/trunk/reference/zh-CN/injection.po =================================================================== --- doc/trunk/reference/zh-CN/injection.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-CN/injection.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -653,8 +653,8 @@ #, no-c-format msgid "" "If you've been paying attention, you're probably wondering how the Web Bean " -"manager decides which implementation<literal>ExternalPaymentProcessor</" -"literal> or <literal>MockPaymentProcessor</literal>to choose. Consider " +"manager decides which implementation  <literal>ExternalPaymentProcessor</" +"literal> or <literal>MockPaymentProcessor</literal>  to choose. Consider " "what happens when the manager encounters this injection point:" msgstr "" @@ -794,7 +794,7 @@ msgid "" "To fix an <literal>UnsatisfiedDependencyException</literal>, simply provide " "a Web Bean which implements the API type and has the binding types of the " -"injection pointor enable the deployment type of a Web Bean that " +"injection point  or enable the deployment type of a Web Bean that " "already implements the API type and has the binding types." msgstr "" @@ -973,7 +973,7 @@ #, no-c-format msgid "" "If the binding type has an annotation member, we can't use an anonymous " -"subclass of <literal>AnnotationLiteral</literal>instead we'll need to " +"subclass of <literal>AnnotationLiteral</literal>  instead we'll need to " "create a named subclass:" msgstr "" @@ -1053,8 +1053,8 @@ #: injection.xml:442 #, no-c-format msgid "" -"There are certain kinds of dependent objectsWeb Beans with scope " -"<literal>@Dependent</literal>that need to know something about the " +"There are certain kinds of dependent objects  Web Beans with scope " +"<literal>@Dependent</literal>  that need to know something about the " "object or injection point into which they are injected in order to be able " "to do what they do. For example:" msgstr "" Modified: doc/trunk/reference/zh-CN/interceptors.po =================================================================== --- doc/trunk/reference/zh-CN/interceptors.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-CN/interceptors.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -486,7 +486,7 @@ msgid "" "Well, fortunately, Web Beans works around this missing feature of Java. We " "may annotate one interceptor binding type with other interceptor binding " -"types. The interceptor bindings are transitiveany Web Bean with the " +"types. The interceptor bindings are transitive  any Web Bean with the " "first interceptor binding inherits the interceptor bindings declared as meta-" "annotations." msgstr "" @@ -560,7 +560,7 @@ #: interceptors.xml:212 #, no-c-format msgid "" -"the interceptor ordering is non-globalit is determined by the order in " +"the interceptor ordering is non-global  it is determined by the order in " "which interceptors are listed at the class level." msgstr "" Modified: doc/trunk/reference/zh-CN/intro.po =================================================================== --- doc/trunk/reference/zh-CN/intro.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-CN/intro.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -34,7 +34,7 @@ #. Tag: para #: intro.xml:15 #, no-c-format -msgid "With certain, very special exceptions, every Java class with a constructor that accepts no parameters is a Web Bean. That includes every JavaBean. Furthermore, every EJB 3-style session bean is a Web Bean. Sure, the JavaBeans and EJBs you've been writing every day have not been able to take advantage of the new services defined by the Web Beans specification, but you'll be able to use every one of them as Web Beansinjecting them into other Web Beans, configuring them via the Web Beans XML configuration facility, even adding interceptors and decorators to themwithout touching your existing code." +msgid "With certain, very special exceptions, every Java class with a constructor that accepts no parameters is a Web Bean. That includes every JavaBean. Furthermore, every EJB 3-style session bean is a Web Bean. Sure, the JavaBeans and EJBs you've been writing every day have not been able to take advantage of the new services defined by the Web Beans specification, but you'll be able to use every one of them as Web Beans  injecting them into other Web Beans, configuring them via the Web Beans XML configuration facility, even adding interceptors and decorators to them  without touching your existing code." msgstr "除非特殊情况，每个具有一个非参构造器的Java类都可以是一个Web Bean。这包括了每个JavaBean, 并且每个EJB3的会话Bean都是一个Web Bean。当然，你每天已经写过的JavaBean和EJB无法使用Web Beans规范定义的新服务，但是你能够通过Web Beans的XML配置将这些组件配置为Web Bean，然后将其注入到其他Web Bean中。你甚至可以不用修改已有代码就可以为其添加拦截器和装饰器。" #. Tag: para @@ -194,8 +194,8 @@ #. Tag: para #: intro.xml:68 #, no-c-format -msgid "At system initialization time, the Web Bean manager must validate that exactly one Web Bean exists which satisfies each injection point. In our example, if no implementation of <literal>Translator</literal> availableif the <literal>SentenceTranslator</literal> EJB was not deployedthe Web Bean manager would throw an <literal>UnsatisfiedDependencyException</literal>. If more than one implementation of <literal>Translator</literal> was available, the Web Bean manager would throw an <literal>AmbiguousDependencyException</literal>." -msgstr "在系统初始化的时候，Web Bean管理器必须验证只存在一个Web Bean能够满足每个注入点。在我们的例子中，如果没有<literal>Translator</literal>实现如果<literal>SentenceTranslator</literal> EJB没有被部署Web Bean管理器将会抛出一个<literal>UnsatisfiedDependencyException</literal>异常。如果多于一个<literal>Translator</literal>实现，Web Bean管理器将会抛出一个<literal>AmbiguousDependencyException</literal>异常。" +msgid "At system initialization time, the Web Bean manager must validate that exactly one Web Bean exists which satisfies each injection point. In our example, if no implementation of <literal>Translator</literal> available  if the <literal>SentenceTranslator</literal> EJB was not deployed  the Web Bean manager would throw an <literal>UnsatisfiedDependencyException</literal>. If more than one implementation of <literal>Translator</literal> was available, the Web Bean manager would throw an <literal>AmbiguousDependencyException</literal>." +msgstr "在系统初始化的时候，Web Bean管理器必须验证只存在一个Web Bean能够满足每个注入点。在我们的例子中，如果没有<literal>Translator</literal>实现  如果<literal>SentenceTranslator</literal> EJB没有被部署  Web Bean管理器将会抛出一个<literal>UnsatisfiedDependencyException</literal>异常。如果多于一个<literal>Translator</literal>实现，Web Bean管理器将会抛出一个<literal>AmbiguousDependencyException</literal>异常。" #. Tag: title #: intro.xml:80 @@ -278,8 +278,8 @@ #. Tag: para #: intro.xml:145 #, no-c-format -msgid "Note that not all clients of a Web Bean are Web Beans. Other objects such as Servlets or Message-Driven Beanswhich are by nature not injectable, contextual objectsmay also obtain references to Web Beans by injection." -msgstr "需要注意的是并非所有的Web Bean的客户端都是Web Bean。其他对象诸如Servlet或者消息驱动Bean#151;天生不可注入的, 具备上下文的对象也可以通过注入获得Web Bean的引用。" +msgid "Note that not all clients of a Web Bean are Web Beans. Other objects such as Servlets or Message-Driven Beans  which are by nature not injectable, contextual objects  may also obtain references to Web Beans by injection." +msgstr "需要注意的是并非所有的Web Bean的客户端都是Web Bean。其他对象诸如Servlet或者消息驱动Bean#151;天生不可注入的, 具备上下文的对象  也可以通过注入获得Web Bean的引用。" #. Tag: para #: intro.xml:149 @@ -584,8 +584,8 @@ #. Tag: para #: intro.xml:289 #, no-c-format -msgid "In this case, the name defaults to <literal>shoppingCart</literal>the unqualified class name, with the first character changed to lowercase." -msgstr "在这种情况下，Web Bean的名字默认为<literal>shoppingCart</literal>非完整的类名，首字母改为小写" +msgid "In this case, the name defaults to <literal>shoppingCart</literal>  the unqualified class name, with the first character changed to lowercase." +msgstr "在这种情况下，Web Bean的名字默认为<literal>shoppingCart</literal>  非完整的类名，首字母改为小写" #. Tag: title #: intro.xml:295 @@ -708,8 +708,8 @@ #. Tag: para #: intro.xml:360 #, no-c-format -msgid "The specification says that all EJB 3-style session and singleton beans are <emphasis>enterprise</emphasis> Web Beans. Message driven beans are not Web Beanssince they are not intended to be injected into other objectsbut they can take advantage of most of the functionality of Web Beans, including dependency injection and interceptors." -msgstr "规范指出所有EJB3类型的会话Bean或者单例Bean都是<emphasis>企业级</emphasis>Web Bean。消息驱动Bean不是Web Beans因为它们不能被注入到其他对象中#151;但是它们可以使用大部分Web Bean的功能，包括依赖注入和拦截器。" +msgid "The specification says that all EJB 3-style session and singleton beans are <emphasis>enterprise</emphasis> Web Beans. Message driven beans are not Web Beans  since they are not intended to be injected into other objects  but they can take advantage of most of the functionality of Web Beans, including dependency injection and interceptors." +msgstr "规范指出所有EJB3类型的会话Bean或者单例Bean都是<emphasis>企业级</emphasis>Web Bean。消息驱动Bean不是Web Beans  因为它们不能被注入到其他对象中#151;但是它们可以使用大部分Web Bean的功能，包括依赖注入和拦截器。" #. Tag: para #: intro.xml:366 Modified: doc/trunk/reference/zh-CN/part3.po =================================================================== --- doc/trunk/reference/zh-CN/part3.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-CN/part3.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -22,8 +22,8 @@ #. Tag: para #: part3.xml:10 #, no-c-format -msgid "You don't see string-based identifiers in Web Beans code, not because the framework is hiding them from you using clever defaulting rulesso-called \"configuration by convention\"but because there are simply no strings there to begin with!" -msgstr "在Web Bean代码中，你不会看到基于字符串的标识符。这不是因为这个框架使用智能默认规则也叫\"按惯例配置\"将它们隐藏起来，这是因为从开始就没有任何字符串！" +msgid "You don't see string-based identifiers in Web Beans code, not because the framework is hiding them from you using clever defaulting rules  so-called \"configuration by convention\"  but because there are simply no strings there to begin with!" +msgstr "在Web Bean代码中，你不会看到基于字符串的标识符。这不是因为这个框架使用智能默认规则  也叫\"按惯例配置\"  将它们隐藏起来，这是因为从开始就没有任何字符串！" #. Tag: para #: part3.xml:15 Modified: doc/trunk/reference/zh-CN/scopescontexts.po =================================================================== --- doc/trunk/reference/zh-CN/scopescontexts.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-CN/scopescontexts.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -421,7 +421,7 @@ "The Web Bean manager is permitted to destroy a conversation and all state " "held in its context at any time in order to preserve resources. A Web Bean " "manager implementation will normally do this on the basis of some kind of " -"timeoutthough this is not required by the Web Beans specification. The " +"timeout  though this is not required by the Web Beans specification. The " "timeout is the period of inactivity before the conversation is destroyed." msgstr "" Modified: doc/trunk/reference/zh-TW/ee.po =================================================================== --- doc/trunk/reference/zh-TW/ee.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-TW/ee.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -399,13 +399,13 @@ #, no-c-format msgid "" "Web Beans doesn't define any special deployment archive. You can package Web " -"Beans in JARs, EJB-JARs or WARsany deployment location in the " +"Beans in JARs, EJB-JARs or WARs  any deployment location in the " "application classpath. However, each archive that contains Web Beans must " "include a file named <literal>web-beans.xml</literal> in the <literal>META-" "INF</literal> or <literal>WEB-INF</literal> directory. The file may be " "empty. Web Beans deployed in archives that do not have a <literal>web-beans." "xml</literal> file will not be available for use in the application." -msgstr "Web Bean 不會定義任何特殊的建置 archive。您可將 Web Bean 封裝在 JARs、EJB-JARs 或是 WARs 中，應用程式 classpath 中的任何建置位置上。不過，各個包含著 Web Bean 的 archive 在 <literal>META-INF</literal> 或是 <literal>WEB-INF</literal> 目錄中都必須包含著一個稱為 <literal>web-beans.xml</literal> 的檔案。該檔案能是空的。建置於一個沒有 <literal>web-beans.xml</literal> 檔案的 archive 中的 Web Bean 將無法使用於應用程式中。" +msgstr "Web Bean 不會定義任何特殊的建置 archive。您可將 Web Bean 封裝在 JARs、EJB-JARs 或是 WARs  中，應用程式 classpath 中的任何建置位置上。不過，各個包含著 Web Bean 的 archive 在 <literal>META-INF</literal> 或是 <literal>WEB-INF</literal> 目錄中都必須包含著一個稱為 <literal>web-beans.xml</literal> 的檔案。該檔案能是空的。建置於一個沒有 <literal>web-beans.xml</literal> 檔案的 archive 中的 Web Bean 將無法使用於應用程式中。" #. Tag: para #: ee.xml:116 Modified: doc/trunk/reference/zh-TW/events.po =================================================================== --- doc/trunk/reference/zh-TW/events.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-TW/events.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -128,11 +128,11 @@ #: events.xml:48 #, no-c-format msgid "" -"An observer method need not specify any event bindingsin this case it " +"An observer method need not specify any event bindings  in this case it " "is interested in <emphasis>all</emphasis> events of a particular type. If it " "does specify event bindings, it is only interested in events which also have " "those event bindings." -msgstr "一個 observer method 不需要指定任何的事件綁定在此情況下它會專注於特定 type 的<emphasis>所有</emphasis>事件。若它指定了事件綁定的話，它就只會專注於也具有這些事件綁定的事件。" +msgstr "一個 observer method 不需要指定任何的事件綁定  在此情況下它會專注於特定 type 的<emphasis>所有</emphasis>事件。若它指定了事件綁定的話，它就只會專注於也具有這些事件綁定的事件。" #. Tag: para #: events.xml:53 Modified: doc/trunk/reference/zh-TW/injection.po =================================================================== --- doc/trunk/reference/zh-TW/injection.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-TW/injection.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -760,12 +760,12 @@ #, no-c-format msgid "" "If you've been paying attention, you're probably wondering how the Web Bean " -"manager decides which implementation<literal>ExternalPaymentProcessor</" -"literal> or <literal>MockPaymentProcessor</literal>to choose. Consider " +"manager decides which implementation  <literal>ExternalPaymentProcessor</" +"literal> or <literal>MockPaymentProcessor</literal>  to choose. Consider " "what happens when the manager encounters this injection point:" msgstr "" -"若您有在細心注意的話，您應該會疑惑 Web Bean 管理員如何決定哪個實做<literal>ExternalPaymentProcessor</" -"literal> 和 <literal>MockPaymentProcessor</literal>中選擇哪一個。請思考當管理員遇上了這個注入點時會如何：" +"若您有在細心注意的話，您應該會疑惑 Web Bean 管理員如何決定哪個實做  <literal>ExternalPaymentProcessor</" +"literal> 和 <literal>MockPaymentProcessor</literal>  中選擇哪一個。請思考當管理員遇上了這個注入點時會如何：" #. Tag: programlisting #: injection.xml:251 @@ -902,9 +902,9 @@ msgid "" "To fix an <literal>UnsatisfiedDependencyException</literal>, simply provide " "a Web Bean which implements the API type and has the binding types of the " -"injection pointor enable the deployment type of a Web Bean that " +"injection point  or enable the deployment type of a Web Bean that " "already implements the API type and has the binding types." -msgstr "若要修正一項 <literal>UnsatisfiedDependencyException</literal>，只要提供一個實做 API 類型並且擁有注入點的綁定類型的 Web Bean 即可或是啟用一個已實做 API 類型並且擁有綁定類型的 Web Bean 的 deployment type 即可。" +msgstr "若要修正一項 <literal>UnsatisfiedDependencyException</literal>，只要提供一個實做 API 類型並且擁有注入點的綁定類型的 Web Bean 即可  或是啟用一個已實做 API 類型並且擁有綁定類型的 Web Bean 的 deployment type 即可。" #. Tag: para #: injection.xml:328 @@ -1087,9 +1087,9 @@ #, no-c-format msgid "" "If the binding type has an annotation member, we can't use an anonymous " -"subclass of <literal>AnnotationLiteral</literal>instead we'll need to " +"subclass of <literal>AnnotationLiteral</literal>  instead we'll need to " "create a named subclass:" -msgstr "若綁定類型有個標記成員，我們便無法使用 <literal>AnnotationLiteral</literal> 的一個匿名 subclass我們需要建立一個有命名的 subclass：" +msgstr "若綁定類型有個標記成員，我們便無法使用 <literal>AnnotationLiteral</literal> 的一個匿名 subclass  我們需要建立一個有命名的 subclass：" #. Tag: programlisting #: injection.xml:413 @@ -1176,11 +1176,11 @@ #: injection.xml:442 #, no-c-format msgid "" -"There are certain kinds of dependent objectsWeb Beans with scope " -"<literal>@Dependent</literal>that need to know something about the " +"There are certain kinds of dependent objects  Web Beans with scope " +"<literal>@Dependent</literal>  that need to know something about the " "object or injection point into which they are injected in order to be able " "to do what they do. For example:" -msgstr "有幾種特定相依物件含有 <literal>@Dependent</literal> 這個 scope 的 Web Bean需要知道有關於物件或是它們被注入的注入點相關資訊才能進行它們本應進行的工作。比方說：" +msgstr "有幾種特定相依物件  含有 <literal>@Dependent</literal> 這個 scope 的 Web Bean  需要知道有關於物件或是它們被注入的注入點相關資訊才能進行它們本應進行的工作。比方說：" #. Tag: para #: injection.xml:448 Modified: doc/trunk/reference/zh-TW/interceptors.po =================================================================== --- doc/trunk/reference/zh-TW/interceptors.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-TW/interceptors.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -566,10 +566,10 @@ msgid "" "Well, fortunately, Web Beans works around this missing feature of Java. We " "may annotate one interceptor binding type with other interceptor binding " -"types. The interceptor bindings are transitiveany Web Bean with the " +"types. The interceptor bindings are transitive  any Web Bean with the " "first interceptor binding inherits the interceptor bindings declared as meta-" "annotations." -msgstr "幸運的是，Web Bean 有方法來解決 Java 所缺少的這項功能上的問題。我們可利用其它攔截器綁定類型來標記某個攔截器綁定類型。攔截器綁定為可轉變的任何含有第一個攔截器綁定的 Web Bean 都會繼承宣告為 meta-annotation 的攔截器綁定。" +msgstr "幸運的是，Web Bean 有方法來解決 Java 所缺少的這項功能上的問題。我們可利用其它攔截器綁定類型來標記某個攔截器綁定類型。攔截器綁定為可轉變的  任何含有第一個攔截器綁定的 Web Bean 都會繼承宣告為 meta-annotation 的攔截器綁定。" #. Tag: programlisting #: interceptors.xml:186 @@ -650,9 +650,9 @@ #: interceptors.xml:212 #, no-c-format msgid "" -"the interceptor ordering is non-globalit is determined by the order in " +"the interceptor ordering is non-global  it is determined by the order in " "which interceptors are listed at the class level." -msgstr "攔截器的順序會是非全域性的會由攔截器被列於 class 層級的順序來取決。" +msgstr "攔截器的順序會是非全域性的  會由攔截器被列於 class 層級的順序來取決。" #. Tag: para #: interceptors.xml:217 Modified: doc/trunk/reference/zh-TW/intro.po =================================================================== --- doc/trunk/reference/zh-TW/intro.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-TW/intro.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -48,11 +48,11 @@ "Furthermore, every EJB 3-style session bean is a Web Bean. Sure, the " "JavaBeans and EJBs you've been writing every day have not been able to take " "advantage of the new services defined by the Web Beans specification, but " -"you'll be able to use every one of them as Web Beansinjecting them " +"you'll be able to use every one of them as Web Beans  injecting them " "into other Web Beans, configuring them via the Web Beans XML configuration " -"facility, even adding interceptors and decorators to themwithout " +"facility, even adding interceptors and decorators to them  without " "touching your existing code." -msgstr "我們能夠很明確地告訴您，在絕大部分的情況下，所有含有不接受參數的 constructor 的 java class 都是個 Web Bean。這包含了所有的 JavaBean。另外，所有 EJB 3-style 的 session bean 也都屬於 Web Bean。當然，您先前所編寫的 JavaBean 和 EJB 皆無法有效利用 Web Bean 規格所定義的新服務，不過您卻可將它們全部作為 Web Bean 來使用將它們注入其它 Web Bean 中，透過 Web Bean XML 配置功能來配置它們，甚至是加入攔截器（interceptor）與裝飾器（decorator）無須變動到您現有的程式碼。" +msgstr "我們能夠很明確地告訴您，在絕大部分的情況下，所有含有不接受參數的 constructor 的 java class 都是個 Web Bean。這包含了所有的 JavaBean。另外，所有 EJB 3-style 的 session bean 也都屬於 Web Bean。當然，您先前所編寫的 JavaBean 和 EJB 皆無法有效利用 Web Bean 規格所定義的新服務，不過您卻可將它們全部作為 Web Bean 來使用  將它們注入其它 Web Bean 中，透過 Web Bean XML 配置功能來配置它們，甚至是加入攔截器（interceptor）與裝飾器（decorator）  無須變動到您現有的程式碼。" #. Tag: para #: intro.xml:25 @@ -243,12 +243,12 @@ "At system initialization time, the Web Bean manager must validate that " "exactly one Web Bean exists which satisfies each injection point. In our " "example, if no implementation of <literal>Translator</literal> " -"availableif the <literal>SentenceTranslator</literal> EJB was not " -"deployedthe Web Bean manager would throw an " +"available  if the <literal>SentenceTranslator</literal> EJB was not " +"deployed  the Web Bean manager would throw an " "<literal>UnsatisfiedDependencyException</literal>. If more than one " "implementation of <literal>Translator</literal> was available, the Web Bean " "manager would throw an <literal>AmbiguousDependencyException</literal>." -msgstr "當系統初始化時，Web Bean 管理員必須驗證是否有正好一個滿足所有注入點的 Web Bean 存在。在我們的範例中，若沒有可用的 <literal>Translator</literal> 實做若 <literal>SentenceTranslator</literal> EJB 沒有被建置Web Bean 管理員便會回傳一個 <literal>UnsatisfiedDependencyException</literal>。若有超過一個可使用的 <literal>Translator</literal> 實做，那麼 Web Bean 管理員便會回傳一個 <literal>AmbiguousDependencyException</literal>。" +msgstr "當系統初始化時，Web Bean 管理員必須驗證是否有正好一個滿足所有注入點的 Web Bean 存在。在我們的範例中，若沒有可用的 <literal>Translator</literal> 實做  若 <literal>SentenceTranslator</literal> EJB 沒有被建置  Web Bean 管理員便會回傳一個 <literal>UnsatisfiedDependencyException</literal>。若有超過一個可使用的 <literal>Translator</literal> 實做，那麼 Web Bean 管理員便會回傳一個 <literal>AmbiguousDependencyException</literal>。" #. Tag: title #: intro.xml:80 @@ -370,9 +370,9 @@ #, no-c-format msgid "" "Note that not all clients of a Web Bean are Web Beans. Other objects such as " -"Servlets or Message-Driven Beanswhich are by nature not injectable, " -"contextual objectsmay also obtain references to Web Beans by injection." -msgstr "請注意，並非所有 Web Bean 的客戶端都是 Web Bean。像是 Servlet 或訊息導向的 Bean 之類的其它物件無法被注入，並屬於 contextual object也能透過注入來取得 Web Bean 的參照。" +"Servlets or Message-Driven Beans  which are by nature not injectable, " +"contextual objects  may also obtain references to Web Beans by injection." +msgstr "請注意，並非所有 Web Bean 的客戶端都是 Web Bean。像是 Servlet 或訊息導向的 Bean 之類的其它物件  無法被注入，並屬於 contextual object  也能透過注入來取得 Web Bean 的參照。" #. Tag: para #: intro.xml:149 @@ -738,9 +738,9 @@ #: intro.xml:289 #, no-c-format msgid "" -"In this case, the name defaults to <literal>shoppingCart</literal>the " +"In this case, the name defaults to <literal>shoppingCart</literal>  the " "unqualified class name, with the first character changed to lowercase." -msgstr "在此情況下，名稱將被預設為 <literal>shoppingCart</literal>這是個不完整的 class 名稱，並且第一個字元已被改變為小寫。" +msgstr "在此情況下，名稱將被預設為 <literal>shoppingCart</literal>  這是個不完整的 class 名稱，並且第一個字元已被改變為小寫。" #. Tag: title #: intro.xml:295 @@ -888,8 +888,8 @@ msgid "" "The specification says that all EJB 3-style session and singleton beans are " "<emphasis>enterprise</emphasis> Web Beans. Message driven beans are not Web " -"Beanssince they are not intended to be injected into other " -"objectsbut they can take advantage of most of the functionality of Web " +"Beans  since they are not intended to be injected into other " +"objects  but they can take advantage of most of the functionality of Web " "Beans, including dependency injection and interceptors." msgstr "依賴注入" Modified: doc/trunk/reference/zh-TW/part3.po =================================================================== --- doc/trunk/reference/zh-TW/part3.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-TW/part3.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -31,10 +31,10 @@ #, no-c-format msgid "" "You don't see string-based identifiers in Web Beans code, not because the " -"framework is hiding them from you using clever defaulting rulesso-" -"called \"configuration by convention\"but because there are simply no " +"framework is hiding them from you using clever defaulting rules  so-" +"called \"configuration by convention\"  but because there are simply no " "strings there to begin with!" -msgstr "您在 Web Bean 的程式碼中不會看見基於字串的識別符號，這不是因為 framework 透過使用預設的規則來將它隱藏起來又稱為「configuration by convention」而是因為一開始根本就沒有任何字串！" +msgstr "您在 Web Bean 的程式碼中不會看見基於字串的識別符號，這不是因為 framework 透過使用預設的規則來將它隱藏起來  又稱為「configuration by convention」  而是因為一開始根本就沒有任何字串！" #. Tag: para #: part3.xml:15 Modified: doc/trunk/reference/zh-TW/scopescontexts.po =================================================================== --- doc/trunk/reference/zh-TW/scopescontexts.po 2009-01-20 16:30:56 UTC (rev 1129) +++ doc/trunk/reference/zh-TW/scopescontexts.po 2009-01-20 20:33:41 UTC (rev 1130) @@ -461,9 +461,9 @@ "The Web Bean manager is permitted to destroy a conversation and all state " "held in its context at any time in order to preserve resources. A Web Bean " "manager implementation will normally do this on the basis of some kind of " -"timeoutthough this is not required by the Web Beans specification. The " +"timeout  though this is not required by the Web Beans specification. The " "timeout is the period of inactivity before the conversation is destroyed." -msgstr "Web Bean 管理員能夠隨時隨地刪除它 context 中的 conversation 以及所有狀態以保留資源。一個 Web Bean 管理員實做一般會利用某種形式的 timeout 來這麼作儘管這在 Web Bean 規格中是非必要的。Timeout 代表 conversation 在被刪除之前所經過的休止狀態時間。" +msgstr "Web Bean 管理員能夠隨時隨地刪除它 context 中的 conversation 以及所有狀態以保留資源。一個 Web Bean 管理員實做一般會利用某種形式的 timeout 來這麼作  儘管這在 Web Bean 規格中是非必要的。Timeout 代表 conversation 在被刪除之前所經過的休止狀態時間。" #. Tag: para #: scopescontexts.xml:208

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1129 - doc/trunk/reference/ko-KR.

by webbeans-commits＠lists.jboss.org

Author: eukim Date: 2009-01-20 11:30:56 -0500 (Tue, 20 Jan 2009) New Revision: 1129 Modified: doc/trunk/reference/ko-KR/ri.po Log: updated Modified: doc/trunk/reference/ko-KR/ri.po =================================================================== --- doc/trunk/reference/ko-KR/ri.po 2009-01-20 14:14:27 UTC (rev 1128) +++ doc/trunk/reference/ko-KR/ri.po 2009-01-20 16:30:56 UTC (rev 1129) @@ -8,7 +8,7 @@ "Project-Id-Version: ri\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2009-01-18 16:31+0000\n" -"PO-Revision-Date: 2009-01-21 00:08+1000\n" +"PO-Revision-Date: 2009-01-21 02:28+1000\n" "Last-Translator: Eunju Kim <eukim(a)redhat.com>\n" "Language-Team: Korean <ko(a)li.org>\n" "MIME-Version: 1.0\n" @@ -18,6 +18,7 @@ "Plural-Forms: nplurals=2; plural=(n!=1);\n\n" "\n" "\n" +"\n" #. Tag: title #: ri.xml:4 @@ -186,13 +187,13 @@ #: ri.xml:88 #, no-c-format msgid "Now, you're ready to deploy your first example!" -msgstr "이제, 첫번째 예를 배포할 준비가 되었습니다! " +msgstr "이제, 첫번째 예제를 배포할 준비가 되었습니다! " #. Tag: para #: ri.xml:93 #, no-c-format msgid "The build scripts for the examples offer a number of targets, these are:" -msgstr "예시 용 작성 스크립트는 여러 대상을 제공합니다. 이에는 다음과 같은 것이 있습니다: " +msgstr "예제 용 작성 스크립트는 여러 대상을 제공합니다. 이에는 다음과 같은 것이 있습니다: " #. Tag: para #: ri.xml:99 @@ -206,7 +207,7 @@ msgid "" "<literal>ant explode</literal> - update an exploded example, without " "restarting the deployment" -msgstr "<literal>ant explode</literal> - 배포 버전을 다시 시작하지 않고 exploded 예를 업데이트합니다 " +msgstr "<literal>ant explode</literal> - 배포 버전을 다시 시작하지 않고 exploded 예제를 업데이트합니다 " #. Tag: para #: ri.xml:111 @@ -230,7 +231,7 @@ #: ri.xml:128 #, no-c-format msgid "To deploy the numberguess example:" -msgstr "numberguess 예를 배포하려면: " +msgstr "numberguess 예제를 배포하려면: " #. Tag: programlisting #: ri.xml:132 @@ -249,6 +250,8 @@ "Wait for the application to deploy, and enjoy hours of fun at <ulink url=" "\"http://localhost:8080/webbeans-numberguess\"></ulink>!" msgstr "" +"애플리케이션이 배포되면 <ulink url=" +"\"http://localhost:8080/webbeans-numberguess\"></ulink>에서 살펴보시기 바랍니다! " #. Tag: para #: ri.xml:139 @@ -258,7 +261,7 @@ "text into Latin. The numberguess example is a war example, and uses only " "simple beans; the translator example is an ear example, and includes " "enterprise beans, packaged in an EJB module. To try it out:" -msgstr "" +msgstr "Web Beans RI에는 텍스트를 라틴어로 번역하는 두 번째 예제가 있습니다. numberguess 예제는 war 예제로 단순한 beans 만을 사용합니다; 번역 예제는 ear 예제로 엔터프라이즈 beans에 포함되어 EJB 모듈에 패키지되어 있습니다. 이를 꺼내려면 다음을 실행합니다: " #. Tag: programlisting #: ri.xml:146 @@ -277,12 +280,14 @@ "Wait for the application to deploy, and visit <ulink url=\"http://" "localhost:8080/webbeans-translator\"></ulink>!" msgstr "" +"애플리케이션이 배포되면 <ulink url=\"http://" +"localhost:8080/webbeans-translator\"></ulink>에 가보십시오! " #. Tag: title #: ri.xml:154 #, no-c-format msgid "The numberguess example" -msgstr "" +msgstr "numberguess 예제 " #. Tag: para #: ri.xml:156 @@ -291,7 +296,7 @@ "In the numberguess application you get given 10 attempts to guess a number " "between 1 and 100. After each attempt, you will be told whether you are too " "high, or too low." -msgstr "" +msgstr "numberguess 애플리케이션에서 1에서 100사이의 숫자를 알아내기 위해 주어진 10 번을 시도하게 됩니다. 각각 시도한 후 숫자가 너무 높은지 또는 너무 낮은지를 알려주게 됩니다. " #. Tag: para #: ri.xml:162 @@ -300,7 +305,7 @@ "The numberguess example is comprised of a number of Web Beans, configuration " "files, and Facelet JSF pages, packaged as a war. Let's start with the " "configuration files." -msgstr "" +msgstr "numberguess 예제는 여러 Web Beans, 설정 파일, Facelet JSF 페이지로 구성되어 있으며, war로 패키지되어 있습니다 설정 파일부터 시작합시다. " #. Tag: para #: ri.xml:168 @@ -310,7 +315,7 @@ "</literal>, which is stored in <literal>WebContent</literal> in the source " "tree. First, we have <literal>faces-config.xml</literal>, in which we tell " "JSF to use Facelets:" -msgstr "" +msgstr "예제에 해당하는 모든 설정 파일은 <literal>WEB-INF/</literal>에 위치해 있으며, 이는 소스 트리에 있는 <literal>WebContent</literal>에 저장되어 있습니다. 먼저, <literal>faces-config.xml</literal>을 사용하여, Facelets를 사용할 JSF를 알려주게 됩니다: " #. Tag: programlisting #: ri.xml:176 @@ -348,13 +353,13 @@ msgid "" "There is an empty <literal>web-beans.xml</literal> file, which marks this " "application as a Web Beans application." -msgstr "" +msgstr "여기에는 빈 <literal>web-beans.xml</literal> 파일이 있어, 이는 Web Beans 애플리케이션으로 애플리케이션을 표시합니다. " #. Tag: para #: ri.xml:183 #, no-c-format msgid "Finally there is <literal>web.xml</literal>:" -msgstr "" +msgstr "마지막으로, <literal>web.xml</literal> 파일이 있습니다: " #. Tag: section #: ri.xml:185 @@ -477,6 +482,122 @@ "to an action method on the Web Bean. </para> </callout> </calloutlist> </" "programlistingco>" msgstr "" +"<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"12\"/> " +"<area id=\"faces.servlet.mapping\" coords=\"18\"/> <area id=\"faces.default." +"suffix\" coords=\"23\"/> <area id=\"session.timeout\" coords=\"28\"/> <area " +"id=\"webbeans.listener\" coords=\"32\"/> </areaspec> <programlisting><![CDATA" +"[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +"\n" +"<web-app version=\"2.5\"\n" +" xmlns=\"http://java.sun.com/xml/ns/javaee\"\n" +" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun." +"com/xml/ns/javaee/web-app_2_5.xsd\">\n" +" \n" +" <display-name>Web Beans Numbergues example</display-name>\n" +"\n" +" \n" +"\n" +" <servlet>\n" +" <servlet-name>Faces Servlet</servlet-name>\n" +" <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n" +" <load-on-startup>1</load-on-startup>\n" +" </servlet>\n" +"\n" +" <servlet-mapping>\n" +" <servlet-name>Faces Servlet</servlet-name>\n" +" <url-pattern>*.jsf</url-pattern>\n" +" </servlet-mapping>\n" +" \n" +" <context-param>\n" +" <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n" +" <param-value>.xhtml</param-value>\n" +" </context-param>\n" +"\n" +" <session-config>\n" +" <session-timeout>10</session-timeout>\n" +" </session-config>\n" +"\n" +"</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces." +"servlet\"> <para> Enable and load the JSF servlet </para> </callout> " +"<callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests to " +"<literal>.jsf</literal> pages to be handled by JSF </para> </callout> " +"<callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we will be " +"giving our source files (facelets) an extension of <literal>.jsf</literal> </" +"para> </callout> <callout arearefs=\"session.timeout\"> <para> Configure a " +"session timeout of 10 minutes </para> </callout> </calloutlist> </" +"programlistingco> <note> <para> Whilst this demo is a JSF demo, you can use " +"the Web Beans RI with any Servlet based web framework. </para> </note> " +"<para> Let's take a look at the Facelet view: </para> <programlistingco> " +"<areaspec> <area id=\"template\" coords=\"8\"/> <area id=\"messages\" coords=" +"\"12\"/> <area id=\"instructions\" coords=\"19\"/> <area id=\"guess\" coords=" +"\"25\"/> <area id=\"validator\" coords=\"30\"/> <area id=\"submit\" coords=" +"\"33\"/> </areaspec> <programlisting><![CDATA[<!DOCTYPE html PUBLIC \"-//" +"W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/" +"xhtml1-transitional.dtd\">\n" +"<html xmlns=\"http://www.w3.org/1999/xhtml\"\n" +" xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n" +" xmlns:h=\"http://java.sun.com/jsf/html\"\n" +" xmlns:f=\"http://java.sun.com/jsf/core\"\n" +" xmlns:s=\"http://jboss.com/products/seam/taglib\">\n" +"\n" +" <ui:composition template=\"template.xhtml\">\n" +" <ui:define name=\"content\">\n" +" <h1>Guess a number...</h1>\n" +" <h:form id=\"NumberGuessMain\">\n" +" <div style=\"color: red\">\n" +" <h:messages id=\"messages\" globalOnly=\"false\"/>\n" +" <h:outputText id=\"Higher\" value=\"Higher!\" rendered=\"#{game." +"number gt game.guess and game.guess ne 0}\"/>\n" +" <h:outputText id=\"Lower\" value=\"Lower!\" rendered=\"#{game." +"number lt game.guess and game.guess ne 0}\"/>\n" +" </div>\n" +" \n" +" <div>\n" +" I'm thinking of a number between #{game.smallest} and #{game." +"biggest}.\n" +" You have #{game.remainingGuesses} guesses.\n" +" </div>\n" +" \n" +" <div>\n" +" Your guess: \n" +" <h:inputText id=\"inputGuess\" \n" +" value=\"#{game.guess}\" \n" +" required=\"true\" \n" +" size=\"3\" \n" +" disabled=\"#{game.number eq game.guess}\">\n" +" <f:validateLongRange maximum=\"#{game.biggest}\" \n" +" minimum=\"#{game.smallest}\"/>\n" +" </h:inputText>\n" +" <h:commandButton id=\"GuessButton\" \n" +" value=\"Guess\" \n" +" action=\"#{game.check}\" \n" +" disabled=\"#{game.number eq game.guess}\"/>\n" +" </div>\n" +" <div>\n" +" <h:commandButton id=\"RestartButton\" value=\"Reset\" action=\"#" +"{game.reset}\" immediate=\"true\" />\n" +" </div>\n" +" </h:form>\n" +" </ui:define>\n" +" </ui:composition>\n" +"</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> " +"<para> Facelets is a templating language for JSF, here we are wrapping our " +"page in a template which defines the header. </para> </callout> <callout " +"arearefs=\"messages\"> <para> There are a number of messages which can be " +"sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </para> </" +"callout> <callout arearefs=\"instructions\"> <para> As the user guesses, the " +"range of numbers they can guess gets smaller - this sentance changes to make " +"sure they know what range to guess in. </para> </callout> <callout arearefs=" +"\"guess\"> <para> This input field is bound to a Web Bean, using the value " +"expression. </para> </callout> <callout arearefs=\"validator\"> <para> A " +"range validator is used to make sure the user doesn't accidentally input a " +"number outside of the range in which they can guess - if the validator " +"wasn't here, the user might use up a guess on an out of range number. </" +"para> </callout> <callout arearefs=\"submit\"> <para> And, of course, there " +"must be a way for the user to send their guess to the server. Here we bind " +"to an action method on the Web Bean. </para> </callout> </calloutlist> </" +"programlistingco>" #. Tag: para #: ri.xml:287 @@ -485,7 +606,7 @@ "The example exists of 4 classes, the first two of which are binding types. " "First, there is the <literal>@Random</literal> binding type, used for " "injecting a random number:" -msgstr "" +msgstr "예제에는 4 개의 클래스가 존재합니다, 첫 번째 두 개는 바인딩 유형입니다. 먼저, 임의의 숫자를 삽입하기 위해 사용되는 <literal>@Random</literal> 바인딩 유형이 있습니다: " #. Tag: programlisting #: ri.xml:293 @@ -509,7 +630,7 @@ msgid "" "There is also the <literal>@MaxNumber</literal> binding type, used for " "injecting the maximum number that can be injected:" -msgstr "" +msgstr "삽입될 수 있는 최대 번호 삽입하기 위해 사용되는 <literal>@MaxNumber</literal> 바인딩 유형도 있습니다: " #. Tag: programlisting #: ri.xml:300 @@ -536,7 +657,7 @@ "The <literal>Generator</literal> class is responsible for creating the " "random number, via a producer method. It also exposes the maximum possible " "number via a producer method:" -msgstr "" +msgstr "<literal>Generator</literal> 클래스는 생산자 방식을 통해 임의의 숫자를 생성해야 할 책임이 있습니다. 또한 이는 생산자 방식을 통하여 가능한 최대 숫자를 나타냅니다: " #. Tag: programlisting #: ri.xml:308 @@ -596,7 +717,7 @@ msgid "" "You'll notice that the <literal>Generator</literal> is application scoped; " "therefore we don't get a different random each time." -msgstr "" +msgstr "<literal>Generator</literal>는 애플리케이션 범위로 되어 있음을 발견하실 것입니다; 따라서 매번 다른 임의 숫자를 갖지 않게 됩니다. " #. Tag: para #: ri.xml:315 @@ -604,7 +725,7 @@ msgid "" "The final Web Bean in the application is the session scoped <literal>Game</" "literal>." -msgstr "" +msgstr "애플리케이션에 있는 마지막 Web Bean은 <literal>Game</literal> 범위 세션입니다. " #. Tag: para #: ri.xml:320 @@ -819,7 +940,7 @@ #: ri.xml:332 #, no-c-format msgid "The translator example" -msgstr "" +msgstr "번역 예제 " #. Tag: para #: ri.xml:334 @@ -827,7 +948,7 @@ msgid "" "The translator example will take any sentences you enter, and translate them " "to Latin." -msgstr "" +msgstr "번역 예제는 입력하신 아무 문장을 가져가 이를 라틴어로 번역합니다. " #. Tag: para #: ri.xml:339 @@ -843,7 +964,7 @@ msgid "" "EJB 3.1 and Jave EE 6 allow you to package EJBs in a war, which will make " "this structure much simpler!" -msgstr "" +msgstr "EJB 3.1 및 Jave EE 6는 EJB를 war로 패키지하게 하여, 이러한 문장을 보다 간단하게 만들게 됩니다! " #. Tag: para #: ri.xml:351 @@ -901,7 +1022,7 @@ msgid "" "If you aren't using Maven to generate these files, you would need " "<literal>META-INF/application.xml</literal>:" -msgstr "" +msgstr "Maven을 사용하여 이러한 파일을 생성할 경우, <literal>META-INF/application.xml</literal>이 필요합니다: " #. Tag: programlisting #: ri.xml:370

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1128 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-20 09:14:27 -0500 (Tue, 20 Jan 2009) New Revision: 1128 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java Log: minor Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-01-20 14:11:11 UTC (rev 1127) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-01-20 14:14:27 UTC (rev 1128) @@ -68,12 +68,12 @@ AnnotatedClass<?> annotatedClass = AnnotatedClassImpl.of(clazz); if (manager.getEjbDescriptorCache().containsKey(clazz)) { - createBean(EnterpriseBean.of(annotatedClass, manager), annotatedClass, beans); + createBean(EnterpriseBean.of(annotatedClass, manager), annotatedClass); beans.add(NewEnterpriseBean.of(annotatedClass, manager)); } else if (isTypeSimpleWebBean(clazz)) { - createBean(SimpleBean.of(annotatedClass, manager), annotatedClass, beans); + createBean(SimpleBean.of(annotatedClass, manager), annotatedClass); beans.add(NewSimpleBean.of(annotatedClass, manager)); } } @@ -98,9 +98,8 @@ * Also creates the implicit field- and method-level beans, if present * * @param bean The bean representation - * @param beans The set of created beans */ - protected void createBean(AbstractClassBean<?> bean, AnnotatedClass<?> annotatedClass, Set<AbstractBean<?, ?>> beans) + protected void createBean(AbstractClassBean<?> bean, AnnotatedClass<?> annotatedClass) { beans.add(bean);

16 years, 8 months

1
0
0 / 0

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

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-20 09:11:11 -0500 (Tue, 20 Jan 2009) New Revision: 1127 Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java Log: Refactor out the bean deployer from bootstrap, remove double deploy of standard beans Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-20 14:09:25 UTC (rev 1126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-20 14:11:11 UTC (rev 1127) @@ -761,6 +761,11 @@ { return ejbResolver; } + + public ResourceLoader getResourceLoader() + { + return resourceLoader; + } /** * Accesses the factory used to create each instance of InjectionPoint that Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-01-20 14:11:11 UTC (rev 1127) @@ -0,0 +1,232 @@ +package org.jboss.webbeans.bootstrap; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.HashSet; +import java.util.Set; + +import javax.webbeans.DefinitionException; +import javax.webbeans.Fires; +import javax.webbeans.Initializer; +import javax.webbeans.Observer; +import javax.webbeans.Observes; +import javax.webbeans.Obtains; +import javax.webbeans.Produces; + +import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.bean.AbstractBean; +import org.jboss.webbeans.bean.AbstractClassBean; +import org.jboss.webbeans.bean.EnterpriseBean; +import org.jboss.webbeans.bean.EventBean; +import org.jboss.webbeans.bean.InstanceBean; +import org.jboss.webbeans.bean.NewEnterpriseBean; +import org.jboss.webbeans.bean.NewSimpleBean; +import org.jboss.webbeans.bean.ProducerFieldBean; +import org.jboss.webbeans.bean.ProducerMethodBean; +import org.jboss.webbeans.bean.SimpleBean; +import org.jboss.webbeans.ejb.EJBApiAbstraction; +import org.jboss.webbeans.event.ObserverImpl; +import org.jboss.webbeans.introspector.AnnotatedClass; +import org.jboss.webbeans.introspector.AnnotatedField; +import org.jboss.webbeans.introspector.AnnotatedItem; +import org.jboss.webbeans.introspector.AnnotatedMethod; +import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; +import org.jboss.webbeans.jsf.JSFApiAbstraction; +import org.jboss.webbeans.log.LogProvider; +import org.jboss.webbeans.log.Logging; +import org.jboss.webbeans.servlet.ServletApiAbstraction; +import org.jboss.webbeans.util.Reflections; + +public class BeanDeployer +{ + + private static final LogProvider log = Logging.getLogProvider(BeanDeployer.class); + + private final Set<AbstractBean<?, ?>> beans; + private final ManagerImpl manager; + + public BeanDeployer(ManagerImpl manager) + { + this.beans = new HashSet<AbstractBean<?,?>>(); + this.manager = manager; + } + + public void addBean(AbstractBean<?, ?> bean) + { + this.beans.add(bean); + } + + public void addBeans(Set<AbstractBean<?, ?>> beans) + { + this.beans.addAll(beans); + } + + public void addClass(Class<?> clazz) + { + AnnotatedClass<?> annotatedClass = AnnotatedClassImpl.of(clazz); + if (manager.getEjbDescriptorCache().containsKey(clazz)) + { + createBean(EnterpriseBean.of(annotatedClass, manager), annotatedClass, beans); + beans.add(NewEnterpriseBean.of(annotatedClass, manager)); + } + else if (isTypeSimpleWebBean(clazz)) + { + createBean(SimpleBean.of(annotatedClass, manager), annotatedClass, beans); + beans.add(NewSimpleBean.of(annotatedClass, manager)); + } + } + + public void addClasses(Iterable<Class<?>> classes) + { + for (Class<?> clazz : classes) + { + addClass(clazz); + } + } + + public void deploy() + { + manager.setBeans(beans); + } + + /** + * Creates a Web Bean from a bean abstraction and adds it to the set of + * created beans + * + * Also creates the implicit field- and method-level beans, if present + * + * @param bean The bean representation + * @param beans The set of created beans + */ + protected void createBean(AbstractClassBean<?> bean, AnnotatedClass<?> annotatedClass, Set<AbstractBean<?, ?>> beans) + { + + beans.add(bean); + + manager.getResolver().addInjectionPoints(bean.getAnnotatedInjectionPoints()); + + for (AnnotatedMethod<?> producerMethod : annotatedClass.getDeclaredAnnotatedMethods(Produces.class)) + { + ProducerMethodBean<?> producerMethodBean = ProducerMethodBean.of(producerMethod, bean, manager); + beans.add(producerMethodBean); + manager.getResolver().addInjectionPoints(producerMethodBean.getAnnotatedInjectionPoints()); + registerEvents(producerMethodBean.getAnnotatedInjectionPoints(), beans); + log.info("Web Bean: " + producerMethodBean); + } + for (AnnotatedField<?> producerField : annotatedClass.getDeclaredAnnotatedFields(Produces.class)) + { + ProducerFieldBean<?> producerFieldBean = ProducerFieldBean.of(producerField, bean, manager); + beans.add(producerFieldBean); + log.info("Web Bean: " + producerFieldBean); + } + for (AnnotatedItem<?, ?> injectionPoint : bean.getAnnotatedInjectionPoints()) + { + if (injectionPoint.isAnnotationPresent(Fires.class)) + { + registerEvent(injectionPoint, beans); + } + if (injectionPoint.isAnnotationPresent(Obtains.class)) + { + // TODO FIx this + @SuppressWarnings("unchecked") + InstanceBean<Object, Field> instanceBean = InstanceBean.of((AnnotatedItem) injectionPoint, manager); + beans.add(instanceBean); + log.info("Web Bean: " + instanceBean); + } + } + for (AnnotatedMethod<?> observerMethod : annotatedClass.getDeclaredMethodsWithAnnotatedParameters(Observes.class)) + { + ObserverImpl<?> observer = ObserverImpl.of(observerMethod, bean, manager); + if (observerMethod.getAnnotatedParameters(Observes.class).size() == 1) + { + registerObserver(observer, observerMethod.getAnnotatedParameters(Observes.class).get(0).getType(), observerMethod.getAnnotatedParameters(Observes.class).get(0).getBindingTypesAsArray()); + } + else + { + throw new DefinitionException("Observer method can only have one parameter annotated @Observes " + observer); + } + + } + log.info("Web Bean: " + bean); + } + + + /** + * Registers an observer with the getManager() + * + * @param observer The observer + * @param eventType The event type to observe + * @param bindings The binding types to observe on + */ + private <T> void registerObserver(Observer<T> observer, Class<?> eventType, Annotation[] bindings) + { + // TODO Fix this! + @SuppressWarnings("unchecked") + Class<T> clazz = (Class<T>) eventType; + manager.addObserver(observer, clazz, bindings); + } + + /** + * Iterates through the injection points and creates and registers any Event + * observables specified with the @Observable annotation + * + * @param injectionPoints A set of injection points to inspect + * @param beans A set of beans to add the Event beans to + */ + private void registerEvents(Set<AnnotatedItem<?, ?>> injectionPoints, Set<AbstractBean<?, ?>> beans) + { + for (AnnotatedItem<?, ?> injectionPoint : injectionPoints) + { + registerEvent(injectionPoint, beans); + } + } + + private void registerEvent(AnnotatedItem<?, ?> injectionPoint, Set<AbstractBean<?, ?>> beans) + { + if (injectionPoint.isAnnotationPresent(Fires.class)) + { + // TODO Fix this! + @SuppressWarnings("unchecked") + EventBean<Object, Method> eventBean = EventBean.of((AnnotatedItem) injectionPoint, manager); + beans.add(eventBean); + log.info("Web Bean: " + eventBean); + } + } + + /** + * Indicates if the type is a simple Web Bean + * + * @param type The type to inspect + * @return True if simple Web Bean, false otherwise + */ + private boolean isTypeSimpleWebBean(Class<?> type) + { + EJBApiAbstraction ejbApiAbstraction = new EJBApiAbstraction(manager.getResourceLoader()); + JSFApiAbstraction jsfApiAbstraction = new JSFApiAbstraction(manager.getResourceLoader()); + ServletApiAbstraction servletApiAbstraction = new ServletApiAbstraction(manager.getResourceLoader()); + // TODO: check 3.2.1 for more rules!!!!!! + return !type.isAnnotation() && !Reflections.isAbstract(type) && !servletApiAbstraction.SERVLET_CLASS.isAssignableFrom(type) && !servletApiAbstraction.FILTER_CLASS.isAssignableFrom(type) && !servletApiAbstraction.SERVLET_CONTEXT_LISTENER_CLASS.isAssignableFrom(type) && !servletApiAbstraction.HTTP_SESSION_LISTENER_CLASS.isAssignableFrom(type) && !servletApiAbstraction.SERVLET_REQUEST_LISTENER_CLASS.isAssignableFrom(type) && !ejbApiAbstraction.ENTERPRISE_BEAN_CLASS.isAssignableFrom(type) && !jsfApiAbstraction.UICOMPONENT_CLASS.isAssignableFrom(type) && hasSimpleWebBeanConstructor(type); + } + + + + private static boolean hasSimpleWebBeanConstructor(Class<?> type) + { + try + { + type.getDeclaredConstructor(); + return true; + } + catch (NoSuchMethodException nsme) + { + for (Constructor<?> c : type.getDeclaredConstructors()) + { + if (c.isAnnotationPresent(Initializer.class)) + return true; + } + return false; + } + } +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-20 14:09:25 UTC (rev 1126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-20 14:11:11 UTC (rev 1127) @@ -17,58 +17,24 @@ package org.jboss.webbeans.bootstrap; -import java.lang.annotation.Annotation; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.Arrays; import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import javax.webbeans.DefinitionException; -import javax.webbeans.Fires; -import javax.webbeans.Initializer; -import javax.webbeans.Observer; -import javax.webbeans.Observes; -import javax.webbeans.Obtains; -import javax.webbeans.Produces; -import javax.webbeans.manager.Bean; - import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.bean.AbstractBean; -import org.jboss.webbeans.bean.AbstractClassBean; -import org.jboss.webbeans.bean.EnterpriseBean; -import org.jboss.webbeans.bean.EventBean; -import org.jboss.webbeans.bean.InstanceBean; -import org.jboss.webbeans.bean.NewEnterpriseBean; -import org.jboss.webbeans.bean.NewSimpleBean; -import org.jboss.webbeans.bean.ProducerFieldBean; -import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.SimpleBean; import org.jboss.webbeans.bootstrap.spi.EjbDiscovery; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; -import org.jboss.webbeans.ejb.EJBApiAbstraction; import org.jboss.webbeans.ejb.spi.EjbResolver; -import org.jboss.webbeans.event.ObserverImpl; import org.jboss.webbeans.introspector.AnnotatedClass; -import org.jboss.webbeans.introspector.AnnotatedField; -import org.jboss.webbeans.introspector.AnnotatedItem; -import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; -import org.jboss.webbeans.jsf.JSFApiAbstraction; import org.jboss.webbeans.literal.DeployedLiteral; import org.jboss.webbeans.literal.InitializedLiteral; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; import org.jboss.webbeans.resources.spi.NamingContext; import org.jboss.webbeans.resources.spi.ResourceLoader; -import org.jboss.webbeans.servlet.ServletApiAbstraction; import org.jboss.webbeans.transaction.Transaction; import org.jboss.webbeans.util.BeanValidation; -import org.jboss.webbeans.util.Reflections; /** * Common bootstrapping functionality that is run at application startup and @@ -153,16 +119,6 @@ } /** - * Register any beans defined by the provided classes with the getManager() - * - * @param classes The classes to register - */ - protected void registerBeans(Class<?>... classes) - { - registerBeans(new HashSet<Class<?>>(Arrays.asList(classes))); - } - - /** * Register the bean with the getManager(), including any standard (built in) * beans * @@ -170,122 +126,15 @@ */ protected void registerBeans(Iterable<Class<?>> classes) { - Set<AbstractBean<?, ?>> beans = createBeans(classes); - beans.addAll(createStandardBeans()); - getManager().setBeans(beans); + BeanDeployer beanDeployer = new BeanDeployer(manager); + beanDeployer.addClasses(classes); + beanDeployer.addBean(ManagerBean.of(manager)); + beanDeployer.addClass(Transaction.class); + beanDeployer.deploy(); } - /** - * Creates the standard beans used internally by the RI - * - * @return A set containing the created beans - */ - protected Set<AbstractBean<?, ?>> createStandardBeans() - { - Set<AbstractBean<?, ?>> beans = new HashSet<AbstractBean<?, ?>>(); - createSimpleBean(Transaction.class, beans); - beans.add(ManagerBean.of(manager)); - return beans; - } - - private <T> void createSimpleBean(Class<T> clazz, Set<AbstractBean<?, ?>> beans) - { - AnnotatedClass<T> annotatedClass = AnnotatedClassImpl.of(clazz); - createBean(SimpleBean.of(annotatedClass, manager), annotatedClass, beans); - } - - /** - * Creates Web Beans from a set of classes - * - * Iterates over the classes and creates a Web Bean of the corresponding - * type. Also register the beans injection points with the resolver. If the - * bean has producer methods, producer beans are created for these and those - * injection points are also registered. - * - * @param classes The classes to adapt - * @return A set of adapted Web Beans - */ - protected Set<AbstractBean<?, ?>> createBeans(Iterable<Class<?>> classes) - { - Set<AbstractBean<?, ?>> beans = new HashSet<AbstractBean<?, ?>>(); - for (Class<?> clazz : classes) - { - AnnotatedClass<?> annotatedClass = AnnotatedClassImpl.of(clazz); - if (getManager().getEjbDescriptorCache().containsKey(clazz)) - { - createBean(EnterpriseBean.of(annotatedClass, getManager()), annotatedClass, beans); - beans.add(NewEnterpriseBean.of(annotatedClass, manager)); - } - else if (isTypeSimpleWebBean(clazz)) - { - createBean(SimpleBean.of(annotatedClass, manager), annotatedClass, beans); - beans.add(NewSimpleBean.of(annotatedClass, manager)); - } - } - return beans; - } - - /** - * Creates a Web Bean from a bean abstraction and adds it to the set of - * created beans - * - * Also creates the implicit field- and method-level beans, if present - * - * @param bean The bean representation - * @param beans The set of created beans - */ - protected void createBean(AbstractClassBean<?> bean, AnnotatedClass<?> annotatedClass, Set<AbstractBean<?, ?>> beans) - { - beans.add(bean); - getManager().getResolver().addInjectionPoints(bean.getAnnotatedInjectionPoints()); - for (AnnotatedMethod<?> producerMethod : annotatedClass.getDeclaredAnnotatedMethods(Produces.class)) - { - ProducerMethodBean<?> producerMethodBean = ProducerMethodBean.of(producerMethod, bean, getManager()); - beans.add(producerMethodBean); - getManager().getResolver().addInjectionPoints(producerMethodBean.getAnnotatedInjectionPoints()); - registerEvents(producerMethodBean.getAnnotatedInjectionPoints(), beans); - log.info("Web Bean: " + producerMethodBean); - } - for (AnnotatedField<?> producerField : annotatedClass.getDeclaredAnnotatedFields(Produces.class)) - { - ProducerFieldBean<?> producerFieldBean = ProducerFieldBean.of(producerField, bean, getManager()); - beans.add(producerFieldBean); - log.info("Web Bean: " + producerFieldBean); - } - for (AnnotatedItem<?, ?> injectionPoint : bean.getAnnotatedInjectionPoints()) - { - if (injectionPoint.isAnnotationPresent(Fires.class)) - { - registerEvent(injectionPoint, beans); - } - if (injectionPoint.isAnnotationPresent(Obtains.class)) - { - // TODO FIx this - @SuppressWarnings("unchecked") - InstanceBean<Object, Field> instanceBean = InstanceBean.of((AnnotatedItem) injectionPoint, getManager()); - beans.add(instanceBean); - log.info("Web Bean: " + instanceBean); - } - } - for (AnnotatedMethod<?> observerMethod : annotatedClass.getDeclaredMethodsWithAnnotatedParameters(Observes.class)) - { - ObserverImpl<?> observer = ObserverImpl.of(observerMethod, bean, getManager()); - if (observerMethod.getAnnotatedParameters(Observes.class).size() == 1) - { - registerObserver(observer, observerMethod.getAnnotatedParameters(Observes.class).get(0).getType(), observerMethod.getAnnotatedParameters(Observes.class).get(0).getBindingTypesAsArray()); - } - else - { - throw new DefinitionException("Observer method can only have one parameter annotated @Observes " + observer); - } - - } - log.info("Web Bean: " + bean); - } - - /** * Starts the boot process. * * Discovers the beans and registers them with the getManager(). Also @@ -304,7 +153,6 @@ getManager().getEjbDescriptorCache().addAll(getEjbDiscovery().discoverEjbs()); registerBeans(getWebBeanDiscovery().discoverWebBeanClasses()); getManager().fireEvent(getManager(), new InitializedLiteral()); - List<Bean<?>> beans = getManager().getBeans(); log.info("Web Beans initialized. Validating beans."); getManager().getResolver().resolveInjectionPoints(); BeanValidation.validate(getManager().getBeans()); @@ -323,79 +171,4 @@ return pkg != null ? pkg.getImplementationVersion() : null; } - /** - * Registers an observer with the getManager() - * - * @param observer The observer - * @param eventType The event type to observe - * @param bindings The binding types to observe on - */ - private <T> void registerObserver(Observer<T> observer, Class<?> eventType, Annotation[] bindings) - { - // TODO Fix this! - @SuppressWarnings("unchecked") - Class<T> clazz = (Class<T>) eventType; - getManager().addObserver(observer, clazz, bindings); - } - - /** - * Iterates through the injection points and creates and registers any Event - * observables specified with the @Observable annotation - * - * @param injectionPoints A set of injection points to inspect - * @param beans A set of beans to add the Event beans to - */ - private void registerEvents(Set<AnnotatedItem<?, ?>> injectionPoints, Set<AbstractBean<?, ?>> beans) - { - for (AnnotatedItem<?, ?> injectionPoint : injectionPoints) - { - registerEvent(injectionPoint, beans); - } - } - - private void registerEvent(AnnotatedItem<?, ?> injectionPoint, Set<AbstractBean<?, ?>> beans) - { - if (injectionPoint.isAnnotationPresent(Fires.class)) - { - // TODO Fix this! - @SuppressWarnings("unchecked") - EventBean<Object, Method> eventBean = EventBean.of((AnnotatedItem) injectionPoint, getManager()); - beans.add(eventBean); - log.info("Web Bean: " + eventBean); - } - } - - /** - * Indicates if the type is a simple Web Bean - * - * @param type The type to inspect - * @return True if simple Web Bean, false otherwise - */ - protected boolean isTypeSimpleWebBean(Class<?> type) - { - EJBApiAbstraction ejbApiAbstraction = new EJBApiAbstraction(getResourceLoader()); - JSFApiAbstraction jsfApiAbstraction = new JSFApiAbstraction(getResourceLoader()); - ServletApiAbstraction servletApiAbstraction = new ServletApiAbstraction(getResourceLoader()); - // TODO: check 3.2.1 for more rules!!!!!! - return !type.isAnnotation() && !Reflections.isAbstract(type) && !servletApiAbstraction.SERVLET_CLASS.isAssignableFrom(type) && !servletApiAbstraction.FILTER_CLASS.isAssignableFrom(type) && !servletApiAbstraction.SERVLET_CONTEXT_LISTENER_CLASS.isAssignableFrom(type) && !servletApiAbstraction.HTTP_SESSION_LISTENER_CLASS.isAssignableFrom(type) && !servletApiAbstraction.SERVLET_REQUEST_LISTENER_CLASS.isAssignableFrom(type) && !ejbApiAbstraction.ENTERPRISE_BEAN_CLASS.isAssignableFrom(type) && !jsfApiAbstraction.UICOMPONENT_CLASS.isAssignableFrom(type) && hasSimpleWebBeanConstructor(type); - } - - private static boolean hasSimpleWebBeanConstructor(Class<?> type) - { - try - { - type.getDeclaredConstructor(); - return true; - } - catch (NoSuchMethodException nsme) - { - for (Constructor<?> c : type.getDeclaredConstructors()) - { - if (c.isAnnotationPresent(Initializer.class)) - return true; - } - return false; - } - } - } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java 2009-01-20 14:09:25 UTC (rev 1126) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java 2009-01-20 14:11:11 UTC (rev 1127) @@ -171,7 +171,6 @@ this.resourceLoader = new MockResourceLoader(); this.mockNaming = new MockNaming(); initManager(mockNaming, MOCK_EJB_RESOLVER, resourceLoader); - registerStandardBeans(); setupContexts(); } @@ -183,11 +182,6 @@ getManager().addContext(new MockDependentContext()); } - protected void registerStandardBeans() - { - getManager().setBeans(createStandardBeans()); - } - public void setWebBeanDiscovery(WebBeanDiscovery webBeanDiscovery) { this.webBeanDiscovery = webBeanDiscovery; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java 2009-01-20 14:09:25 UTC (rev 1126) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java 2009-01-20 14:11:11 UTC (rev 1127) @@ -7,9 +7,20 @@ public class ManagerTest extends AbstractTest { @Test(groups={"manager", "injection", "deployment"}) @SpecAssertion(section="5.8") - public void testInjectingManager() + public void testInjectingManager() throws Exception { - FishFarmOffice fishFarmOffice = createSimpleBean(FishFarmOffice.class).create(); - assert fishFarmOffice.manager != null; + deployBeans(FishFarmOffice.class); + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + FishFarmOffice fishFarmOffice = manager.getInstanceByType(FishFarmOffice.class); + assert fishFarmOffice.manager != null; + } + + }.run(); + } }

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1126 - doc/trunk/reference/ko-KR.

by webbeans-commits＠lists.jboss.org

Author: eukim Date: 2009-01-20 09:09:25 -0500 (Tue, 20 Jan 2009) New Revision: 1126 Modified: doc/trunk/reference/ko-KR/ri.po Log: updated Modified: doc/trunk/reference/ko-KR/ri.po =================================================================== --- doc/trunk/reference/ko-KR/ri.po 2009-01-20 13:33:35 UTC (rev 1125) +++ doc/trunk/reference/ko-KR/ri.po 2009-01-20 14:09:25 UTC (rev 1126) @@ -8,7 +8,7 @@ "Project-Id-Version: ri\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2009-01-18 16:31+0000\n" -"PO-Revision-Date: 2009-01-20 22:51+1000\n" +"PO-Revision-Date: 2009-01-21 00:08+1000\n" "Last-Translator: Eunju Kim <eukim(a)redhat.com>\n" "Language-Team: Korean <ko(a)li.org>\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ "<literal>webbeans-numberguess</literal>, a war example, containing only " "simple beans, and <literal>webbeans-translator</literal> an ear example, " "containing enterprise beans. To run the examples you'll need the following:" -msgstr "Web Beans RI는 배포 가능한 두 가지 애플리케이션 예로 되어 있습니다: war 예에는 단순한 beans만이 들어 있는 <literal>webbeans-numberguess</literal>가 있고, ear 예에는 엔터프라이즈 beans가 들어 있는 <literal>webbeans-translator</literal>가 있습니다. 예를 실행하려면, 다음 사항이 필요합니다: " +msgstr "Web Beans RI는 배포 가능한 두 가지 애플리케이션 예로 되어 있습니다: war 예에는 단순한 beans 만이 들어 있는 <literal>webbeans-numberguess</literal>가 있고 ear 예에는 엔터프라이즈 beans가 들어 있는 <literal>webbeans-translator</literal>가 있습니다. 예를 실행하려면, 다음 사항이 필요합니다: " #. Tag: para #: ri.xml:22 @@ -143,6 +143,8 @@ "container and discover which EJBs are installed in your application. " "Secondly, an update to JBoss EJB3 is needed." msgstr "" +"현재, 두 가지 사항을 업데이트해야 합니다. 처음으로, 새로운 개발자 <literal>webbeans.deployer</literal>가 추가되어야 합니다. 이는 JBoss AS에 Web " +"Bean 아카이브 지원을 추가하고 Web Beans RI가 EJB3 컨테이너를 커리하고 애플리케이션에 어떤 EJB가 있는 지를 검색합니다. 두번째로 JBoss EJB3로 업데이트해야 합니다. " #. Tag: para #: ri.xml:74 @@ -150,7 +152,7 @@ msgid "" "To install the update, you'll need Ant 1.7.0 installed, and the " "<literal>ANT_HOME</literal> environment variable set. For example:" -msgstr "" +msgstr "업데이트를 설치하려면, Ant 1.7.0을 설치하고 <literal>ANT_HOME</literal> 환경 변수 모음을 설치합니다. 예: " #. Tag: programlisting #: ri.xml:79 @@ -168,7 +170,7 @@ msgid "" "Then, you can install the update. The update script will use Maven to " "download the Web Beans and EJB3 automatically." -msgstr "" +msgstr "그 다음 업데이트를 설치하실 수 있습니다. 업데이트 스크립트는 Maven을 사용하여 Web Beans 및 EJB3를 자동으로 다운로드합니다. " #. Tag: programlisting #: ri.xml:86 @@ -184,19 +186,19 @@ #: ri.xml:88 #, no-c-format msgid "Now, you're ready to deploy your first example!" -msgstr "" +msgstr "이제, 첫번째 예를 배포할 준비가 되었습니다! " #. Tag: para #: ri.xml:93 #, no-c-format msgid "The build scripts for the examples offer a number of targets, these are:" -msgstr "" +msgstr "예시 용 작성 스크립트는 여러 대상을 제공합니다. 이에는 다음과 같은 것이 있습니다: " #. Tag: para #: ri.xml:99 #, no-c-format msgid "<literal>ant restart</literal> - deploy the example in exploded format" -msgstr "" +msgstr "<literal>ant restart</literal> - exploded format으로 예제를 배포합니다 " #. Tag: para #: ri.xml:105 @@ -204,31 +206,31 @@ msgid "" "<literal>ant explode</literal> - update an exploded example, without " "restarting the deployment" -msgstr "" +msgstr "<literal>ant explode</literal> - 배포 버전을 다시 시작하지 않고 exploded 예를 업데이트합니다 " #. Tag: para #: ri.xml:111 #, no-c-format msgid "<literal>ant deploy</literal> - deploy the example in compressed jar format" -msgstr "" +msgstr "<literal>ant deploy</literal> - 압축된 jar 포맷으로 예제를 배포합니다 " #. Tag: para #: ri.xml:116 #, no-c-format msgid "<literal>ant undeploy</literal> - remove the example from the server" -msgstr "" +msgstr "<literal>ant undeploy</literal> - 서버에서 예제를 제거합니다 " #. Tag: para #: ri.xml:121 #, no-c-format msgid "<literal>ant clean</literal> - clean the example" -msgstr "" +msgstr "<literal>ant clean</literal> - 예제를 지웁니다 " #. Tag: para #: ri.xml:128 #, no-c-format msgid "To deploy the numberguess example:" -msgstr "" +msgstr "numberguess 예를 배포하려면: " #. Tag: programlisting #: ri.xml:132

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1125 - doc/trunk/reference/ko-KR.

by webbeans-commits＠lists.jboss.org

Author: eukim Date: 2009-01-20 08:33:35 -0500 (Tue, 20 Jan 2009) New Revision: 1125 Modified: doc/trunk/reference/ko-KR/ri.po Log: updated Modified: doc/trunk/reference/ko-KR/ri.po =================================================================== --- doc/trunk/reference/ko-KR/ri.po 2009-01-20 13:32:26 UTC (rev 1124) +++ doc/trunk/reference/ko-KR/ri.po 2009-01-20 13:33:35 UTC (rev 1125) @@ -8,7 +8,7 @@ "Project-Id-Version: ri\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2009-01-18 16:31+0000\n" -"PO-Revision-Date: 2009-01-19 22:26+1000\n" +"PO-Revision-Date: 2009-01-20 22:51+1000\n" "Last-Translator: Eunju Kim <eukim(a)redhat.com>\n" "Language-Team: Korean <ko(a)li.org>\n" "MIME-Version: 1.0\n" @@ -17,6 +17,7 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n\n" "\n" +"\n" #. Tag: title #: ri.xml:4 @@ -33,6 +34,9 @@ "download the latest developer release of Web Beans from the <ulink url=" "\"http://seamframework.org/Download\">the downloads page</ulink>." msgstr "" +"Web Beans 참조 구현 (Web Beans Reference Implementation)은 <ulink url=" +"\"http://seamframework.org/WebBeans\">Seam 프로젝트</ulink>에서 개발되고 있습니다. <ulink url=" +"\"http://seamframework.org/Download\">다운로드 페이지</ulink>에서 최신 개발자 릴리즈를 다운로드하실 수 있습니다. " #. Tag: para #: ri.xml:13 @@ -42,13 +46,13 @@ "<literal>webbeans-numberguess</literal>, a war example, containing only " "simple beans, and <literal>webbeans-translator</literal> an ear example, " "containing enterprise beans. To run the examples you'll need the following:" -msgstr "" +msgstr "Web Beans RI는 배포 가능한 두 가지 애플리케이션 예로 되어 있습니다: war 예에는 단순한 beans만이 들어 있는 <literal>webbeans-numberguess</literal>가 있고, ear 예에는 엔터프라이즈 beans가 들어 있는 <literal>webbeans-translator</literal>가 있습니다. 예를 실행하려면, 다음 사항이 필요합니다: " #. Tag: para #: ri.xml:22 #, no-c-format msgid "the latest release of the Web Beans RI," -msgstr "" +msgstr "최신 Web Beans RI 릴리즈 " #. Tag: para #: ri.xml:25 @@ -70,6 +74,8 @@ "need to download JBoss AS 5.0.0.GA from <ulink url=\"http://www.jboss.org/" "jbossas/downloads/\">jboss.org</ulink>, and unzip it. For example:" msgstr "" +"현재, Web Beans RI는 JBoss Application Server 5에서만 실행됩니다. <ulink url=\"http://www.jboss.org/" +"jbossas/downloads/\">jboss.org</ulink>에서 JBoss AS 5.0.0.GA를 다운로드하여 압축 풀기를 합니다. 예: " #. Tag: programlisting #: ri.xml:39 @@ -88,6 +94,8 @@ "Next, download the Web Beans RI from <ulink url=\"http://seamframework.org/" "Download\">seamframework.org</ulink>, and unzip it. For example" msgstr "" +"다음으로 <ulink url=\"http://seamframework.org/" +"Download\">seamframework.org</ulink>에서 Web Beans RI를 다운로드하여 압축 풀기를 합니다. 예: " #. Tag: programlisting #: ri.xml:47 @@ -107,6 +115,8 @@ "as/build.properties</literal> and set the <literal>jboss.home</literal> " "property. For example:" msgstr "" +"다음으로, JBoss가 위치해 있는 곳을 Web Beans에게 알려야 합니다. <literal>jboss-" +"as/build.properties</literal>를 편집하고 <literal>jboss.home</literal> 속성을 설정합니다. 예: " #. Tag: programlisting #: ri.xml:56 @@ -121,7 +131,7 @@ "As Web Beans is a new piece of software, you need to update JBoss AS to run " "the Web Beans RI. Future versions of JBoss AS will include these updates, " "and this step won't be necessary." -msgstr "" +msgstr "Web Beans는 새로운 소프트웨어이므로, Web Beans RI를 실행하기 위해 JBoss AS를 업데이트해야 합니다. 향후 JBoss AS 버전에는 이러한 업데이트가 포함되어 있으므로, 이러한 작업 단계는 필요하지 않게 됩니다. " #. Tag: para #: ri.xml:65

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1124 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-20 08:32:26 -0500 (Tue, 20 Jan 2009) New Revision: 1124 Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java Log: mark test broken Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-01-20 13:29:47 UTC (rev 1123) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-01-20 13:32:26 UTC (rev 1124) @@ -73,7 +73,7 @@ /** * */ - @Test(groups = { "events", "integration" }) + @Test(groups = { "events", "integration" , "broken"}) @SpecAssertion(section = "8.5.7") public void testEnterpriseBeanObserverMethodCalledWithCallerContext() {

16 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1123 - tck/trunk/impl/src/main/resources.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-01-20 08:29:47 -0500 (Tue, 20 Jan 2009) New Revision: 1123 Modified: tck/trunk/impl/src/main/resources/tck-unit-tests.xml Log: Renable integration tests!!!! Modified: tck/trunk/impl/src/main/resources/tck-unit-tests.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-unit-tests.xml 2009-01-20 13:26:28 UTC (rev 1122) +++ tck/trunk/impl/src/main/resources/tck-unit-tests.xml 2009-01-20 13:29:47 UTC (rev 1123) @@ -34,7 +34,7 @@ </groups> <packages> <package name="org.jboss.webbeans.tck.unit" /> -  + <package name="org.jboss.webbeans.tck.integration" /> </packages> </test>

16 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits January 2009