Branch: refs/heads/master Home: https://github.com/weld/core Commit: f413c384e1aadeddac382a7e393e0f3a726c3730 https://github.com/weld/core/commit/f413c384e1aadeddac382a7e393e0f3a726c3730 Author: Jozef Hartinger <jharting(a)redhat.com&gt; Date: 2013-08-01 (Thu, 01 Aug 2013) Changed paths: M pom.xml Log Message: ----------- Use Weld API 2.1.Alpha1 Commit: 88f32d559a2061c822f89a47e5bbd6c85270c44c https://github.com/weld/core/commit/88f32d559a2061c822f89a47e5bbd6c85270c44c Author: Stuart Douglas <stuart.w.douglas(a)gmail.com&gt; Date: 2013-08-01 (Thu, 01 Aug 2013) Changed paths: M .gitignore M environments/se/core/src/main/java/org/jboss/weld/environment/se/contexts/ThreadContext.java M impl/src/main/java/org/jboss/weld/Container.java M impl/src/main/java/org/jboss/weld/annotated/enhanced/jlr/AbstractEnhancedAnnotated.java M impl/src/main/java/org/jboss/weld/annotated/slim/AnnotatedTypeIdentifier.java M impl/src/main/java/org/jboss/weld/annotated/slim/SlimAnnotatedType.java M impl/src/main/java/org/jboss/weld/annotated/slim/backed/BackedAnnotatedType.java M impl/src/main/java/org/jboss/weld/annotated/slim/unbacked/UnbackedAnnotated.java M impl/src/main/java/org/jboss/weld/annotated/slim/unbacked/UnbackedAnnotatedConstructor.java M impl/src/main/java/org/jboss/weld/annotated/slim/unbacked/UnbackedAnnotatedField.java M impl/src/main/java/org/jboss/weld/annotated/slim/unbacked/UnbackedAnnotatedMethod.java M impl/src/main/java/org/jboss/weld/annotated/slim/unbacked/UnbackedAnnotatedType.java M impl/src/main/java/org/jboss/weld/annotated/slim/unbacked/UnbackedMemberIdentifier.java M impl/src/main/java/org/jboss/weld/bean/AbstractBean.java M impl/src/main/java/org/jboss/weld/bean/ManagedBean.java M impl/src/main/java/org/jboss/weld/bean/ProducerField.java M impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java M impl/src/main/java/org/jboss/weld/bean/builtin/AbstractFacadeBean.java M impl/src/main/java/org/jboss/weld/bean/builtin/AbstractStaticallyDecorableBuiltInBean.java M impl/src/main/java/org/jboss/weld/bean/builtin/BeanManagerProxy.java M impl/src/main/java/org/jboss/weld/bean/builtin/BeanMetadataBean.java M impl/src/main/java/org/jboss/weld/bean/builtin/DecoratorMetadataBean.java M impl/src/main/java/org/jboss/weld/bean/builtin/ExtensionBean.java M impl/src/main/java/org/jboss/weld/bean/builtin/FacadeInjectionPoint.java M impl/src/main/java/org/jboss/weld/bean/builtin/InjectionPointBean.java M impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java M impl/src/main/java/org/jboss/weld/bean/builtin/InterceptedBeanMetadataBean.java M impl/src/main/java/org/jboss/weld/bean/builtin/InterceptorMetadataBean.java M impl/src/main/java/org/jboss/weld/bean/builtin/ee/AbstractEEBean.java M impl/src/main/java/org/jboss/weld/bean/builtin/ee/EEResourceProducerField.java M impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyFactory.java M impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyProvider.java M impl/src/main/java/org/jboss/weld/bean/proxy/ContextBeanInstance.java M impl/src/main/java/org/jboss/weld/bean/proxy/DecorationHelper.java M impl/src/main/java/org/jboss/weld/bean/proxy/DecoratorProxyFactory.java M impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseProxyFactory.java M impl/src/main/java/org/jboss/weld/bean/proxy/InjectionPointPropagatingEnterpriseTargetBeanInstance.java M impl/src/main/java/org/jboss/weld/bean/proxy/InterceptedSubclassFactory.java M impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java M impl/src/main/java/org/jboss/weld/bean/proxy/ProxyMethodHandler.java M impl/src/main/java/org/jboss/weld/bean/proxy/TargetBeanInstance.java M impl/src/main/java/org/jboss/weld/bean/proxy/util/SerializableClientProxy.java M impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java M impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java M impl/src/main/java/org/jboss/weld/bootstrap/Validator.java M impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java M impl/src/main/java/org/jboss/weld/context/AbstractBoundContext.java M impl/src/main/java/org/jboss/weld/context/AbstractContext.java M impl/src/main/java/org/jboss/weld/context/AbstractConversationContext.java M impl/src/main/java/org/jboss/weld/context/AbstractManagedContext.java M impl/src/main/java/org/jboss/weld/context/AbstractSharedContext.java M impl/src/main/java/org/jboss/weld/context/AbstractUnboundContext.java M impl/src/main/java/org/jboss/weld/context/SerializableContextualFactory.java M impl/src/main/java/org/jboss/weld/context/SerializableContextualInstanceImpl.java M impl/src/main/java/org/jboss/weld/context/bound/BoundConversationContextImpl.java M impl/src/main/java/org/jboss/weld/context/bound/BoundRequestContextImpl.java M impl/src/main/java/org/jboss/weld/context/bound/BoundSessionContextImpl.java M impl/src/main/java/org/jboss/weld/context/ejb/EjbRequestContextImpl.java M impl/src/main/java/org/jboss/weld/context/http/HttpConversationContextImpl.java M impl/src/main/java/org/jboss/weld/context/http/HttpRequestContextImpl.java M impl/src/main/java/org/jboss/weld/context/http/HttpSessionContextImpl.java M impl/src/main/java/org/jboss/weld/context/http/HttpSessionDestructionContext.java M impl/src/main/java/org/jboss/weld/context/unbound/ApplicationContextImpl.java M impl/src/main/java/org/jboss/weld/context/unbound/DependentContextImpl.java M impl/src/main/java/org/jboss/weld/context/unbound/RequestContextImpl.java M impl/src/main/java/org/jboss/weld/context/unbound/SingletonContextImpl.java M impl/src/main/java/org/jboss/weld/ejb/SessionBeanInterceptor.java M impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java M impl/src/main/java/org/jboss/weld/event/EventImpl.java M impl/src/main/java/org/jboss/weld/event/ExtensionObserverMethodImpl.java M impl/src/main/java/org/jboss/weld/event/GlobalObserverNotifierService.java M impl/src/main/java/org/jboss/weld/event/ObserverNotifier.java M impl/src/main/java/org/jboss/weld/event/TransactionalObserverNotifier.java M impl/src/main/java/org/jboss/weld/injection/DynamicInjectionPoint.java M impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java M impl/src/main/java/org/jboss/weld/injection/ProxyClassConstructorInjectionPointWrapper.java M impl/src/main/java/org/jboss/weld/injection/attributes/AbstractInferingInjectionPointAttributes.java M impl/src/main/java/org/jboss/weld/injection/attributes/InferingFieldInjectionPointAttributes.java M impl/src/main/java/org/jboss/weld/injection/attributes/InferingParameterInjectionPointAttributes.java M impl/src/main/java/org/jboss/weld/injection/producer/AbstractDecoratorApplyingInstantiator.java M impl/src/main/java/org/jboss/weld/injection/producer/BeanInjectionTarget.java M impl/src/main/java/org/jboss/weld/injection/producer/DecoratorInjectionTarget.java M impl/src/main/java/org/jboss/weld/injection/producer/InjectionTargetService.java M impl/src/main/java/org/jboss/weld/injection/producer/StatelessSessionBeanInjector.java M impl/src/main/java/org/jboss/weld/injection/producer/SubclassDecoratorApplyingInstantiator.java M impl/src/main/java/org/jboss/weld/injection/producer/SubclassedComponentInstantiator.java M impl/src/main/java/org/jboss/weld/injection/producer/ejb/SessionBeanInjectionTarget.java M impl/src/main/java/org/jboss/weld/injection/producer/ejb/SessionBeanProxyInstantiator.java M impl/src/main/java/org/jboss/weld/interceptor/reader/DefaultMethodMetadata.java M impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java M impl/src/main/java/org/jboss/weld/resolution/InterceptorResolvableBuilder.java M impl/src/main/java/org/jboss/weld/resources/ClassTransformer.java M impl/src/main/java/org/jboss/weld/resources/ManagerObjectFactory.java M impl/src/main/java/org/jboss/weld/resources/SharedObjectCache.java M impl/src/main/java/org/jboss/weld/resources/SharedObjectFacade.java M impl/src/main/java/org/jboss/weld/serialization/BeanHolder.java M impl/src/main/java/org/jboss/weld/serialization/ContextualStoreImpl.java M impl/src/main/java/org/jboss/weld/serialization/InjectionPointHolder.java M impl/src/main/java/org/jboss/weld/util/Beans.java M impl/src/main/java/org/jboss/weld/util/Proxies.java M impl/src/main/java/org/jboss/weld/util/bean/SerializableForwardingBean.java M impl/src/main/java/org/jboss/weld/util/bean/SerializableForwardingInjectionPoint.java M impl/src/main/java/org/jboss/weld/util/reflection/instantiation/DefaultInstantiatorFactory.java M impl/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/WeldClassTest.java M impl/src/test/java/org/jboss/weld/tests/unit/reflection/method/WeldMethodTest.java M jsf/src/main/java/org/jboss/weld/jsf/ConversationAwareViewHandler.java M jsf/src/main/java/org/jboss/weld/servlet/ConversationPropagationFilter.java M tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java M tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/generic/SimpleWeldClassTest.java M tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/hierarchical/SimpleWeldClassTest.java M tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/simple/SimpleInterceptorTest.java M tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/weld1019/MyScopeContext.java M tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/ResolutionTest.java M tests-arquillian/src/test/java/org/jboss/weld/tests/stereotypes/StereotypesTest.java M tests/src/main/java/org/jboss/weld/mock/cluster/SwitchableSingletonProvider.java M tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/AccessibleManagerResolutionTest.java M tests/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java Log Message: ----------- WELD-962 Use the new Singleton API and use contextual ID Conflicts: impl/src/main/java/org/jboss/weld/annotated/enhanced/TypeClosureLazyValueHolder.java impl/src/main/java/org/jboss/weld/annotated/enhanced/jlr/AbstractEnhancedAnnotated.java impl/src/main/java/org/jboss/weld/annotated/enhanced/jlr/AbstractEnhancedAnnotatedMember.java impl/src/main/java/org/jboss/weld/annotated/enhanced/jlr/EnhancedAnnotatedParameterImpl.java impl/src/main/java/org/jboss/weld/annotated/enhanced/jlr/EnhancedAnnotationImpl.java impl/src/main/java/org/jboss/weld/bean/AbstractBean.java impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java impl/src/main/java/org/jboss/weld/bean/DecoratorImpl.java impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java impl/src/main/java/org/jboss/weld/bean/ManagedBean.java impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java impl/src/main/java/org/jboss/weld/bean/SessionBean.java impl/src/main/java/org/jboss/weld/bean/builtin/AbstractBuiltInBean.java impl/src/main/java/org/jboss/weld/bean/builtin/AbstractFacadeBean.java impl/src/main/java/org/jboss/weld/bean/builtin/InjectionPointBean.java impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java impl/src/main/java/org/jboss/weld/bean/builtin/ee/AbstractEEBean.java impl/src/main/java/org/jboss/weld/bean/builtin/ee/EEResourceProducerField.java impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyProvider.java impl/src/main/java/org/jboss/weld/bean/proxy/DecoratorProxyFactory.java impl/src/main/java/org/jboss/weld/bean/proxy/InterceptedSubclassFactory.java impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java impl/src/main/java/org/jboss/weld/bean/proxy/ProxyMethodHandler.java impl/src/main/java/org/jboss/weld/bean/proxy/TargetBeanInstance.java impl/src/main/java/org/jboss/weld/bean/proxy/util/SerializableClientProxy.java impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployer.java impl/src/main/java/org/jboss/weld/bootstrap/Validator.java impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java impl/src/main/java/org/jboss/weld/context/AbstractBoundContext.java impl/src/main/java/org/jboss/weld/context/AbstractConversationContext.java impl/src/main/java/org/jboss/weld/context/SerializableContextualImpl.java impl/src/main/java/org/jboss/weld/context/SerializableContextualInstanceImpl.java impl/src/main/java/org/jboss/weld/ejb/SessionBeanInterceptor.java impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java impl/src/main/java/org/jboss/weld/event/EventImpl.java impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java impl/src/main/java/org/jboss/weld/injection/ProxyClassConstructorInjectionPointWrapper.java impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWeldCallable.java impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java impl/src/main/java/org/jboss/weld/manager/InjectionTargetValidator.java impl/src/main/java/org/jboss/weld/manager/SimpleInjectionTarget.java impl/src/main/java/org/jboss/weld/resolution/InterceptorResolvableBuilder.java impl/src/main/java/org/jboss/weld/resolution/ResolvableBuilder.java impl/src/main/java/org/jboss/weld/resources/ClassTransformer.java impl/src/main/java/org/jboss/weld/resources/SharedObjectFacade.java impl/src/main/java/org/jboss/weld/serialization/ContextualStoreImpl.java impl/src/main/java/org/jboss/weld/servlet/WeldListener.java impl/src/main/java/org/jboss/weld/util/Beans.java impl/src/test/java/org/jboss/weld/tests/unit/reflection/clazz/WeldClassTest.java impl/src/test/java/org/jboss/weld/tests/unit/reflection/method/WeldMethodTest.java pom.xml tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/generic/SimpleWeldClassTest.java tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/hierarchical/SimpleWeldClassTest.java tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/simple/SimpleInterceptorTest.java tests-arquillian/src/test/java/org/jboss/weld/tests/stereotypes/StereotypesTest.java tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/AccessibleManagerResolutionTest.java tests/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java Conflicts: impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java impl/src/main/java/org/jboss/weld/context/http/HttpSessionContextImpl.java Commit: b815e9c5e9fff7942a74b0e2ab423a4a8ffda7c4 https://github.com/weld/core/commit/b815e9c5e9fff7942a74b0e2ab423a4a8ffda7c4 Author: Jozef Hartinger <jharting(a)redhat.com&gt; Date: 2013-08-01 (Thu, 01 Aug 2013) Changed paths: M impl/src/main/java/org/jboss/weld/Container.java M impl/src/main/java/org/jboss/weld/annotated/slim/SlimAnnotatedType.java M impl/src/main/java/org/jboss/weld/annotated/slim/unbacked/UnbackedMemberIdentifier.java M impl/src/main/java/org/jboss/weld/bean/builtin/BeanManagerProxy.java M impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyProvider.java M impl/src/main/java/org/jboss/weld/bean/proxy/util/SerializableClientProxy.java M impl/src/main/java/org/jboss/weld/event/ExtensionObserverMethodImpl.java M impl/src/main/java/org/jboss/weld/injection/producer/InjectionTargetService.java M impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java M impl/src/main/java/org/jboss/weld/util/Proxies.java Log Message: ----------- WELD-1475 Initial OSGi support Compare: https://github.com/weld/core/compare/d7ef40828287...b815e9c5e9ff