[weld-commits] [weld/core] 26658e: Upgrade Weld API to 2.1-SNAPSHOT

GitHub noreply at github.com
Sat Jul 20 05:15:11 EDT 2013


  Branch: refs/heads/weld-osgi-2.x
  Home:   https://github.com/weld/core
  Commit: 26658e4b90389c1f61842ff39a9a7ae742145022
      https://github.com/weld/core/commit/26658e4b90389c1f61842ff39a9a7ae742145022
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Upgrade Weld API to 2.1-SNAPSHOT


  Commit: 67b5bc7baa17e6704ee416c3afc0cfa80e7797b4
      https://github.com/weld/core/commit/67b5bc7baa17e6704ee416c3afc0cfa80e7797b4
  Author: Stuart Douglas <stuart.w.douglas at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 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/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


  Commit: c343ceaf8f9880ed9549835d60ffbc1bc5fb9aec
      https://github.com/weld/core/commit/c343ceaf8f9880ed9549835d60ffbc1bc5fb9aec
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    A environments/osgi/build/pom.xml
    A environments/osgi/core/api/pom.xml
    A environments/osgi/core/extension/pom.xml
    A environments/osgi/core/integration/pom.xml
    A environments/osgi/core/pom.xml
    A environments/osgi/core/spi/pom.xml

  Log Message:
  -----------
  Add Weld-OSGi architecture


  Commit: e98eea2816a4628c0b3cfc24675d87e0910e0296
      https://github.com/weld/core/commit/e98eea2816a4628c0b3cfc24675d87e0910e0296
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/build/pom.xml
    M environments/osgi/core/api/pom.xml
    A environments/osgi/core/api/src/etc/header.txt
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/BundleState.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/Registration.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/RegistrationHolder.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/Service.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/ServiceRegistry.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleDataFile.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleHeader.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleHeaders.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleName.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleVersion.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Filter.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/OSGiBundle.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/OSGiService.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Properties.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Property.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Publish.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Required.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Sent.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Specification.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/AbstractBundleContainerEvent.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/AbstractBundleEvent.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/AbstractServiceEvent.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/BundleContainerEventType.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/BundleContainerEvents.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/BundleEventType.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/BundleEvents.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/InterBundleEvent.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/Invalid.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/ServiceEventType.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/ServiceEvents.java
    A environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/Valid.java
    A environments/osgi/core/api/src/main/resources/META-INF/weld-osgi-core-api.bnd
    M environments/osgi/core/extension/pom.xml
    M environments/osgi/core/integration/pom.xml
    M environments/osgi/core/pom.xml
    M environments/osgi/core/spi/pom.xml

  Log Message:
  -----------
  Add Weld-OSGi API bundle files


  Commit: d771816e0e3162ce8d16aea377dafe72905f4d9e
      https://github.com/weld/core/commit/d771816e0e3162ce8d16aea377dafe72905f4d9e
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/core/api/pom.xml
    M environments/osgi/core/api/src/etc/header.txt
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/BundleState.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/Registration.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/RegistrationHolder.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/Service.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/ServiceRegistry.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleDataFile.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleHeader.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleHeaders.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleName.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleVersion.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Filter.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/OSGiBundle.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/OSGiService.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Properties.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Property.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Publish.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Required.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Sent.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Specification.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/AbstractBundleContainerEvent.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/AbstractBundleEvent.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/AbstractServiceEvent.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/BundleContainerEventType.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/BundleContainerEvents.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/BundleEventType.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/BundleEvents.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/InterBundleEvent.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/Invalid.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/ServiceEventType.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/ServiceEvents.java
    M environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/Valid.java
    M environments/osgi/core/pom.xml
    M environments/osgi/core/spi/pom.xml
    A environments/osgi/core/spi/src/etc/header.txt
    A environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/CDIContainer.java
    A environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/CDIContainerFactory.java
    A environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/EmbeddedCDIContainer.java
    A environments/osgi/core/spi/src/main/resources/META-INF/weld-osgi-core-spi.bnd

  Log Message:
  -----------
  Add Weld-OSGi SPI bundle files


  Commit: 6a53cbf6c62e4e684cf2ec4574f9ee83aab83ac5
      https://github.com/weld/core/commit/6a53cbf6c62e4e684cf2ec4574f9ee83aab83ac5
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/core/api/pom.xml
    M environments/osgi/core/extension/pom.xml
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/Activator.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGIAnnotatedParameter.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedConstructor.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedField.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedMethod.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedType.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiExtension.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/FilterGenerator.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiFilterQualifierType.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceProducerBean.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceQualifier.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/BundleHolder.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/CDIOSGiProducer.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ContainerObserver.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/DynamicServiceHandler.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/RegistrationImpl.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/RegistrationsHolderImpl.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceImpl.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceReferenceHandler.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceRegistryImpl.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/EmbeddedContainer.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/InstanceHolder.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/ServicePublisher.java
    A environments/osgi/core/extension/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
    A environments/osgi/core/extension/src/main/resources/META-INF/weld-osgi-core-extension.bnd
    A environments/osgi/core/extension/src/main/resources/logback.xml
    A environments/osgi/core/extension/src/test/java/org/jboss/weld/environment/osgi/test/extension/FilterGeneratorTest.java
    M environments/osgi/core/spi/pom.xml
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/CDIContainer.java
    M pom.xml

  Log Message:
  -----------
  Add Weld-OSGi Extension bundle files


  Commit: 52a0e194844d50a1e60ce03a1e5f3c31450e5d5b
      https://github.com/weld/core/commit/52a0e194844d50a1e60ce03a1e5f3c31450e5d5b
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/resources/META-INF/weld-osgi-core-extension.bnd
    M environments/osgi/core/integration/pom.xml
    A environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldActivator.java
    A environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldCDIContainer.java
    A environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldCDIContainerFactory.java
    A environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/embedded/WeldOSGi.java
    A environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/BundleSingletonProvider.java
    A environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/OSGiEnvironment.java
    A environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/OSGiProxyService.java
    A environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/Weld.java
    A environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/AbstractWeldOSGiDeployment.java
    A environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/BundleBeanDeploymentArchive.java
    A environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/bundle/BundleBeanDeploymentArchiveFactory.java
    A environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/bundle/BundleDeployment.java
    A environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/bundle/BundleResourceLoader.java
    A environments/osgi/core/integration/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
    A environments/osgi/core/integration/src/main/resources/META-INF/weld-osgi-core-integration.bnd
    A environments/osgi/core/integration/src/main/resources/log4j.xml
    A environments/osgi/core/integration/src/main/resources/logback.xml

  Log Message:
  -----------
  Add Weld-OSGi Integration bundle files


  Commit: ef38842a0121c82456a461d956ec1a96b07671b0
      https://github.com/weld/core/commit/ef38842a0121c82456a461d956ec1a96b07671b0
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    A environments/osgi/tests/bundles/bundle1/pom.xml
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/Activator.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/api/AutoPublishedService.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/api/ContractInterface.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/api/ManualPublishedService.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/api/MovingService.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/api/Name.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/api/Name2.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/api/NotContractInterface.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/api/PersonalizedHashCodeService.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/api/PropertyService.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/api/RequiredService.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/api/TestPublished.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/impl/AutoPublishedServiceImpl.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/impl/BlackListedServiceImpl.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/impl/ContractPublishedServiceImpl.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/impl/ManualPublishedServiceImpl.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/impl/MovingServiceImpl.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/impl/PersonalizedHashCodeServiceImpl.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/impl/PropertyServiceImpl1.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/impl/PropertyServiceImpl2.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/impl/PropertyServiceImpl3.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/impl/RequiredServiceImpl.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/impl/TestPublishedBean.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/impl/UnblackListedServiceImpl.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/util/BundleProvider.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/util/EventListener.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/util/RequiredServiceProvider.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/util/ServiceProvider.java
    A environments/osgi/tests/bundles/bundle1/src/main/resources/META-INF/beans.xml
    A environments/osgi/tests/bundles/bundle1/src/main/resources/META-INF/weld-osgi-bundle1.bnd
    A environments/osgi/tests/bundles/bundle1/src/main/resources/test.txt
    A environments/osgi/tests/bundles/bundle2/pom.xml
    A environments/osgi/tests/bundles/bundle2/src/main/java/com/sample/osgi/bundle2/impl/AutoPublishedServiceImpl.java
    A environments/osgi/tests/bundles/bundle2/src/main/java/com/sample/osgi/bundle2/impl/ManualPublishedServiceImpl.java
    A environments/osgi/tests/bundles/bundle2/src/main/java/com/sample/osgi/bundle2/impl/RequiredServiceImpl.java
    A environments/osgi/tests/bundles/bundle2/src/main/java/org/jboss/weld/osgi/tests/tests/bundle2/Activator.java
    A environments/osgi/tests/bundles/bundle2/src/main/resources/META-INF/beans.xml
    A environments/osgi/tests/bundles/bundle2/src/main/resources/META-INF/weld-osgi-bundle2.bnd
    A environments/osgi/tests/bundles/bundle2/src/main/resources/test.txt
    A environments/osgi/tests/bundles/bundle3/pom.xml
    A environments/osgi/tests/bundles/bundle3/src/main/java/org/jboss/weld/osgi/tests/bundle3/Activator.java
    A environments/osgi/tests/bundles/bundle3/src/main/java/org/jboss/weld/osgi/tests/bundle3/impl/AutoPublishedServiceImpl.java
    A environments/osgi/tests/bundles/bundle3/src/main/java/org/jboss/weld/osgi/tests/bundle3/impl/ManualPublishedServiceImpl.java
    A environments/osgi/tests/bundles/bundle3/src/main/resources/META-INF/weld-osgi-bundle3.bnd
    A environments/osgi/tests/bundles/cdi-spi/pom.xml
    A environments/osgi/tests/bundles/cdi-spi/src/main/java/org/jboss/weld/osgi/tests/cdispi/ServiceExtension.java
    A environments/osgi/tests/bundles/cdi-spi/src/main/java/org/jboss/weld/osgi/tests/cdispi/ServiceExtensionProvider.java
    A environments/osgi/tests/bundles/cdi-spi/src/main/java/org/jboss/weld/osgi/tests/cdispi/TestExtension.java
    A environments/osgi/tests/bundles/cdi-spi/src/main/resources/META-INF/beans.xml
    A environments/osgi/tests/bundles/cdi-spi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
    A environments/osgi/tests/bundles/cdi-spi/src/main/resources/META-INF/weld-osgi-cdi-spi.bnd
    A environments/osgi/tests/bundles/importing-bundle/pom.xml
    A environments/osgi/tests/bundles/importing-bundle/src/main/resources/META-INF/weld-osgi-importing.bnd
    A environments/osgi/tests/bundles/scanner-inner/pom.xml
    A environments/osgi/tests/bundles/scanner-inner/src/main/java/org/jboss/weld/osgi/tests/ScannerInnerClass.java
    A environments/osgi/tests/bundles/scanner-inner/src/main/resources/META-INF/beans.xml
    A environments/osgi/tests/bundles/scanner-inner/src/main/resources/META-INF/weld-osgi-innerscanner.bnd
    A environments/osgi/tests/bundles/scanner/pom.xml
    A environments/osgi/tests/bundles/scanner/src/main/java/org/jboss/weld/osgi/tests/ScannerClass.java
    A environments/osgi/tests/bundles/scanner/src/main/resources/META-INF/beans.xml
    A environments/osgi/tests/bundles/scanner/src/main/resources/META-INF/weld-osgi-scanner.bnd
    A environments/osgi/tests/pom.xml
    A environments/osgi/tests/tester/pom.xml
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/BundleScannerTest.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/LifeCycleTest.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/integration/IntegrationTest.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/InnerCDITest.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/osgi/OSGiFacilitationTest.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/MetaFilterTest.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServiceConsumingTest.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServicePublishingTest.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java

  Log Message:
  -----------
  Add Weld-OSGi Tests files and bundles

Conflicts:
	pom.xml


  Commit: 1087703164b99bd2ea598568b78f013d1a1ed0a5
      https://github.com/weld/core/commit/1087703164b99bd2ea598568b78f013d1a1ed0a5
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/build/pom.xml
    M environments/osgi/core/api/pom.xml
    M environments/osgi/core/extension/src/test/java/org/jboss/weld/environment/osgi/test/extension/FilterGeneratorTest.java
    A environments/osgi/core/mandatory/pom.xml
    A environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd
    A environments/osgi/core/nb-configuration.xml
    M environments/osgi/core/pom.xml
    M environments/osgi/tests/bundles/bundle1/pom.xml
    M environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/util/BundleProvider.java
    M environments/osgi/tests/bundles/bundle1/src/main/resources/META-INF/weld-osgi-bundle1.bnd
    A environments/osgi/tests/bundles/bundle2/src/main/java/org/jboss/weld/osgi/tests/bundle2/Activator.java
    R environments/osgi/tests/bundles/bundle2/src/main/java/org/jboss/weld/osgi/tests/tests/bundle2/Activator.java
    M environments/osgi/tests/bundles/importing-bundle/src/main/resources/META-INF/weld-osgi-importing.bnd
    A environments/osgi/tests/nb-configuration.xml
    M environments/osgi/tests/pom.xml
    A environments/osgi/tests/tester/cdi-osgi.log
    A environments/osgi/tests/tester/nb-configuration.xml
    M environments/osgi/tests/tester/pom.xml
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/BundleScannerTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/integration/IntegrationTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/InnerCDITest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/osgi/OSGiFacilitationTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServiceConsumingTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServicePublishingTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java
    M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/ListenerInjectionTestBase.java
    A nb-configuration.xml
    A parent/nb-configuration.xml
    M pom.xml

  Log Message:
  -----------
  Add integration and make them work (almost all)

Conflicts:
	environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/ListenerInjectionTestBase.java
	pom.xml


  Commit: 9666a4b9d52d6d89e0eb32dfdd0dfa504512a84e
      https://github.com/weld/core/commit/9666a4b9d52d6d89e0eb32dfdd0dfa504512a84e
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    R environments/osgi/core/nb-configuration.xml
    R environments/osgi/tests/nb-configuration.xml
    R environments/osgi/tests/tester/nb-configuration.xml
    R nb-configuration.xml
    R parent/nb-configuration.xml

  Log Message:
  -----------
  Remove netbeans configuration files


  Commit: c2033f2415c7d506088519ec905261c398154814
      https://github.com/weld/core/commit/c2033f2415c7d506088519ec905261c398154814
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/build/pom.xml
    M environments/osgi/core/api/pom.xml
    M environments/osgi/core/extension/pom.xml
    M environments/osgi/core/integration/pom.xml
    M environments/osgi/core/mandatory/pom.xml
    M environments/osgi/core/pom.xml
    M environments/osgi/core/spi/pom.xml
    M environments/osgi/tests/bundles/bundle1/pom.xml
    M environments/osgi/tests/bundles/bundle2/pom.xml
    M environments/osgi/tests/bundles/bundle3/pom.xml
    M environments/osgi/tests/bundles/cdi-spi/pom.xml
    M environments/osgi/tests/bundles/importing-bundle/pom.xml
    M environments/osgi/tests/bundles/scanner-inner/pom.xml
    M environments/osgi/tests/bundles/scanner/pom.xml
    M environments/osgi/tests/pom.xml
    M environments/osgi/tests/tester/pom.xml

  Log Message:
  -----------
  Fix pom files


  Commit: fda4ae8f124e03d19a37fac49c11e0b9b6201c09
      https://github.com/weld/core/commit/fda4ae8f124e03d19a37fac49c11e0b9b6201c09
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/test/java/org/jboss/weld/environment/osgi/test/extension/FilterGeneratorTest.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/BundleSingletonProvider.java

  Log Message:
  -----------
  Get the project to compile


  Commit: f282dba8966c9b17dc852894d415954d0b64c230
      https://github.com/weld/core/commit/f282dba8966c9b17dc852894d415954d0b64c230
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M bom/pom.xml
    M bundles/impl/pom.xml
    M bundles/osgi/pom.xml
    M docs/reference/pom.xml
    M docs/xslt/pom.xml
    M environments/osgi/build/pom.xml
    M environments/osgi/core/api/pom.xml
    M environments/osgi/core/extension/pom.xml
    M environments/osgi/core/integration/pom.xml
    M environments/osgi/core/mandatory/pom.xml
    M environments/osgi/core/pom.xml
    M environments/osgi/core/spi/pom.xml
    M environments/osgi/tests/bundles/bundle1/pom.xml
    M environments/osgi/tests/bundles/bundle2/pom.xml
    M environments/osgi/tests/bundles/bundle3/pom.xml
    M environments/osgi/tests/bundles/cdi-spi/pom.xml
    M environments/osgi/tests/bundles/importing-bundle/pom.xml
    M environments/osgi/tests/bundles/scanner-inner/pom.xml
    M environments/osgi/tests/bundles/scanner/pom.xml
    M environments/osgi/tests/pom.xml
    M environments/osgi/tests/tester/pom.xml
    M environments/se/build/pom.xml
    M environments/se/core/pom.xml
    M environments/servlet/build/pom.xml
    M environments/servlet/core/pom.xml
    M environments/servlet/pom.xml
    M environments/servlet/tests/base/pom.xml
    M environments/servlet/tests/jetty/pom.xml
    M environments/servlet/tests/tomcat/pom.xml
    M environments/servlet/tests/tomcat7/pom.xml
    M examples/jsf/login/pom.xml
    M examples/jsf/numberguess/pom.xml
    M examples/jsf/pastecode/pom.xml
    M examples/jsf/permalink/pom.xml
    M examples/jsf/translator/ear/pom.xml
    M examples/jsf/translator/ejb/pom.xml
    M examples/jsf/translator/ftest/pom.xml
    M examples/jsf/translator/pom.xml
    M examples/jsf/translator/war/pom.xml
    M examples/pom.xml
    M examples/se/hello-world/pom.xml
    M examples/se/numberguess/pom.xml
    M impl/pom.xml
    M inject-tck-runner/pom.xml
    M jboss-as/pom.xml
    M jboss-tck-runner/1.1/pom.xml
    M jsf/pom.xml
    M pom.xml
    M porting-package/1.1/pom.xml
    M tests-arquillian/pom.xml
    M tests/pom.xml

  Log Message:
  -----------
  Change version to 2.1-SNAPSHOT


  Commit: 2bd5b6e11df95207498b9dcae751ff93757609a6
      https://github.com/weld/core/commit/2bd5b6e11df95207498b9dcae751ff93757609a6
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/BundleScannerTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/osgi/OSGiFacilitationTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/MetaFilterTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServiceConsumingTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServicePublishingTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java

  Log Message:
  -----------
  Fix tests


  Commit: 9c5363f3601d951e2a50dcf64272ecd5b41ad46d
      https://github.com/weld/core/commit/9c5363f3601d951e2a50dcf64272ecd5b41ad46d
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    A environments/osgi/docs/design/pom.xml
    A environments/osgi/docs/design/src/main/docbook/en-US/images/Beanbundlestate.png
    A environments/osgi/docs/design/src/main/docbook/en-US/images/CDI-OSGi.png
    A environments/osgi/docs/design/src/main/docbook/en-US/images/CDI-OSGibundlesorganization.png
    A environments/osgi/docs/design/src/main/docbook/en-US/images/CDI-OSGicoreorganization.png
    A environments/osgi/docs/design/src/main/docbook/en-US/images/CDI-OSGistartprotocol.png
    A environments/osgi/docs/design/src/main/docbook/en-US/images/diagrams.graffle
    A environments/osgi/docs/design/src/main/docbook/en-US/images/diagrams.png
    A environments/osgi/docs/design/src/main/docbook/en-US/images/sample1.png
    A environments/osgi/docs/design/src/main/docbook/en-US/images/sample2.png
    A environments/osgi/docs/design/src/main/docbook/en-US/images/sample3.png
    A environments/osgi/docs/design/src/main/docbook/en-US/images/sample4.png
    A environments/osgi/docs/design/src/main/docbook/en-US/master.xml
    A environments/osgi/docs/design/src/main/docbook/en-US/modules/introduction.xml
    A environments/osgi/docs/design/src/main/docbook/en-US/modules/osgicdi.xml
    A environments/osgi/docs/design/src/main/docbook/en-US/modules/usages.xml
    A environments/osgi/docs/design/src/main/docbook/en-US/modules/weldosgi.xml
    A environments/osgi/docs/pom.xml
    A environments/osgi/docs/user/pom.xml
    A environments/osgi/docs/user/src/main/docbook/en-US/images/.empty
    A environments/osgi/docs/user/src/main/docbook/en-US/master.xml
    A environments/osgi/docs/user/src/main/docbook/en-US/modules/events.xml
    A environments/osgi/docs/user/src/main/docbook/en-US/modules/gettingstarted.xml
    A environments/osgi/docs/user/src/main/docbook/en-US/modules/preface.xml
    A environments/osgi/docs/user/src/main/docbook/en-US/modules/samples.xml
    A environments/osgi/docs/user/src/main/docbook/en-US/modules/services.xml
    A environments/osgi/docs/user/src/main/docbook/en-US/modules/utility.xml
    M environments/osgi/tests/tester/cdi-osgi.log
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServiceConsumingTest.java
    M pom.xml

  Log Message:
  -----------
  Add documentations for Weld-OSGi


  Commit: eddefe61e23ca99a9e9dc82fc04d0f0e244b007c
      https://github.com/weld/core/commit/eddefe61e23ca99a9e9dc82fc04d0f0e244b007c
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    R environments/osgi/tests/bundles/bundle2/src/main/java/com/sample/osgi/bundle2/impl/AutoPublishedServiceImpl.java
    R environments/osgi/tests/bundles/bundle2/src/main/java/com/sample/osgi/bundle2/impl/ManualPublishedServiceImpl.java
    R environments/osgi/tests/bundles/bundle2/src/main/java/com/sample/osgi/bundle2/impl/RequiredServiceImpl.java
    M environments/osgi/tests/bundles/bundle2/src/main/java/org/jboss/weld/osgi/tests/bundle2/Activator.java
    A environments/osgi/tests/bundles/bundle2/src/main/java/org/jboss/weld/osgi/tests/bundle2/impl/AutoPublishedServiceImpl.java
    A environments/osgi/tests/bundles/bundle2/src/main/java/org/jboss/weld/osgi/tests/bundle2/impl/ManualPublishedServiceImpl.java
    A environments/osgi/tests/bundles/bundle2/src/main/java/org/jboss/weld/osgi/tests/bundle2/impl/RequiredServiceImpl.java
    M environments/osgi/tests/tester/cdi-osgi.log
    M environments/osgi/tests/tester/pom.xml
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/MetaFilterTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServiceConsumingTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServicePublishingTest.java
    M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/ListenerInjectionTestBase.java
    M pom.xml

  Log Message:
  -----------
  All tests are successfull using netbeans. Do not work using command line

Conflicts:
	environments/osgi/core/extension/src/test/java/org/jboss/weld/environment/osgi/test/extension/FilterGeneratorTest.java
	environments/osgi/tests/tester/pom.xml
	environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/ListenerInjectionTestBase.java


  Commit: 85b5064c8be5b2916a534965ca5a27c037f26477
      https://github.com/weld/core/commit/85b5064c8be5b2916a534965ca5a27c037f26477
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    A environments/osgi/examples/calculator/calculator-api/pom.xml
    A environments/osgi/examples/calculator/calculator-api/src/main/java/org/jboss/weld/osgi/examples/calculator/api/CleanEvent.java
    A environments/osgi/examples/calculator/calculator-api/src/main/java/org/jboss/weld/osgi/examples/calculator/api/EqualsEvent.java
    A environments/osgi/examples/calculator/calculator-api/src/main/java/org/jboss/weld/osgi/examples/calculator/api/NotificationEvent.java
    A environments/osgi/examples/calculator/calculator-api/src/main/java/org/jboss/weld/osgi/examples/calculator/api/NumberEvent.java
    A environments/osgi/examples/calculator/calculator-api/src/main/java/org/jboss/weld/osgi/examples/calculator/api/Operation.java
    A environments/osgi/examples/calculator/calculator-api/src/main/java/org/jboss/weld/osgi/examples/calculator/api/Operator.java
    A environments/osgi/examples/calculator/calculator-api/src/main/resources/META-INF/weld-osgi-calculator-api.bnd
    A environments/osgi/examples/calculator/calculator-core/pom.xml
    A environments/osgi/examples/calculator/calculator-core/src/main/java/org/jboss/weld/osgi/examples/calculator/core/App.java
    A environments/osgi/examples/calculator/calculator-core/src/main/java/org/jboss/weld/osgi/examples/calculator/core/CalculatorGUI.java
    A environments/osgi/examples/calculator/calculator-core/src/main/java/org/jboss/weld/osgi/examples/calculator/core/OperationImpl.java
    A environments/osgi/examples/calculator/calculator-core/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/calculator/calculator-core/src/main/resources/META-INF/weld-osgi-calculator-core.bnd
    A environments/osgi/examples/calculator/calculator-divide/pom.xml
    A environments/osgi/examples/calculator/calculator-divide/src/main/java/org/jboss/weld/osgi/examples/calculator/divide/DivideOperator.java
    A environments/osgi/examples/calculator/calculator-divide/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/calculator/calculator-divide/src/main/resources/META-INF/weld-osgi-calculator-divide.bnd
    A environments/osgi/examples/calculator/calculator-log/pom.xml
    A environments/osgi/examples/calculator/calculator-log/src/main/java/org/jboss/weld/osgi/examples/calculator/log/ActionsLogger.java
    A environments/osgi/examples/calculator/calculator-log/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/calculator/calculator-log/src/main/resources/META-INF/weld-osgi-calculator-log.bnd
    A environments/osgi/examples/calculator/calculator-minus/pom.xml
    A environments/osgi/examples/calculator/calculator-minus/src/main/java/org/jboss/weld/osgi/examples/calculator/minus/MinusOperator.java
    A environments/osgi/examples/calculator/calculator-minus/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/calculator/calculator-minus/src/main/resources/META-INF/weld-osgi-calculator-minus.bnd
    A environments/osgi/examples/calculator/calculator-plus/pom.xml
    A environments/osgi/examples/calculator/calculator-plus/src/main/java/org/jboss/weld/osgi/examples/calculator/plus/PlusOperator.java
    A environments/osgi/examples/calculator/calculator-plus/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/calculator/calculator-plus/src/main/resources/META-INF/weld-osgi-calculator-plus.bnd
    A environments/osgi/examples/calculator/calculator-times/pom.xml
    A environments/osgi/examples/calculator/calculator-times/src/main/java/org/jboss/weld/osgi/examples/calculator/times/TimesOperator.java
    A environments/osgi/examples/calculator/calculator-times/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/calculator/calculator-times/src/main/resources/META-INF/weld-osgi-calculator-times.bnd
    A environments/osgi/examples/calculator/pom.xml
    A environments/osgi/examples/container/pom.xml
    A environments/osgi/examples/container/src/main/assembly/felix.xml
    A environments/osgi/examples/container/src/main/resources/config.properties
    A environments/osgi/examples/paint/paint-api/pom.xml
    A environments/osgi/examples/paint/paint-api/src/main/java/org/jboss/weld/osgi/examples/paint/api/Shape.java
    A environments/osgi/examples/paint/paint-api/src/main/java/org/jboss/weld/osgi/examples/paint/api/ShapeContainer.java
    A environments/osgi/examples/paint/paint-api/src/main/java/org/jboss/weld/osgi/examples/paint/api/ShapeProvider.java
    A environments/osgi/examples/paint/paint-api/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/paint/paint-api/src/main/resources/META-INF/weld-osgi-paint-api.bnd
    A environments/osgi/examples/paint/paint-core/pom.xml
    A environments/osgi/examples/paint/paint-core/src/main/java/org/jboss/weld/osgi/examples/paint/App.java
    A environments/osgi/examples/paint/paint-core/src/main/java/org/jboss/weld/osgi/examples/paint/circle/Circle.java
    A environments/osgi/examples/paint/paint-core/src/main/java/org/jboss/weld/osgi/examples/paint/circle/CircleShape.java
    A environments/osgi/examples/paint/paint-core/src/main/java/org/jboss/weld/osgi/examples/paint/circle/CircleShapeProvider.java
    A environments/osgi/examples/paint/paint-core/src/main/java/org/jboss/weld/osgi/examples/paint/gui/PaintFrame.java
    A environments/osgi/examples/paint/paint-core/src/main/java/org/jboss/weld/osgi/examples/paint/gui/ShapeComponent.java
    A environments/osgi/examples/paint/paint-core/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/paint/paint-core/src/main/resources/META-INF/weld-osgi-paint-core.bnd
    A environments/osgi/examples/paint/paint-core/src/main/resources/org/jboss/weld/osgi/examples/paint/circle/img/circle.png
    A environments/osgi/examples/paint/paint-square/pom.xml
    A environments/osgi/examples/paint/paint-square/src/main/java/org/jboss/weld/osgi/examples/paint/square/Square.java
    A environments/osgi/examples/paint/paint-square/src/main/java/org/jboss/weld/osgi/examples/paint/square/SquareShapeProvider.java
    A environments/osgi/examples/paint/paint-square/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/paint/paint-square/src/main/resources/META-INF/weld-osgi-paint-square.bnd
    A environments/osgi/examples/paint/paint-square/src/main/resources/org/jboss/weld/osgi/examples/paint/square/img/square.png
    A environments/osgi/examples/paint/paint-triangle/pom.xml
    A environments/osgi/examples/paint/paint-triangle/src/main/java/org/jboss/weld/osgi/examples/paint/triangle/Triangle.java
    A environments/osgi/examples/paint/paint-triangle/src/main/java/org/jboss/weld/osgi/examples/paint/triangle/TriangleShapeProvider.java
    A environments/osgi/examples/paint/paint-triangle/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/paint/paint-triangle/src/main/resources/META-INF/weld-osgi-paint-triangle.bnd
    A environments/osgi/examples/paint/paint-triangle/src/main/resources/org/jboss/weld/osgi/examples/paint/triangle/img/triangle.png
    A environments/osgi/examples/paint/pom.xml
    A environments/osgi/examples/pom.xml
    A environments/osgi/examples/standalone/pom.xml
    A environments/osgi/examples/standalone/src/main/java/org/jboss/weld/osgi/examples/standalone/MyService.java
    A environments/osgi/examples/standalone/src/main/java/org/jboss/weld/osgi/examples/standalone/StandaloneActivator.java
    A environments/osgi/examples/standalone/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/standalone/src/main/resources/META-INF/weld-osgi-standalone.bnd
    A environments/osgi/examples/user-doc/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/helloworld/multilingual/App.java
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/helloworld/multilingual/api/HelloWorld.java
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/helloworld/multilingual/api/Language.java
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/helloworld/multilingual/api/Presentation.java
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/helloworld/multilingual/impl/HelloWorldEnglish.java
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/helloworld/multilingual/impl/HelloWorldFrench.java
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/helloworld/multilingual/impl/HelloWorldGerman.java
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/helloworld/multilingual/impl/PresentationInterceptor.java
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/src/main/resources/META-INF/hello-world-multilingual.bnd
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/App.java
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/api/HelloWorld.java
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/impl/HelloWorldImpl.java
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/user-doc/user-doc-chapter1/hello-world/src/main/resources/META-INF/hello-world.bnd
    A environments/osgi/examples/user-doc/user-doc-chapter1/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer-multilingual/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer-multilingual/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/consumer/multilingual/Activator.java
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer-multilingual/src/main/resources/META-INF/hello-world-consumer-multilingual.bnd
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/consumer/Activator.java
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer/src/main/resources/META-INF/hello-world-consumer.bnd
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer2-multilingual/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer2-multilingual/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/consumer/multilingual2/App.java
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer2-multilingual/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer2-multilingual/src/main/resources/META-INF/hello-world-consumer-multilingual2.bnd
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/provider/App.java
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/provider/api/HelloWorld.java
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/provider/api/Language.java
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/provider/api/Presentation.java
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/provider/impl/HelloWorldEnglish.java
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/provider/impl/HelloWorldFrench.java
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/provider/impl/HelloWorldGerman.java
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/provider/impl/PresentationInterceptor.java
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/src/main/resources/META-INF/hello-world-provider.bnd
    A environments/osgi/examples/user-doc/user-doc-chapter2/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/talkative-dick/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/talkative-dick/src/main/java/org/jboss/weld/osgi/examples/userdoc/talkative/dick/App.java
    A environments/osgi/examples/user-doc/user-doc-chapter3/talkative-dick/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/talkative-dick/src/main/resources/META-INF/talkative-dick.bnd
    A environments/osgi/examples/user-doc/user-doc-chapter3/talkative-harry/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/talkative-harry/src/main/java/org/jboss/weld/osgi/examples/userdoc/talkative/harry/App.java
    A environments/osgi/examples/user-doc/user-doc-chapter3/talkative-harry/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/talkative-harry/src/main/resources/META-INF/talkative-harry.bnd
    A environments/osgi/examples/user-doc/user-doc-chapter3/talkative-tom/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/talkative-tom/src/main/java/org/jboss/weld/osgi/examples/userdoc/talkative/tom/App.java
    A environments/osgi/examples/user-doc/user-doc-chapter3/talkative-tom/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/talkative-tom/src/main/resources/META-INF/talkative-tom.bnd
    A environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-dick/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-dick/src/main/java/org/jboss/weld/osgi/examples/userdoc/welcoming/dick/App.java
    A environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-dick/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-dick/src/main/resources/META-INF/welcoming-dick.bnd
    A environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-harry/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-harry/src/main/java/org/jboss/weld/osgi/examples/userdoc/welcoming/harry/App.java
    A environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-harry/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-harry/src/main/resources/META-INF/welcoming-harry.bnd
    A environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-tom/pom.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-tom/src/main/java/org/jboss/weld/osgi/examples/userdoc/welcoming/tom/App.java
    A environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-tom/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-tom/src/main/resources/META-INF/welcoming-tom.bnd
    A environments/osgi/examples/web/pom.xml
    A environments/osgi/examples/web/web-api/pom.xml
    A environments/osgi/examples/web/web-api/src/main/java/org/jboss/weld/osgi/examples/web/api/Hotel.java
    A environments/osgi/examples/web/web-api/src/main/java/org/jboss/weld/osgi/examples/web/api/HotelProvider.java
    A environments/osgi/examples/web/web-api/src/main/resources/META-INF/weld-osgi-web-api.bnd
    A environments/osgi/examples/web/web-england/pom.xml
    A environments/osgi/examples/web/web-england/src/main/java/org/jboss/weld/osgi/examples/web/england/EnglandHotelProvider.java
    A environments/osgi/examples/web/web-england/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/web/web-france/pom.xml
    A environments/osgi/examples/web/web-france/src/main/java/org/jboss/weld/osgi/examples/web/france/FranceHotelProvider.java
    A environments/osgi/examples/web/web-france/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/web/web-fwk/pom.xml
    A environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/CDIJAXRSContainer.java
    A environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/HttpServiceTracker.java
    A environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/JerseyApplication.java
    A environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/OSGiHttpContext.java
    A environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/api/Controller.java
    A environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/view/Render.java
    A environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/view/Renderable.java
    A environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/view/TemplateRenderer.java
    A environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/view/View.java
    A environments/osgi/examples/web/web-fwk/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter
    A environments/osgi/examples/web/web-fwk/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
    A environments/osgi/examples/web/web-fwk/src/main/resources/META-INF/weld-osgi-web-fwk.bnd
    A environments/osgi/examples/web/web-spain/pom.xml
    A environments/osgi/examples/web/web-spain/src/main/java/org/jboss/weld/osgi/examples/web/spain/SpainHotelProvider.java
    A environments/osgi/examples/web/web-spain/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/web/web-webapp/pom.xml
    A environments/osgi/examples/web/web-webapp/src/main/java/org/jboss/weld/osgi/examples/web/app/App.java
    A environments/osgi/examples/web/web-webapp/src/main/java/org/jboss/weld/osgi/examples/web/app/HotelController.java
    A environments/osgi/examples/web/web-webapp/src/main/resources/META-INF/beans.xml
    A environments/osgi/examples/web/web-webapp/src/main/resources/META-INF/weld-osgi-web-app.bnd
    A environments/osgi/examples/web/web-webapp/src/main/resources/static/images/logo.png
    A environments/osgi/examples/web/web-webapp/src/main/resources/views/hotel/all.xhtml
    A environments/osgi/examples/web/web-webapp/src/main/resources/views/hotel/none.xhtml
    A environments/osgi/examples/web/web-webapp/src/main/resources/views/index.xhtml
    M environments/osgi/tests/bundles/cdi-spi/pom.xml
    M environments/osgi/tests/bundles/importing-bundle/pom.xml
    M environments/osgi/tests/bundles/scanner-inner/pom.xml
    M environments/osgi/tests/bundles/scanner/pom.xml
    M environments/osgi/tests/tester/cdi-osgi.log
    M pom.xml
    A web-england/src/main/resources/META-INF/weld-osgi-web-england.bnd b/environments/osgi/examples/web/web-england/src/main/resources/META-INF/weld-osgi-web-england.bnd
    A web-france/src/main/resources/META-INF/weld-osgi-web-france.bnd b/environments/osgi/examples/web/web-france/src/main/resources/META-INF/weld-osgi-web-france.bnd
    A web-spain/src/main/resources/META-INF/weld-osgi-web-spain.bnd b/environments/osgi/examples/web/web-spain/src/main/resources/META-INF/weld-osgi-web-spain.bnd

  Log Message:
  -----------
  Add Weld-OSGi examples files and bundles

Conflicts:
	environments/osgi/build/pom.xml
	environments/osgi/core/api/pom.xml
	environments/osgi/core/extension/pom.xml
	environments/osgi/core/integration/pom.xml
	environments/osgi/core/mandatory/pom.xml
	environments/osgi/core/pom.xml
	environments/osgi/core/spi/pom.xml
	environments/osgi/docs/design/pom.xml
	environments/osgi/docs/pom.xml
	environments/osgi/docs/user/pom.xml
	environments/osgi/tests/bundles/bundle1/pom.xml
	environments/osgi/tests/bundles/bundle2/pom.xml
	environments/osgi/tests/bundles/bundle3/pom.xml
	environments/osgi/tests/bundles/cdi-spi/pom.xml
	environments/osgi/tests/bundles/importing-bundle/pom.xml
	environments/osgi/tests/bundles/scanner-inner/pom.xml
	environments/osgi/tests/bundles/scanner/pom.xml
	environments/osgi/tests/pom.xml
	environments/osgi/tests/tester/pom.xml


  Commit: d8a45d11e804a22c586810fdb7410995df65ccba
      https://github.com/weld/core/commit/d8a45d11e804a22c586810fdb7410995df65ccba
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M .gitignore
    R environments/osgi/docs/design/src/main/docbook/en-US/images/Beanbundlestate.png
    R environments/osgi/docs/design/src/main/docbook/en-US/images/CDI-OSGi.png
    R environments/osgi/docs/design/src/main/docbook/en-US/images/CDI-OSGibundlesorganization.png
    R environments/osgi/docs/design/src/main/docbook/en-US/images/CDI-OSGicoreorganization.png
    R environments/osgi/docs/design/src/main/docbook/en-US/images/CDI-OSGistartprotocol.png
    R environments/osgi/docs/design/src/main/docbook/en-US/images/diagrams.graffle
    R environments/osgi/docs/design/src/main/docbook/en-US/images/diagrams.png
    R environments/osgi/docs/design/src/main/docbook/en-US/images/sample1.png
    R environments/osgi/docs/design/src/main/docbook/en-US/images/sample2.png
    R environments/osgi/docs/design/src/main/docbook/en-US/images/sample3.png
    R environments/osgi/docs/design/src/main/docbook/en-US/images/sample4.png
    M environments/osgi/docs/design/src/main/docbook/en-US/master.xml
    A environments/osgi/docs/design/src/main/docbook/en-US/modules/Book_Info.xml
    R environments/osgi/docs/design/src/main/docbook/en-US/modules/introduction.xml
    R environments/osgi/docs/design/src/main/docbook/en-US/modules/osgicdi.xml
    A environments/osgi/docs/design/src/main/docbook/en-US/modules/part1.xml
    A environments/osgi/docs/design/src/main/docbook/en-US/modules/part2.xml
    R environments/osgi/docs/design/src/main/docbook/en-US/modules/usages.xml
    R environments/osgi/docs/design/src/main/docbook/en-US/modules/weldosgi.xml
    R environments/osgi/tests/tester/cdi-osgi.log

  Log Message:
  -----------
  Refactor specifications

Conflicts:
	.gitignore


  Commit: c72ae1af4f548ad97a15e56c0d97c3fb952625d0
      https://github.com/weld/core/commit/c72ae1af4f548ad97a15e56c0d97c3fb952625d0
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/build/pom.xml
    M environments/osgi/core/api/pom.xml
    M environments/osgi/core/extension/pom.xml
    M environments/osgi/core/integration/pom.xml
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/BundleSingletonProvider.java
    M environments/osgi/core/mandatory/pom.xml
    M environments/osgi/core/pom.xml
    M environments/osgi/core/spi/pom.xml
    M environments/osgi/docs/pom.xml
    M environments/osgi/examples/container/pom.xml
    M environments/osgi/examples/paint/paint-core/pom.xml
    M environments/osgi/examples/paint/paint-square/pom.xml
    M environments/osgi/examples/paint/paint-triangle/pom.xml
    M environments/osgi/examples/pom.xml
    M environments/osgi/examples/standalone/pom.xml
    M environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer-multilingual/pom.xml
    M environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer/pom.xml
    M environments/osgi/examples/web/web-fwk/pom.xml
    M environments/osgi/examples/web/web-webapp/pom.xml
    A environments/osgi/pom.xml
    M environments/osgi/tests/pom.xml
    M environments/osgi/tests/tester/pom.xml

  Log Message:
  -----------
  Updates versions to match current Weld version.

Conflicts:
	environments/osgi/build/pom.xml
	environments/osgi/core/api/pom.xml
	environments/osgi/core/extension/pom.xml
	environments/osgi/core/integration/pom.xml
	environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/BundleSingletonProvider.java
	environments/osgi/core/mandatory/pom.xml
	environments/osgi/core/pom.xml
	environments/osgi/core/spi/pom.xml
	environments/osgi/examples/calculator/calculator-api/pom.xml
	environments/osgi/examples/calculator/calculator-core/pom.xml
	environments/osgi/examples/calculator/calculator-divide/pom.xml
	environments/osgi/examples/calculator/calculator-log/pom.xml
	environments/osgi/examples/calculator/calculator-minus/pom.xml
	environments/osgi/examples/calculator/calculator-plus/pom.xml
	environments/osgi/examples/calculator/calculator-times/pom.xml
	environments/osgi/examples/calculator/pom.xml
	environments/osgi/examples/container/pom.xml
	environments/osgi/examples/paint/paint-api/pom.xml
	environments/osgi/examples/paint/paint-core/pom.xml
	environments/osgi/examples/paint/paint-square/pom.xml
	environments/osgi/examples/paint/paint-triangle/pom.xml
	environments/osgi/examples/paint/pom.xml
	environments/osgi/examples/pom.xml
	environments/osgi/examples/standalone/pom.xml
	environments/osgi/examples/user-doc/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter1/hello-world/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter1/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer-multilingual/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer2-multilingual/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter2/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter3/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter3/talkative-dick/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter3/talkative-harry/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter3/talkative-tom/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-dick/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-harry/pom.xml
	environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-tom/pom.xml
	environments/osgi/examples/web/pom.xml
	environments/osgi/examples/web/web-api/pom.xml
	environments/osgi/examples/web/web-england/pom.xml
	environments/osgi/examples/web/web-france/pom.xml
	environments/osgi/examples/web/web-fwk/pom.xml
	environments/osgi/examples/web/web-spain/pom.xml
	environments/osgi/examples/web/web-webapp/pom.xml
	environments/osgi/tests/bundles/bundle1/pom.xml
	environments/osgi/tests/bundles/bundle2/pom.xml
	environments/osgi/tests/bundles/bundle3/pom.xml
	environments/osgi/tests/bundles/cdi-spi/pom.xml
	environments/osgi/tests/bundles/importing-bundle/pom.xml
	environments/osgi/tests/bundles/scanner-inner/pom.xml
	environments/osgi/tests/bundles/scanner/pom.xml
	environments/osgi/tests/pom.xml
	environments/osgi/tests/tester/pom.xml
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/BundleScannerTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/osgi/OSGiFacilitationTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/MetaFilterTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServiceConsumingTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServicePublishingTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java


  Commit: e329fc347093533038f873f7a83d471ee5d824dd
      https://github.com/weld/core/commit/e329fc347093533038f873f7a83d471ee5d824dd
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/Weld.java
    M environments/osgi/examples/container/pom.xml
    A environments/osgi/examples/container/src/main/assembly/assembly.xml
    R environments/osgi/examples/container/src/main/assembly/felix.xml
    M environments/osgi/examples/container/src/main/resources/config.properties
    M environments/osgi/examples/pom.xml
    M environments/osgi/pom.xml

  Log Message:
  -----------
  Fix sample container build.

Conflicts:
	environments/osgi/core/integration/pom.xml
	environments/osgi/examples/pom.xml
	environments/osgi/pom.xml


  Commit: b3cea029dc0c295d03982a0b544a686bb6d18694
      https://github.com/weld/core/commit/b3cea029dc0c295d03982a0b544a686bb6d18694
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldActivator.java

  Log Message:
  -----------
  Use new SingletonProvider


  Commit: 3b5c4cd3351d113a15b349f434061b9e527d2d99
      https://github.com/weld/core/commit/3b5c4cd3351d113a15b349f434061b9e527d2d99
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    A environments/osgi/examples/paint/paint-core/src/main/resources/org/jboss/weld/osgi/examples/paint/circle/circle.png
    R environments/osgi/examples/paint/paint-core/src/main/resources/org/jboss/weld/osgi/examples/paint/circle/img/circle.png
    R environments/osgi/examples/paint/paint-square/src/main/resources/org/jboss/weld/osgi/examples/paint/square/img/square.png
    A environments/osgi/examples/paint/paint-square/src/main/resources/org/jboss/weld/osgi/examples/paint/square/square.png
    R environments/osgi/examples/paint/paint-triangle/src/main/resources/org/jboss/weld/osgi/examples/paint/triangle/img/triangle.png
    A environments/osgi/examples/paint/paint-triangle/src/main/resources/org/jboss/weld/osgi/examples/paint/triangle/triangle.png

  Log Message:
  -----------
  Fix images location

Conflicts:
	environments/osgi/tests/tester/pom.xml


  Commit: 10dea4e0372ea3e3694fea71f6e2354aed951f58
      https://github.com/weld/core/commit/10dea4e0372ea3e3694fea71f6e2354aed951f58
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/BundleState.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/Registration.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/RegistrationHolder.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/Service.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/ServiceRegistry.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleDataFile.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleHeader.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleHeaders.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleName.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/BundleVersion.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Filter.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/OSGiBundle.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/OSGiService.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Properties.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Property.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Publish.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Required.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Sent.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/annotation/Specification.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/AbstractBundleContainerEvent.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/AbstractBundleEvent.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/AbstractServiceEvent.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/BundleContainerEventType.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/BundleContainerEvents.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/BundleEventType.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/BundleEvents.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/InterBundleEvent.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/Invalid.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/ServiceEventType.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/ServiceEvents.java
    R environments/osgi/core/api/src/main/java/org.jboss.weld.environment.osgi.api/events/Valid.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/BundleState.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/Registration.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/RegistrationHolder.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/Service.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/ServiceRegistry.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/BundleDataFile.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/BundleHeader.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/BundleHeaders.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/BundleName.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/BundleVersion.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Filter.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/OSGiBundle.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/OSGiService.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Properties.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Property.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Publish.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Required.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Sent.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Specification.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/AbstractBundleContainerEvent.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/AbstractBundleEvent.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/AbstractServiceEvent.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/BundleContainerEventType.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/BundleContainerEvents.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/BundleEventType.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/BundleEvents.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/InterBundleEvent.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/Invalid.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/ServiceEventType.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/ServiceEvents.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/Valid.java

  Log Message:
  -----------
  Code style for API bundle


  Commit: 546f67e5ce7ba43d2056c786f685cad3c73f5758
      https://github.com/weld/core/commit/546f67e5ce7ba43d2056c786f685cad3c73f5758
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java

  Log Message:
  -----------
  Fix some lifecycle issues at OSGi container shutdown


  Commit: 8dbf2ee995e042fde3115f13c4f33da5e6d21e03
      https://github.com/weld/core/commit/8dbf2ee995e042fde3115f13c4f33da5e6d21e03
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/Activator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGIAnnotatedParameter.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedConstructor.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedField.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedMethod.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedType.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/FilterGenerator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiFilterQualifierType.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceProducerBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceQualifier.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/BundleHolder.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/CDIOSGiProducer.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ContainerObserver.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/DynamicServiceHandler.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/RegistrationImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/RegistrationsHolderImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceReferenceHandler.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceRegistryImpl.java
    M environments/osgi/core/extension/src/test/java/org/jboss/weld/environment/osgi/test/extension/FilterGeneratorTest.java

  Log Message:
  -----------
  Code style for Extension bundle

Conflicts:
	environments/osgi/core/extension/src/test/java/org/jboss/weld/environment/osgi/test/extension/FilterGeneratorTest.java


  Commit: 6df60463ec7ad2a0b4d5b5f1d7447891cd4a2e36
      https://github.com/weld/core/commit/6df60463ec7ad2a0b4d5b5f1d7447891cd4a2e36
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldActivator.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldCDIContainer.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldCDIContainerFactory.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/embedded/WeldOSGi.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/BundleSingletonProvider.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/OSGiEnvironment.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/OSGiProxyService.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/Weld.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/AbstractWeldOSGiDeployment.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/BundleBeanDeploymentArchive.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/bundle/BundleBeanDeploymentArchiveFactory.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/bundle/BundleDeployment.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/bundle/BundleResourceLoader.java
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/CDIContainer.java
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/CDIContainerFactory.java
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/EmbeddedCDIContainer.java

  Log Message:
  -----------
  Code style for Integration part


  Commit: 2e7c9d51da4d76c41130fefe1e8e6bc022914a52
      https://github.com/weld/core/commit/2e7c9d51da4d76c41130fefe1e8e6bc022914a52
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    A environments/osgi/docs/design/src/main/docbook/en-US/images/5Bundles.png
    A environments/osgi/docs/design/src/main/docbook/en-US/images/AnnotatedTypeProcessingJustification.png
    A environments/osgi/docs/design/src/main/docbook/en-US/images/BeanBundleLifeCycle.png
    A environments/osgi/docs/design/src/main/docbook/en-US/images/StartStopProtocol.png
    M environments/osgi/docs/design/src/main/docbook/en-US/master.xml
    M environments/osgi/docs/design/src/main/docbook/en-US/modules/part1.xml
    M environments/osgi/docs/design/src/main/docbook/en-US/modules/part2.xml
    A environments/osgi/docs/design/src/main/docbook/en-US/modules/preface.xml

  Log Message:
  -----------
  Update design specification with images and correct generation

Conflicts:
	environments/osgi/docs/design/pom.xml
	environments/osgi/docs/user/pom.xml


  Commit: a562371f24058042f4f4fcfec997cd969bf4b954
      https://github.com/weld/core/commit/a562371f24058042f4f4fcfec997cd969bf4b954
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/resources/logback.xml
    M environments/osgi/core/integration/src/main/resources/logback.xml
    M environments/osgi/pom.xml

  Log Message:
  -----------
  make log to work

Conflicts:
	environments/osgi/core/extension/pom.xml
	environments/osgi/core/integration/pom.xml
	environments/osgi/pom.xml


  Commit: 339574760015f80c0b22cff092d1ac14b55209cb
      https://github.com/weld/core/commit/339574760015f80c0b22cff092d1ac14b55209cb
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M impl/src/main/java/org/jboss/weld/Container.java
    M impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyProvider.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:
  -----------
  Eliminate Container.instance() calls in Proxies.class


  Commit: 0156f0472a54e41d62ea23606cb397bbfc774fc4
      https://github.com/weld/core/commit/0156f0472a54e41d62ea23606cb397bbfc774fc4
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M environments/osgi/build/pom.xml
    M environments/osgi/core/integration/pom.xml
    M environments/osgi/examples/calculator/calculator-core/pom.xml
    M environments/osgi/examples/calculator/calculator-divide/pom.xml

  Log Message:
  -----------
  Minor changes to the build


  Commit: 905a4f6c08e1529186c36e88a758dbe6f2bfc57b
      https://github.com/weld/core/commit/905a4f6c08e1529186c36e88a758dbe6f2bfc57b
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/api/pom.xml
    M environments/osgi/core/extension/pom.xml
    M environments/osgi/core/integration/pom.xml
    M environments/osgi/pom.xml
    A environments/osgi/run.sh

  Log Message:
  -----------
  Clean pom files

Conflicts:
	environments/osgi/core/api/pom.xml
	environments/osgi/core/extension/pom.xml
	environments/osgi/core/integration/pom.xml
	environments/osgi/pom.xml


  Commit: d392e8871d34d18434ca365b59f08418ddc345a3
      https://github.com/weld/core/commit/d392e8871d34d18434ca365b59f08418ddc345a3
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceProducerBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/DynamicServiceHandler.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceRegistryImpl.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/CDIOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/EmbeddedContainer.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/ServicePublisher.java
    M environments/osgi/core/extension/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
    M environments/osgi/core/extension/src/main/resources/META-INF/weld-osgi-core-extension.bnd
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldCDIContainer.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/BundleSingletonProvider.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/Weld.java
    M environments/osgi/core/integration/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
    M environments/osgi/core/integration/src/main/resources/META-INF/weld-osgi-core-integration.bnd

  Log Message:
  -----------
  Extension and Integration bundles now only export public packages


  Commit: f054998be5acf61a6e9546dc4ffe3b51934e23c9
      https://github.com/weld/core/commit/f054998be5acf61a6e9546dc4ffe3b51934e23c9
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/resources/META-INF/weld-osgi-core-extension.bnd
    R environments/osgi/core/extension/src/main/resources/logback.xml
    M environments/osgi/core/integration/src/main/resources/META-INF/weld-osgi-core-integration.bnd
    R environments/osgi/core/integration/src/main/resources/logback.xml
    M environments/osgi/core/mandatory/pom.xml
    M environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd
    A environments/osgi/core/mandatory/src/main/resources/logback.xml

  Log Message:
  -----------
  Refactor bnd files in order to avoid embed-dependency

Conflicts:
	environments/osgi/core/integration/pom.xml
	environments/osgi/core/mandatory/pom.xml


  Commit: a3c471f7c7d9fc1905e2b1f7b8b3fb6c937fb6bb
      https://github.com/weld/core/commit/a3c471f7c7d9fc1905e2b1f7b8b3fb6c937fb6bb
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/AbstractWeldOSGiDeployment.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/bundle/BundleDeployment.java

  Log Message:
  -----------
  Fix #37: CDI SPI management is working now :-)


  Commit: 6b2c207d23cc9598c583369f8ec79ce0c51a102a
      https://github.com/weld/core/commit/6b2c207d23cc9598c583369f8ec79ce0c51a102a
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/AbstractWeldOSGiDeployment.java

  Log Message:
  -----------
  Fix some NPEs.


  Commit: a5b9fa9ed686dadaeb108f5f863178c6a444e2b3
      https://github.com/weld/core/commit/a5b9fa9ed686dadaeb108f5f863178c6a444e2b3
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/integration/src/main/resources/META-INF/weld-osgi-core-integration.bnd

  Log Message:
  -----------
  Export Weld-SE


  Commit: 964a20bbbf0887b6a89824f9dd9868ec157a42ea
      https://github.com/weld/core/commit/964a20bbbf0887b6a89824f9dd9868ec157a42ea
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java

  Log Message:
  -----------
  Fix singleton issue on shutdown.


  Commit: 638939ade22c48a8c939df96bb87754fb6329d52
      https://github.com/weld/core/commit/638939ade22c48a8c939df96bb87754fb6329d52
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    A environments/osgi/tests/bundles/life-cycle/pom.xml
    A environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/AsynchronousListener.java
    A environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/CDIActivator.java
    A environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/FlagFarm.java
    A environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/OSGiActivator.java
    A environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/SynchronousListener.java
    A environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/Timer.java
    A environments/osgi/tests/bundles/life-cycle/src/main/resources/META-INF/beans.xml
    A environments/osgi/tests/bundles/life-cycle/src/main/resources/META-INF/weld-osgi-life-cycle.bnd
    M environments/osgi/tests/pom.xml
    M environments/osgi/tests/tester/pom.xml
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/LifeCycleTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServicePublishingTest.java

  Log Message:
  -----------
  Add a test for bean bundle lifecycle

Conflicts:
	environments/osgi/tests/pom.xml
	environments/osgi/tests/tester/pom.xml


  Commit: 453e507d3ced22544ca4b288c68d6aec7951b210
      https://github.com/weld/core/commit/453e507d3ced22544ca4b288c68d6aec7951b210
  Author: Stuart Douglas <stuart.w.douglas at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M .gitignore
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/BundleState.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/Registration.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/RegistrationHolder.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/Service.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/ServiceRegistry.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/BundleDataFile.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/BundleHeader.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/BundleHeaders.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/BundleName.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/BundleVersion.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Filter.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/OSGiBundle.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/OSGiService.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Properties.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Property.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Publish.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Required.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Sent.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/annotation/Specification.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/AbstractBundleContainerEvent.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/AbstractBundleEvent.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/AbstractServiceEvent.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/BundleContainerEventType.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/BundleContainerEvents.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/BundleEventType.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/BundleEvents.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/InterBundleEvent.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/Invalid.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/ServiceEventType.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/ServiceEvents.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/Valid.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/Activator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGIAnnotatedParameter.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedConstructor.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedField.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedMethod.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedType.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/FilterGenerator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiFilterQualifierType.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceProducerBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceQualifier.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/BundleHolder.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/CDIOSGiProducer.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ContainerObserver.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/DynamicServiceHandler.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/RegistrationImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/RegistrationsHolderImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceReferenceHandler.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceRegistryImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/CDIOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/EmbeddedContainer.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/ServicePublisher.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldActivator.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldCDIContainer.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldCDIContainerFactory.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/embedded/WeldOSGi.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/BundleSingletonProvider.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/OSGiEnvironment.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/OSGiProxyService.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/Weld.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/AbstractWeldOSGiDeployment.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/BundleBeanDeploymentArchive.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/bundle/BundleBeanDeploymentArchiveFactory.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/bundle/BundleDeployment.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/bundle/BundleResourceLoader.java
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/CDIContainer.java
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/CDIContainerFactory.java
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/EmbeddedCDIContainer.java
    M pom.xml

  Log Message:
  -----------
  Re-format osgi code

Conflicts:
	.gitignore


  Commit: aeb46abce535dc7834ecdfae36208e6a9db04a5f
      https://github.com/weld/core/commit/aeb46abce535dc7834ecdfae36208e6a9db04a5f
  Author: Stuart Douglas <stuart.w.douglas at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedType.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/RegistrationImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/CDIOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java
    M environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/api/TestPublished.java
    M environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/impl/AutoPublishedServiceImpl.java
    M environments/osgi/tests/bundles/cdi-spi/src/main/java/org/jboss/weld/osgi/tests/cdispi/TestExtension.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/AsynchronousListener.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/CDIActivator.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/FlagFarm.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/OSGiActivator.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/SynchronousListener.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/Timer.java

  Log Message:
  -----------
  More checkstyle errors


  Commit: 034098ff270439a7716921261dd9e12a27797ff8
      https://github.com/weld/core/commit/034098ff270439a7716921261dd9e12a27797ff8
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/calculator/calculator-api/src/main/java/org/jboss/weld/osgi/examples/calculator/api/Operation.java
    M environments/osgi/examples/calculator/calculator-core/src/main/java/org/jboss/weld/osgi/examples/calculator/core/CalculatorGUI.java
    M environments/osgi/examples/calculator/calculator-log/src/main/java/org/jboss/weld/osgi/examples/calculator/log/ActionsLogger.java
    M environments/osgi/examples/paint/paint-api/src/main/java/org/jboss/weld/osgi/examples/paint/api/ShapeContainer.java
    M environments/osgi/examples/paint/paint-core/src/main/java/org/jboss/weld/osgi/examples/paint/gui/PaintFrame.java
    M environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/helloworld/multilingual/impl/HelloWorldGerman.java
    M environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/provider/impl/HelloWorldGerman.java
    M environments/osgi/examples/web/web-webapp/src/main/java/org/jboss/weld/osgi/examples/web/app/App.java
    M environments/osgi/examples/web/web-webapp/src/main/java/org/jboss/weld/osgi/examples/web/app/HotelController.java

  Log Message:
  -----------
  Made checkstyle happy


  Commit: 2536b765dd478aa9d5af9192f4cc1ec3bf458a62
      https://github.com/weld/core/commit/2536b765dd478aa9d5af9192f4cc1ec3bf458a62
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/CDIOSGiProducer.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/OSGiUtilitiesProducer.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/CDIOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/ServicePublisher.java
    M environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/util/BundleProvider.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/AsynchronousListener.java
    A environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/AutoPublishedService.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/CDIActivator.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/FlagFarm.java
    A environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/NotAutoPublishedService.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/OSGiActivator.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/SynchronousListener.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/Timer.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/LifeCycleTest.java

  Log Message:
  -----------
  (manualy) merge with branch weld-osgi


  Commit: 2205f04aeb02c7519083a5d895ff8bcdbdfa30a4
      https://github.com/weld/core/commit/2205f04aeb02c7519083a5d895ff8bcdbdfa30a4
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/Activator.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/annotation/BundleNameAnnotation.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/annotation/BundleVersionAnnotation.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/annotation/FilterAnnotation.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/annotation/SentAnnotation.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/annotation/SpecificationAnnotation.java
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGIAnnotatedParameter.java
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedConstructor.java
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedField.java
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedMethod.java
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/CDIOSGiAnnotatedType.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGIServiceAnnotatedParameter.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceAnnotatedConstructor.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceAnnotatedField.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceAnnotatedMethod.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceAnnotatedType.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/DynamicServiceHandler.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/OSGiUtilitiesProducer.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceRegistryImpl.java
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/CDIOSGiExtension.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/EmbeddedContainer.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/ServicePublisher.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldCDIContainer.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/BundleSingletonProvider.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/Weld.java

  Log Message:
  -----------
  refactor the code, add javadoc ...


  Commit: c6f85ff004fb7a019fea97be29c1ac63946e0ab0
      https://github.com/weld/core/commit/c6f85ff004fb7a019fea97be29c1ac63946e0ab0
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/annotation/BundleNameAnnotation.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/annotation/BundleVersionAnnotation.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/annotation/FilterAnnotation.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/annotation/SentAnnotation.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/annotation/SpecificationAnnotation.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/FilterGenerator.java
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiFilterQualifierType.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java
    M environments/osgi/core/extension/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
    M environments/osgi/core/integration/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
    M environments/osgi/core/mandatory/src/main/resources/logback.xml

  Log Message:
  -----------
  Correct extension launch. Continue refactoring


  Commit: d6e85c07cd9c471e232c8dd38c1d8e7ff5909b70
      https://github.com/weld/core/commit/d6e85c07cd9c471e232c8dd38c1d8e7ff5909b70
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/annotation/OSGiServiceAnnotation.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/DynamicServiceHandler.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGIServiceAnnotatedParameter.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceAnnotatedField.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceProducerBean.java
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceQualifier.java
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/DynamicServiceHandler.java
    M environments/osgi/core/extension/src/test/java/org/jboss/weld/environment/osgi/test/extension/FilterGeneratorTest.java

  Log Message:
  -----------
  Continue refactoring and documentation


  Commit: 27cf650640399b85abf9bfb14b8458a09148819d
      https://github.com/weld/core/commit/27cf650640399b85abf9bfb14b8458a09148819d
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGIServiceAnnotatedParameter.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceAnnotatedConstructor.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceAnnotatedField.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceAnnotatedMethod.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceAnnotatedParameter.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceAnnotatedType.java

  Log Message:
  -----------
  Continue refactoring and documentation


  Commit: 70bd9fa26c94aa107574798e501b79e0e4732e7e
      https://github.com/weld/core/commit/70bd9fa26c94aa107574798e501b79e0e4732e7e
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/DynamicServiceHandler.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/BundleHolder.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ContainerObserver.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/DynamicServiceHandler.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/RegistrationImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/RegistrationsHolderImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceReferenceHandler.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceRegistryImpl.java

  Log Message:
  -----------
  Continue refactoring and documentation


  Commit: dce23f628a275c888700c0e475ae478188953937
      https://github.com/weld/core/commit/dce23f628a275c888700c0e475ae478188953937
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/OSGiUtilitiesProducer.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/EmbeddedContainer.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/InstanceHolder.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/ServicePublisher.java

  Log Message:
  -----------
  Continue refactoring and documentation


  Commit: 12cd7eb198b05d100e734803ad7ee9add9d16827
      https://github.com/weld/core/commit/12cd7eb198b05d100e734803ad7ee9add9d16827
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/Activator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java

  Log Message:
  -----------
  Try to start extension in hybrid mode if the framework isn't started in OSGi mode.


  Commit: 8ea63355bb5ff25b6a4b812ddf97a8d407d3d695
      https://github.com/weld/core/commit/8ea63355bb5ff25b6a4b812ddf97a8d407d3d695
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java

  Log Message:
  -----------
  Fix auto hybrid bootstrap and add manual hybrid bootstrap.


  Commit: ae83900012ec838bff4f9fbf31ab226646515196
      https://github.com/weld/core/commit/ae83900012ec838bff4f9fbf31ab226646515196
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/AbstractBundleContainerEvent.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/AbstractBundleEvent.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/AbstractServiceEvent.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/Activator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/EmbeddedContainer.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldActivator.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/embedded/WeldOSGi.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/OSGiEnvironment.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/Weld.java
    M environments/osgi/core/mandatory/src/main/resources/logback.xml
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/CDIContainer.java
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/CDIContainerFactory.java
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/EmbeddedCDIContainer.java
    M environments/osgi/docs/design/src/main/docbook/en-US/modules/part1.xml
    M environments/osgi/docs/user/src/main/docbook/en-US/modules/events.xml
    M environments/osgi/docs/user/src/main/docbook/en-US/modules/gettingstarted.xml
    M environments/osgi/docs/user/src/main/docbook/en-US/modules/services.xml

  Log Message:
  -----------
  Fix some typos.


  Commit: fc914bd766d275a3035bd71efebdd27b6fc4ada0
      https://github.com/weld/core/commit/fc914bd766d275a3035bd71efebdd27b6fc4ada0
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java
    M environments/osgi/core/mandatory/src/main/resources/logback.xml

  Log Message:
  -----------
  Fix services unregistration.


  Commit: dd85238f9e04c1d4c8573cbebd462d13aef6a27c
      https://github.com/weld/core/commit/dd85238f9e04c1d4c8573cbebd462d13aef6a27c
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java

  Log Message:
  -----------
  Fix some displays of proxies


  Commit: 88da2b933bbf217fd155d34dda82dafa55382bda
      https://github.com/weld/core/commit/88da2b933bbf217fd155d34dda82dafa55382bda
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java

  Log Message:
  -----------
  Fix services unregistration order.


  Commit: bc051131c88b49c862a15509c680bcaa68d3264d
      https://github.com/weld/core/commit/bc051131c88b49c862a15509c680bcaa68d3264d
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java

  Log Message:
  -----------
  Fix potential NPE


  Commit: 1679acfad3c99fb6c8274baa1e24cbe914a47798
      https://github.com/weld/core/commit/1679acfad3c99fb6c8274baa1e24cbe914a47798
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceRegistryImpl.java

  Log Message:
  -----------
  Fix typo


  Commit: 832a40de953250ea2131440526a0de0ca202beca
      https://github.com/weld/core/commit/832a40de953250ea2131440526a0de0ca202beca
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceRegistryImpl.java

  Log Message:
  -----------
  Refix typo


  Commit: ee55cd0a224dc8e185bdb492ee1b661ad45ec763
      https://github.com/weld/core/commit/ee55cd0a224dc8e185bdb492ee1b661ad45ec763
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/mandatory/src/main/resources/logback.xml
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java

  Log Message:
  -----------
  Prepush commit


  Commit: f578424fccc683b66de8cb51fb9ea18f7f59fd2c
      https://github.com/weld/core/commit/f578424fccc683b66de8cb51fb9ea18f7f59fd2c
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldCDIContainer.java
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/CDIContainer.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/WeldOSGiWait.java

  Log Message:
  -----------
  Add utilities for tests.


  Commit: 81aae91364bcaee03e685621e827e884719c5290
      https://github.com/weld/core/commit/81aae91364bcaee03e685621e827e884719c5290
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/mandatory/src/main/resources/logback.xml

  Log Message:
  -----------
  Don't cut log messages anymore


  Commit: 99ab7662475029b8f7ca369e8e483395bb093228
      https://github.com/weld/core/commit/99ab7662475029b8f7ca369e8e483395bb093228
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/bundle/BundleBeanDeploymentArchiveFactory.java

  Log Message:
  -----------
  Fix issue with bundle scanning and embedded jar's


  Commit: 30c1f2cf23feeabf668a4fd1a46ed0d924e6d102
      https://github.com/weld/core/commit/30c1f2cf23feeabf668a4fd1a46ed0d924e6d102
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceProducerBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java

  Log Message:
  -----------
  Provide BundleContext if possible to avoid FrameworkUtil magic.


  Commit: 928e0807afbec63cfde05dcb86de985afc068a04
      https://github.com/weld/core/commit/928e0807afbec63cfde05dcb86de985afc068a04
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    A environments/osgi/examples/container-lite/pom.xml
    A environments/osgi/examples/container-lite/run.sh
    A environments/osgi/examples/container-lite/src/main/assembly/assembly.xml

  Log Message:
  -----------
  Add a sample container project based on PojoSR. It works :-)


  Commit: d8cb6262b67559ab72ae1d00b88d0821ea2a28d2
      https://github.com/weld/core/commit/d8cb6262b67559ab72ae1d00b88d0821ea2a28d2
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java

  Log Message:
  -----------
  Remove useless System.out


  Commit: c658e838a2c946212b1d98f033731c17ad0276ab
      https://github.com/weld/core/commit/c658e838a2c946212b1d98f033731c17ad0276ab
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/OSGiUtilitiesProducer.java
    M environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/util/BundleProvider.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/osgi/OSGiFacilitationTest.java

  Log Message:
  -----------
  Review OSGi utilities injection


  Commit: d02009fec2ba49497968fffcc4ed5cf7585ea635
      https://github.com/weld/core/commit/d02009fec2ba49497968fffcc4ed5cf7585ea635
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/pom.xml

  Log Message:
  -----------
  Add PojoSR sample to modules list


  Commit: 23a26a6563354ab68a74784f308ebfc0d5c9952a
      https://github.com/weld/core/commit/23a26a6563354ab68a74784f308ebfc0d5c9952a
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java

  Log Message:
  -----------
  Set all registrations in CDIContainer


  Commit: 94f1811611a8f336261da110ab2b3d0fa282eac7
      https://github.com/weld/core/commit/94f1811611a8f336261da110ab2b3d0fa282eac7
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldCDIContainer.java
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/CDIContainer.java

  Log Message:
  -----------
  Refactor CDIContainer


  Commit: 05b7aaa2b9e8d173d1ca9481ce79c8370b7449b9
      https://github.com/weld/core/commit/05b7aaa2b9e8d173d1ca9481ce79c8370b7449b9
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceRegistryImpl.java

  Log Message:
  -----------
  Fix a potential NPE


  Commit: 169f017c4fb10d399f4edf94755a4a63ec15c3c0
      https://github.com/weld/core/commit/169f017c4fb10d399f4edf94755a4a63ec15c3c0
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/standalone/src/main/java/org/jboss/weld/osgi/examples/standalone/StandaloneActivator.java

  Log Message:
  -----------
  Use generic embedded container.


  Commit: 1cd6a344fc8b410b2cbfbb30219377694d593569
      https://github.com/weld/core/commit/1cd6a344fc8b410b2cbfbb30219377694d593569
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/EmbeddedContainer.java
    R environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/EmbeddedContainer.java

  Log Message:
  -----------
  Move embedded container to exposed package


  Commit: 753cd0044a449a6d6c1a97fd581a1ba9547350c8
      https://github.com/weld/core/commit/753cd0044a449a6d6c1a97fd581a1ba9547350c8
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    A environments/osgi/examples/standalone/src/main/java/org/jboss/weld/osgi/examples/standalone/MyListener.java

  Log Message:
  -----------
  Add a service listener for test purpose


  Commit: e3d6094635f0a550dda0c06a24a075a173d7a1d8
      https://github.com/weld/core/commit/e3d6094635f0a550dda0c06a24a075a173d7a1d8
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/CDIContainer.java
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/CDIContainerFactory.java
    M environments/osgi/core/spi/src/main/java/org/jboss/weld/environment/osgi/spi/EmbeddedCDIContainer.java

  Log Message:
  -----------
  Refactor SPI bundle


  Commit: 6d5bd2ed54692460bcdad6b8ac27fcebce219fdf
      https://github.com/weld/core/commit/6d5bd2ed54692460bcdad6b8ac27fcebce219fdf
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java

  Log Message:
  -----------
  Correct test for getRegistration()


  Commit: 0237f9b5e60977b38de6035e84cd6e56c449b07a
      https://github.com/weld/core/commit/0237f9b5e60977b38de6035e84cd6e56c449b07a
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/docs/user/src/main/docbook/en-US/master.xml
    M environments/osgi/docs/user/src/main/docbook/en-US/modules/events.xml
    R environments/osgi/docs/user/src/main/docbook/en-US/modules/samples.xml
    M environments/osgi/docs/user/src/main/docbook/en-US/modules/utility.xml

  Log Message:
  -----------
  Add missing chapter for user doc. Cannot find a proper example


  Commit: 5efe32ae5c2c2a773b289b2cfc743997f3d31b68
      https://github.com/weld/core/commit/5efe32ae5c2c2a773b289b2cfc743997f3d31b68
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java

  Log Message:
  -----------
  Refactor extension for hybrid mode


  Commit: 64dae83c1d2bd0c7511250ca906d0cd36e28c32c
      https://github.com/weld/core/commit/64dae83c1d2bd0c7511250ca906d0cd36e28c32c
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    A environments/osgi/core/ee/pom.xml
    A environments/osgi/core/ee/src/main/java/org/jboss/weld/environment/osgi/ee/BundleContextAccessor.java
    A environments/osgi/core/ee/src/main/resources/META-INF/beans.xml
    M environments/osgi/core/pom.xml

  Log Message:
  -----------
  Add EE integration module

Conflicts:
	environments/osgi/core/pom.xml


  Commit: 1e6be73bbd28dc90b686fa3228cf14555267b1a3
      https://github.com/weld/core/commit/1e6be73bbd28dc90b686fa3228cf14555267b1a3
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java

  Log Message:
  -----------
  Finish hybrid mode. Works with the EE integration part.


  Commit: f8412c16703fb43359e234a4ec80d7a4c487411e
      https://github.com/weld/core/commit/f8412c16703fb43359e234a4ec80d7a4c487411e
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/web/web-api/src/main/java/org/jboss/weld/osgi/examples/web/api/Hotel.java
    M environments/osgi/examples/web/web-api/src/main/java/org/jboss/weld/osgi/examples/web/api/HotelProvider.java
    M environments/osgi/examples/web/web-england/src/main/java/org/jboss/weld/osgi/examples/web/england/EnglandHotelProvider.java
    M environments/osgi/examples/web/web-england/src/main/resources/META-INF/weld-osgi-web-england.bnd
    M environments/osgi/examples/web/web-france/src/main/java/org/jboss/weld/osgi/examples/web/france/FranceHotelProvider.java
    M environments/osgi/examples/web/web-france/src/main/resources/META-INF/weld-osgi-web-france.bnd
    M environments/osgi/examples/web/web-spain/src/main/java/org/jboss/weld/osgi/examples/web/spain/SpainHotelProvider.java
    M environments/osgi/examples/web/web-spain/src/main/resources/META-INF/weld-osgi-web-spain.bnd

  Log Message:
  -----------
  Enhance hotel sample.


  Commit: 8bc7da10972309a4f9d072fe5246d51a197e1f71
      https://github.com/weld/core/commit/8bc7da10972309a4f9d072fe5246d51a197e1f71
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    A environments/osgi/examples/ee/pom.xml
    A environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/App.java
    A environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/HotelController.java
    A environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/HotelPresenter.java
    A environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/HotelView.java
    A environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/JAXRSApp.java
    A environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/annotation/Intercepted.java
    A environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/annotation/Presenter.java
    A environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/annotation/View.java
    A environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/service/HotelsBean.java
    A environments/osgi/examples/ee/src/main/resources/logback.xml
    A environments/osgi/examples/ee/src/main/webapp/WEB-INF/beans.xml
    A environments/osgi/examples/ee/src/main/webapp/WEB-INF/faces-config.xml
    A environments/osgi/examples/ee/src/main/webapp/WEB-INF/web.xml
    A environments/osgi/examples/ee/src/main/webapp/index.xhtml
    A environments/osgi/examples/ee/src/main/webapp/static/html/book.html
    A environments/osgi/examples/ee/src/main/webapp/static/html/hotel.html
    A environments/osgi/examples/ee/src/main/webapp/static/html/index.html
    A environments/osgi/examples/ee/src/main/webapp/static/html/list.html
    A environments/osgi/examples/ee/src/main/webapp/static/html/summary.html
    A environments/osgi/examples/ee/src/main/webapp/static/images/h1.jpg
    A environments/osgi/examples/ee/src/main/webapp/static/images/hotel.jpg
    A environments/osgi/examples/ee/src/main/webapp/static/js/jquery-1.4.2.min.js
    A environments/osgi/examples/ee/src/main/webapp/static/style/main.css
    M environments/osgi/examples/pom.xml

  Log Message:
  -----------
  Add a Java EE integration sample


  Commit: 309c2fb477ec9eff8513d6380d919d4c32dd6114
      https://github.com/weld/core/commit/309c2fb477ec9eff8513d6380d919d4c32dd6114
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java

  Log Message:
  -----------
  Fix imports


  Commit: 86989971ac8d9215d06cd7966fdf71b428e094bb
      https://github.com/weld/core/commit/86989971ac8d9215d06cd7966fdf71b428e094bb
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/DynamicServiceHandler.java

  Log Message:
  -----------
  Use context instead of bundle


  Commit: 83d6325b8e15511a3d1d879b0528f7cc70b6b4ce
      https://github.com/weld/core/commit/83d6325b8e15511a3d1d879b0528f7cc70b6b4ce
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/ee/src/main/java/org/jboss/weld/environment/osgi/ee/BundleContextAccessor.java

  Log Message:
  -----------
  Fix bundle injection and launch validation at startup


  Commit: c2e282c992fbb2fa3edcb56b2dc59a400adb170f
      https://github.com/weld/core/commit/c2e282c992fbb2fa3edcb56b2dc59a400adb170f
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java

  Log Message:
  -----------
  Fix DynamicHandler usage


  Commit: fe0973b7f43c70b9c7e1095ec369ca0f324f329c
      https://github.com/weld/core/commit/fe0973b7f43c70b9c7e1095ec369ca0f324f329c
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/App.java

  Log Message:
  -----------
  Fix sample


  Commit: 34232c8a450714b776159ef66787a0880123af40
      https://github.com/weld/core/commit/34232c8a450714b776159ef66787a0880123af40
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/ee/src/main/java/org/jboss/weld/environment/osgi/ee/BundleContextAccessor.java
    M environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/App.java
    M environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/HotelController.java
    M environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/HotelPresenter.java
    M environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/HotelView.java
    M environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/JAXRSApp.java
    R environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/annotation/Intercepted.java
    M environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/annotation/Presenter.java
    M environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/annotation/View.java
    M environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/service/HotelsBean.java

  Log Message:
  -----------
  Add headers to new files


  Commit: a5b48188f7bb55e98d67913c7a5765809792caf4
      https://github.com/weld/core/commit/a5b48188f7bb55e98d67913c7a5765809792caf4
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java

  Log Message:
  -----------
  Fix env wait in tests


  Commit: 263f282dd28a1b1dcd7f6e878f9263887238ca89
      https://github.com/weld/core/commit/263f282dd28a1b1dcd7f6e878f9263887238ca89
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/ServicePublisher.java

  Log Message:
  -----------
  Refactor services publication.


  Commit: 5e6baabe9aaaee1dc687cddfbde629a6afb83746
      https://github.com/weld/core/commit/5e6baabe9aaaee1dc687cddfbde629a6afb83746
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/ee/src/main/java/org/jboss/weld/environment/osgi/ee/BundleContextAccessor.java

  Log Message:
  -----------
  Finsih EE integration. InterbundleEvents are not working.


  Commit: 81a1da3d413925cb0f17ae3fd8ce4ea63d568231
      https://github.com/weld/core/commit/81a1da3d413925cb0f17ae3fd8ce4ea63d568231
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/web/web-england/src/main/java/org/jboss/weld/osgi/examples/web/england/EnglandHotelProvider.java
    M environments/osgi/examples/web/web-france/src/main/java/org/jboss/weld/osgi/examples/web/france/FranceHotelProvider.java
    M environments/osgi/examples/web/web-spain/src/main/java/org/jboss/weld/osgi/examples/web/spain/SpainHotelProvider.java

  Log Message:
  -----------
  Fix Java EE sample. Now it works better :-)


  Commit: 86b1e0930dccef5d07837ac23716912e573c5bee
      https://github.com/weld/core/commit/86b1e0930dccef5d07837ac23716912e573c5bee
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    A environments/osgi/examples/container-equinox/pom.xml
    A environments/osgi/examples/container-equinox/src/main/assembly/assembly.xml
    A environments/osgi/examples/container-equinox/src/main/resources/config.ini
    A environments/osgi/examples/container-felix/pom.xml
    A environments/osgi/examples/container-felix/src/main/assembly/assembly.xml
    A environments/osgi/examples/container-felix/src/main/resources/config.properties
    A environments/osgi/examples/container-knopflerfish/pom.xml
    A environments/osgi/examples/container-knopflerfish/src/main/assembly/assembly.xml
    A environments/osgi/examples/container-knopflerfish/src/main/resources/config.properties
    R environments/osgi/examples/container/pom.xml
    R environments/osgi/examples/container/src/main/assembly/assembly.xml
    R environments/osgi/examples/container/src/main/resources/config.properties
    M environments/osgi/examples/pom.xml
    A environments/osgi/run-equinox.sh
    A environments/osgi/run-felix.sh
    R environments/osgi/run.sh

  Log Message:
  -----------
  Add multiple OSGi implementation containers for examples. Add equinox configuration

Conflicts:
	environments/osgi/examples/container-knopflerfish/pom.xml


  Commit: 3fbb2743c22e8256405529093da9d79924c0413f
      https://github.com/weld/core/commit/3fbb2743c22e8256405529093da9d79924c0413f
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/container-knopflerfish/src/main/assembly/assembly.xml
    M environments/osgi/examples/container-knopflerfish/src/main/resources/config.properties
    M environments/osgi/examples/web/web-fwk/pom.xml
    M environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/OSGiHttpContext.java
    M environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/view/Render.java
    R environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/view/TemplateRenderer.java
    M environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/view/View.java
    A environments/osgi/examples/web/web-fwk/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader
    M environments/osgi/examples/web/web-fwk/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter
    M environments/osgi/examples/web/web-fwk/src/main/resources/META-INF/weld-osgi-web-fwk.bnd
    M environments/osgi/examples/web/web-webapp/src/main/java/org/jboss/weld/osgi/examples/web/app/App.java
    M environments/osgi/examples/web/web-webapp/src/main/java/org/jboss/weld/osgi/examples/web/app/HotelController.java
    A environments/osgi/examples/web/web-webapp/src/main/resources/static/html/book.html
    A environments/osgi/examples/web/web-webapp/src/main/resources/static/html/hotel.html
    A environments/osgi/examples/web/web-webapp/src/main/resources/static/html/index.html
    A environments/osgi/examples/web/web-webapp/src/main/resources/static/html/list.html
    A environments/osgi/examples/web/web-webapp/src/main/resources/static/html/summary.html
    A environments/osgi/examples/web/web-webapp/src/main/resources/static/images/h1.jpg
    A environments/osgi/examples/web/web-webapp/src/main/resources/static/images/hotel.jpg
    R environments/osgi/examples/web/web-webapp/src/main/resources/static/images/logo.png
    A environments/osgi/examples/web/web-webapp/src/main/resources/static/js/jquery-1.4.2.min.js
    A environments/osgi/examples/web/web-webapp/src/main/resources/static/style/main.css
    R environments/osgi/examples/web/web-webapp/src/main/resources/views/hotel/all.xhtml
    R environments/osgi/examples/web/web-webapp/src/main/resources/views/hotel/none.xhtml
    R environments/osgi/examples/web/web-webapp/src/main/resources/views/index.xhtml
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java

  Log Message:
  -----------
  Fix web app sample

Conflicts:
	environments/osgi/examples/web/web-fwk/pom.xml


  Commit: 097c2db1cc36f91932f45b8d8bec0f514d4cae62
      https://github.com/weld/core/commit/097c2db1cc36f91932f45b8d8bec0f514d4cae62
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/container-equinox/src/main/resources/config.ini
    R environments/osgi/examples/container-lite/pom.xml
    R environments/osgi/examples/container-lite/run.sh
    R environments/osgi/examples/container-lite/src/main/assembly/assembly.xml
    A environments/osgi/examples/container-pojosr/pom.xml
    A environments/osgi/examples/container-pojosr/src/main/assembly/assembly.xml
    M environments/osgi/examples/pom.xml
    A environments/osgi/run-pojosr.sh

  Log Message:
  -----------
  Refactor sample containers


  Commit: e93d67a1318e89c8ea4e83407ccf3bd0266cdbf4
      https://github.com/weld/core/commit/e93d67a1318e89c8ea4e83407ccf3bd0266cdbf4
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/pom.xml

  Log Message:
  -----------
  Fix equinox build

Conflicts:
	environments/osgi/examples/container-equinox/pom.xml


  Commit: c4356222bd882cce549b053dec18b11a0de86d3d
      https://github.com/weld/core/commit/c4356222bd882cce549b053dec18b11a0de86d3d
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/container-equinox/pom.xml
    M environments/osgi/examples/container-equinox/src/main/assembly/assembly.xml
    M environments/osgi/examples/container-equinox/src/main/resources/config.ini

  Log Message:
  -----------
  Fix http service in equinox


  Commit: 7855e22039557845890d90b72f607a473f5cd61a
      https://github.com/weld/core/commit/7855e22039557845890d90b72f607a473f5cd61a
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/container-knopflerfish/pom.xml
    M environments/osgi/examples/container-knopflerfish/src/main/assembly/assembly.xml
    R environments/osgi/examples/container-knopflerfish/src/main/resources/config.properties
    A environments/osgi/examples/container-knopflerfish/src/main/resources/config.xargs
    M environments/osgi/pom.xml
    A environments/osgi/run-knopflerfish.sh
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java

  Log Message:
  -----------
  Add Knopflerfish OSGi implementation container example

Conflicts:
	environments/osgi/examples/container-equinox/pom.xml
	environments/osgi/examples/container-knopflerfish/pom.xml
	environments/osgi/pom.xml


  Commit: f288159a25568dbcc033f577b7f0f23de38e61d4
      https://github.com/weld/core/commit/f288159a25568dbcc033f577b7f0f23de38e61d4
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/container-equinox/pom.xml
    M environments/osgi/examples/container-equinox/src/main/assembly/assembly.xml
    M environments/osgi/examples/container-equinox/src/main/resources/config.ini
    M environments/osgi/examples/container-felix/pom.xml
    M environments/osgi/examples/container-felix/src/main/assembly/assembly.xml
    M environments/osgi/run-equinox.sh

  Log Message:
  -----------
  Mall container examples similar


  Commit: 73f3fdee7a5259871e41e5e5271521c77e590d08
      https://github.com/weld/core/commit/73f3fdee7a5259871e41e5e5271521c77e590d08
  Author: Matthieu Clochard <clochard.matthieu at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/container-knopflerfish/src/main/resources/config.xargs

  Log Message:
  -----------
  Make HTTP example to work with Knopflerfish


  Commit: ee26aed6e5e69ea1c75101e5c838defceade0c3c
      https://github.com/weld/core/commit/ee26aed6e5e69ea1c75101e5c838defceade0c3c
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/examples/container-pojosr/pom.xml

  Log Message:
  -----------
  Change project name

Conflicts:
	environments/osgi/examples/container-pojosr/pom.xml


  Commit: e9b9b84ea1982120bd6086ca2591477030f984be
      https://github.com/weld/core/commit/e9b9b84ea1982120bd6086ca2591477030f984be
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/ee/src/main/java/org/jboss/weld/environment/osgi/ee/BundleContextAccessor.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java

  Log Message:
  -----------
  Remove OSGi listeners on app shutdown


  Commit: fbb6836a701b6cc5f3fc024a32f93c6d3a0a6707
      https://github.com/weld/core/commit/fbb6836a701b6cc5f3fc024a32f93c6d3a0a6707
  Author: Mathieu ANCELIN <mathieu.ancelin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java

  Log Message:
  -----------
  Add Override annotations


  Commit: a59b54017590512c9bd4e1485ac1ebac784e1764
      https://github.com/weld/core/commit/a59b54017590512c9bd4e1485ac1ebac784e1764
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/core/api/pom.xml
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceRegistryImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java
    M environments/osgi/core/integration/pom.xml
    M environments/osgi/core/mandatory/pom.xml
    M environments/osgi/pom.xml
    M environments/osgi/tests/pom.xml
    M environments/osgi/tests/tester/pom.xml

  Log Message:
  -----------
  Small fixes wrt updates

Conflicts:
	environments/osgi/core/api/pom.xml
	environments/osgi/core/integration/pom.xml
	environments/osgi/core/mandatory/pom.xml
	environments/osgi/pom.xml
	environments/osgi/tests/pom.xml
	environments/osgi/tests/tester/pom.xml
	impl/src/main/java/org/jboss/weld/bean/DecoratorImpl.java
	impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java
	tests-arquillian/src/test/java/org/jboss/weld/tests/specialization/weld802/CustomExtension.java
	tests/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java


  Commit: f4065d240b83634e4fc1098651568e509ea11bd9
      https://github.com/weld/core/commit/f4065d240b83634e4fc1098651568e509ea11bd9
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M bundles/osgi/pom.xml
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldCDIContainerFactory.java
    M environments/osgi/core/integration/src/main/resources/META-INF/weld-osgi-core-integration.bnd
    M environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd

  Log Message:
  -----------
  Use Weld' interceptors.

Conflicts:
	environments/osgi/core/integration/src/main/resources/META-INF/weld-osgi-core-integration.bnd
	environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd


  Commit: 10d5422498280b9ba8c101418b06e31de0cc1924
      https://github.com/weld/core/commit/10d5422498280b9ba8c101418b06e31de0cc1924
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/tests/bundles/bundle1/pom.xml
    M environments/osgi/tests/tester/pom.xml
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/BundleScannerTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/LifeCycleTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/integration/IntegrationTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/osgi/OSGiFacilitationTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/MetaFilterTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServiceConsumingTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServicePublishingTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java

  Log Message:
  -----------
  Upgrade Pax Exam + centralize project version usage.

Conflicts:
	environments/osgi/tests/bundles/bundle1/pom.xml
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/BundleScannerTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/LifeCycleTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/osgi/OSGiFacilitationTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/MetaFilterTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServiceConsumingTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServicePublishingTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java


  Commit: 8487a27f1b382d71dfb3e89e7ccab73314a521df
      https://github.com/weld/core/commit/8487a27f1b382d71dfb3e89e7ccab73314a521df
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java

  Log Message:
  -----------
  Fix string mixup.


  Commit: c335e215b386bf4357095bd16626be0650be7d2f
      https://github.com/weld/core/commit/c335e215b386bf4357095bd16626be0650be7d2f
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/tests/tester/pom.xml
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/BundleScannerTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/LifeCycleTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/integration/IntegrationTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/osgi/OSGiFacilitationTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/MetaFilterTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServiceConsumingTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServicePublishingTest.java

  Log Message:
  -----------
  Use Geronimo AtInject, fix BundleContext usage.

Conflicts:
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/MetaFilterTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServiceConsumingTest.java
	pom.xml


  Commit: 1e1c05eadc6a1ac1e31ec88ab3f90a121805569a
      https://github.com/weld/core/commit/1e1c05eadc6a1ac1e31ec88ab3f90a121805569a
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/core/integration/src/main/resources/META-INF/weld-osgi-core-integration.bnd
    M environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd

  Log Message:
  -----------
  Remove intercpetor.javassist.


  Commit: e0625a4700f7b7d2b69fd34e2e3958e38dfc4354
      https://github.com/weld/core/commit/e0625a4700f7b7d2b69fd34e2e3958e38dfc4354
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd

  Log Message:
  -----------
  Do not export javax.inject (8c7fc18f4ca786cf2aaae6921c23484c95237138)


  Commit: 5c6dff60e9e2794cc0dae20fc5fc9e1296039f3a
      https://github.com/weld/core/commit/5c6dff60e9e2794cc0dae20fc5fc9e1296039f3a
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java

  Log Message:
  -----------
  "Fix" event test -- TODO on why the offset!


  Commit: a04c4d2d1e4345700002798a2238ed23b368ba46
      https://github.com/weld/core/commit/a04c4d2d1e4345700002798a2238ed23b368ba46
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M impl/src/main/java/org/jboss/weld/Container.java

  Log Message:
  -----------
  Code cleanup.


  Commit: e6bac9c300c804eb5b3c9a07f53aab77c18dbbd9
      https://github.com/weld/core/commit/e6bac9c300c804eb5b3c9a07f53aab77c18dbbd9
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M impl/src/main/java/org/jboss/weld/resources/ManagerObjectFactory.java

  Log Message:
  -----------
  Add (back) empty ctor.


  Commit: 637522d95aadc12285190267cac2a1d6f8f77b06
      https://github.com/weld/core/commit/637522d95aadc12285190267cac2a1d6f8f77b06
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/examples/user-doc/user-doc-chapter1/hello-world-multilingual/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/helloworld/multilingual/api/Language.java
    M environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-provider/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/provider/api/Language.java
    M pom.xml

  Log Message:
  -----------
  Update compiler and checkstyle plugins.

Conflicts:
	pom.xml


  Commit: 54481234d127775ac4d70ea9d515c336640c515f
      https://github.com/weld/core/commit/54481234d127775ac4d70ea9d515c336640c515f
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/pom.xml
    M environments/osgi/core/mandatory/pom.xml
    M environments/osgi/examples/container-pojosr/pom.xml

  Log Message:
  -----------
  Fix build


  Commit: 8b03eaacd6b57eea1d2148d415110f740c5c4d3e
      https://github.com/weld/core/commit/8b03eaacd6b57eea1d2148d415110f740c5c4d3e
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/examples/container-equinox/pom.xml
    M environments/osgi/examples/container-felix/pom.xml
    M environments/osgi/examples/container-pojosr/pom.xml

  Log Message:
  -----------
  Fix OSGi container' poms

Conflicts:
	environments/osgi/examples/container-equinox/pom.xml
	environments/osgi/examples/container-felix/pom.xml
	environments/osgi/examples/container-knopflerfish/pom.xml
	environments/osgi/examples/container-pojosr/pom.xml


  Commit: bc3dc9705c0ac9cad356355dbf9c052044e948d1
      https://github.com/weld/core/commit/bc3dc9705c0ac9cad356355dbf9c052044e948d1
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/examples/container-knopflerfish/pom.xml

  Log Message:
  -----------
  Fix build


  Commit: 87cdf765e3f34f03ff5735d4105c2e0b3966f80d
      https://github.com/weld/core/commit/87cdf765e3f34f03ff5735d4105c2e0b3966f80d
  Author: Cristiano Gaviao <cvgaviao at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/docs/design/src/main/docbook/en-US/modules/part1.xml
    M environments/osgi/docs/design/src/main/docbook/en-US/modules/part2.xml
    M environments/osgi/docs/design/src/main/docbook/en-US/modules/preface.xml

  Log Message:
  -----------
  OSGi docs - fixed typos and misspelled words


  Commit: 1c635a862164a0a45ee70e6430caa27c4ccb0cc8
      https://github.com/weld/core/commit/1c635a862164a0a45ee70e6430caa27c4ccb0cc8
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/docs/design/pom.xml
    M environments/osgi/docs/design/src/main/docbook/en-US/modules/part1.xml
    M environments/osgi/docs/design/src/main/docbook/en-US/modules/part2.xml
    M environments/osgi/docs/user/pom.xml

  Log Message:
  -----------
  Fix image rendering in weld-osgi docs

Conflicts:
	environments/osgi/docs/design/pom.xml
	environments/osgi/docs/user/pom.xml


  Commit: 38799c502b1191b3484fd8f97ab8963818e84760
      https://github.com/weld/core/commit/38799c502b1191b3484fd8f97ab8963818e84760
  Author: Cristiano Gaviao <cvgaviao at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/core/api/pom.xml
    M environments/osgi/core/extension/pom.xml
    M environments/osgi/core/integration/pom.xml
    M environments/osgi/core/mandatory/pom.xml
    M environments/osgi/core/spi/pom.xml

  Log Message:
  -----------
  WELD-1265 Symbolic-Name of all weld-osgi bundles is not in a standard form


  Commit: 95ab5d3af7b4d8db5efe6f6309dcb531dfa7f1c4
      https://github.com/weld/core/commit/95ab5d3af7b4d8db5efe6f6309dcb531dfa7f1c4
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java

  Log Message:
  -----------
  WELD-1265 Symbolic-Name of all weld-osgi bundles is not in a standard form

Conflicts:
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java


  Commit: 3ed31f3cb3c92a6338865b6784cdcfa26e0419c5
      https://github.com/weld/core/commit/3ed31f3cb3c92a6338865b6784cdcfa26e0419c5
  Author: Charles Moulliard <cmoulliard at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd

  Log Message:
  -----------
  WELD-1257 Package name exported from weld osgi manadatory bundle is not correct


  Commit: 698fb2c43b399e83b10623daa97982146fb25090
      https://github.com/weld/core/commit/698fb2c43b399e83b10623daa97982146fb25090
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd

  Log Message:
  -----------
  WELD-1257 Package name exported from weld osgi manadatory bundle is not correct


  Commit: e4ca4f4db0fa5145cf31786b218358c5db67e7bf
      https://github.com/weld/core/commit/e4ca4f4db0fa5145cf31786b218358c5db67e7bf
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/pom.xml
    M pom.xml

  Log Message:
  -----------
  Fix build


  Commit: d8f8b7c97b56fbb04c1e15b41ba9bb36183f6597
      https://github.com/weld/core/commit/d8f8b7c97b56fbb04c1e15b41ba9bb36183f6597
  Author: Charles Moulliard <cmoulliard at fusesource.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/ContainerTest.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/WeldOSGIContainerSupport.java
    A environments/osgi/tests/tester/src/test/resources/org/jboss/weld/environment/osgi/tests/karaf/config.properties
    A environments/osgi/tests/tester/src/test/resources/org/jboss/weld/environment/osgi/tests/karaf/custom.properties

  Log Message:
  -----------
  WELD-1287: Add integration test to validate weld osgi on Apache Karaf


  Commit: 2a98733de8e3a3dc50710c1991cbee3dbe320578
      https://github.com/weld/core/commit/2a98733de8e3a3dc50710c1991cbee3dbe320578
  Author: Charles Moulliard <cmoulliard at fusesource.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/tests/tester/pom.xml
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java
    M pom.xml

  Log Message:
  -----------
  WELD-1287: Add integration test to validate weld osgi on Apache Karaf

Conflicts:
	environments/osgi/tests/tester/pom.xml
	pom.xml


  Commit: be3c930aae847b59aa1b9cdbb84db3057eca6b2f
      https://github.com/weld/core/commit/be3c930aae847b59aa1b9cdbb84db3057eca6b2f
  Author: Guillaume Nodet <gnodet at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd

  Log Message:
  -----------
  [WELD-1306] The weld-osgi-core-mandatory should import the slf4j api


  Commit: 7330fa186f8f86225ca45030150c819745a7d536
      https://github.com/weld/core/commit/7330fa186f8f86225ca45030150c819745a7d536
  Author: Guillaume Nodet <gnodet at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/DynamicServiceHandler.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/EmbeddedContainer.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/ServicePublisher.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldCDIContainer.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/BundleSingletonProvider.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/Weld.java

  Log Message:
  -----------
  [WELD-1313] Avoir direct access to public static thread locals in weld-osgi and use accessors


  Commit: bd5481fbed8ce76263469d8235fa034fa70d292c
      https://github.com/weld/core/commit/bd5481fbed8ce76263469d8235fa034fa70d292c
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java

  Log Message:
  -----------
  [WELD-1160]; use right class for classloader lookup.


  Commit: 99206dffb0c2edc2b2c7f5701c9c522fbd7db81e
      https://github.com/weld/core/commit/99206dffb0c2edc2b2c7f5701c9c522fbd7db81e
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/DynamicServiceHandler.java

  Log Message:
  -----------
  [WELD-1170]; allow non-interfaces to be exposed as injectable osgi services.


  Commit: a4f1fd7d9926fda955eea749ea0e1038c27f2718
      https://github.com/weld/core/commit/a4f1fd7d9926fda955eea749ea0e1038c27f2718
  Author: Guillaume Nodet <gnodet at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/SingleServiceTracker.java

  Log Message:
  -----------
  [WELD-1307] Concurrency issues in the weld-osgi extender


  Commit: 3834096c5d86a1934f426c9a76bd669c8d402a0b
      https://github.com/weld/core/commit/3834096c5d86a1934f426c9a76bd669c8d402a0b
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/api/AbstractService.java
    A environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/util/AbstractServiceProvider.java
    A environments/osgi/tests/bundles/bundle2/src/main/java/org/jboss/weld/osgi/tests/bundle2/impl/ConcreteService.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/ContainerTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/WeldOSGIContainerSupport.java

  Log Message:
  -----------
  Add concrete class test.


  Commit: 68e5e682595d721804ba6afeda1c2121a85fc9e6
      https://github.com/weld/core/commit/68e5e682595d721804ba6afeda1c2121a85fc9e6
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/ServicePublisher.java
    M environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/util/AbstractServiceProvider.java
    M environments/osgi/tests/tester/pom.xml
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/WeldOSGIContainerSupport.java
    A environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ConcreteServiceTest.java
    M pom.xml

  Log Message:
  -----------
  Upgrade to OSGi 4.3.1.

Conflicts:
	environments/osgi/tests/tester/pom.xml
	pom.xml


  Commit: f6a4ab94b72fabc44ce1b617063de76dfe6ba5b1
      https://github.com/weld/core/commit/f6a4ab94b72fabc44ce1b617063de76dfe6ba5b1
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/tests/bundles/bundle2/src/main/java/org/jboss/weld/osgi/tests/bundle2/impl/ConcreteService.java
    A environments/osgi/tests/karaf/pom.xml
    A environments/osgi/tests/karaf/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/ContainerTest.java
    A environments/osgi/tests/karaf/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/WeldOSGIContainerSupport.java
    A environments/osgi/tests/karaf/src/test/resources/org/jboss/weld/environment/osgi/tests/karaf/config.properties
    M environments/osgi/tests/pom.xml
    M environments/osgi/tests/tester/pom.xml
    R environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/ContainerTest.java
    R environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/WeldOSGIContainerSupport.java
    R environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java
    R environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/WeldOSGiWait.java
    R environments/osgi/tests/tester/src/test/resources/org/jboss/weld/environment/osgi/tests/karaf/config.properties
    R environments/osgi/tests/tester/src/test/resources/org/jboss/weld/environment/osgi/tests/karaf/custom.properties
    A environments/osgi/tests/utils/pom.xml
    A environments/osgi/tests/utils/src/main/java/org/jboss/weld/environment/osgi/tests/util/Environment.java
    A environments/osgi/tests/utils/src/main/java/org/jboss/weld/environment/osgi/tests/util/WeldOSGiWait.java
    A environments/osgi/tests/utils/src/main/resources/META-INF/weld-osgi-tests-utils.bnd
    M pom.xml

  Log Message:
  -----------
  Refactor OSGi tests


  Commit: 9c13131b515381129434c8024c3086220c35cf0b
      https://github.com/weld/core/commit/9c13131b515381129434c8024c3086220c35cf0b
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/DynamicServiceHandler.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java

  Log Message:
  -----------
  Merge gnodet's 1307 and 1313.


  Commit: a17e7a4ec832c008ef27e0291122fb5bd9466aa0
      https://github.com/weld/core/commit/a17e7a4ec832c008ef27e0291122fb5bd9466aa0
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/AbstractServiceEvent.java
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/ServiceEvents.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/utils/BundleLoader.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/utils/ClassLoaderLoader.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/utils/Loader.java
    M environments/osgi/core/api/src/main/resources/META-INF/weld-osgi-core-api.bnd
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java
    M environments/osgi/tests/karaf/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/ContainerTest.java

  Log Message:
  -----------
  Fix how service events lookup its classes.


  Commit: 7e920b3a94b5ec62edac7c4806f8f954ca2c02aa
      https://github.com/weld/core/commit/7e920b3a94b5ec62edac7c4806f8f954ca2c02aa
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/tests/bundles/bundle1/src/main/resources/META-INF/weld-osgi-bundle1.bnd
    M environments/osgi/tests/bundles/bundle2/src/main/resources/META-INF/weld-osgi-bundle2.bnd
    M environments/osgi/tests/bundles/bundle3/src/main/resources/META-INF/weld-osgi-bundle3.bnd
    M environments/osgi/tests/bundles/cdi-spi/src/main/resources/META-INF/weld-osgi-cdi-spi.bnd
    M environments/osgi/tests/bundles/life-cycle/src/main/resources/META-INF/weld-osgi-life-cycle.bnd
    M environments/osgi/tests/bundles/scanner-inner/src/main/resources/META-INF/weld-osgi-innerscanner.bnd
    M environments/osgi/tests/bundles/scanner/src/main/resources/META-INF/weld-osgi-scanner.bnd
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java

  Log Message:
  -----------
  Explicitly add deps on all CDI packages -- for CDI API instances service events lookup.

Conflicts:
	environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java


  Commit: e190e8378a9bafde40ef7734c9b090d5225cdd2c
      https://github.com/weld/core/commit/e190e8378a9bafde40ef7734c9b090d5225cdd2c
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/events/AbstractServiceEvent.java
    A environments/osgi/core/api/src/main/java/org/jboss/weld/environment/osgi/api/utils/FromClassLoader.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceRegistryImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/EmbeddedContainer.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java

  Log Message:
  -----------
  Always load from origin bundle.


  Commit: 355ec59fa15fa137d0806ea0c79a9cccdf40be5b
      https://github.com/weld/core/commit/355ec59fa15fa137d0806ea0c79a9cccdf40be5b
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/DynamicServiceHandler.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java
    A environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/util/BridgeProxyFactory.java
    M environments/osgi/tests/bundles/bundle1/src/main/java/org/jboss/weld/osgi/tests/bundle1/util/AbstractServiceProvider.java
    M environments/osgi/tests/bundles/bundle2/src/main/java/org/jboss/weld/osgi/tests/bundle2/impl/ConcreteService.java
    M environments/osgi/tests/karaf/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/ContainerTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ConcreteServiceTest.java

  Log Message:
  -----------
  Fix proxy class visibility.


  Commit: f7f9fc1e01ee766142039f2fed812513ff784b19
      https://github.com/weld/core/commit/f7f9fc1e01ee766142039f2fed812513ff784b19
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/util/BridgeProxyFactory.java

  Log Message:
  -----------
  Sync on remove.


  Commit: db80605382be4e0936a08045f169e0405a1ee6cf
      https://github.com/weld/core/commit/db80605382be4e0936a08045f169e0405a1ee6cf
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/tests/karaf/pom.xml
    M environments/osgi/tests/tester/pom.xml
    M environments/osgi/tests/utils/pom.xml
    M pom.xml

  Log Message:
  -----------
  Group deps into core-parent.


  Commit: fa168cd97577a8ad66a8c430971753837c652372
      https://github.com/weld/core/commit/fa168cd97577a8ad66a8c430971753837c652372
  Author: Sun Seng David TAN <sunix at sunix.org>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/integration/src/main/resources/META-INF/weld-osgi-core-integration.bnd
    M environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd

  Log Message:
  -----------
  WELD-1407 Fixing hard coded weld version in OSGi bundles

Conflicts:
	environments/osgi/core/integration/src/main/resources/META-INF/weld-osgi-core-integration.bnd
	environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd


  Commit: dd580de0f0eb89577fb3e90cfd7e6ba3a2f93964
      https://github.com/weld/core/commit/dd580de0f0eb89577fb3e90cfd7e6ba3a2f93964
  Author: Sun Seng David TAN <sunix at sunix.org>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/integration/src/main/resources/META-INF/weld-osgi-core-integration.bnd
    M environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd

  Log Message:
  -----------
  WELD-1406 Weld-osgi-core-mandatory/integration should export/import org.jboss.weld.interceptor


  Commit: e712dbb2c92b5e2f4a00777438e85bbd792a9844
      https://github.com/weld/core/commit/e712dbb2c92b5e2f4a00777438e85bbd792a9844
  Author: Sun Seng David TAN <sunix at sunix.org>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java

  Log Message:
  -----------
  WELD-1408 Fixing OSGi bundles stop process (broken since WELD-1307)


  Commit: c3cbf67816527d71346bbe5e25f8f5b792c1048f
      https://github.com/weld/core/commit/c3cbf67816527d71346bbe5e25f8f5b792c1048f
  Author: TAN Sun Seng David <sunix at sunix.org>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/integration/src/main/resources/META-INF/weld-osgi-core-integration.bnd
    M environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd

  Log Message:
  -----------
  WELD-1407 Removing hard coded versions for third party libraries from OSGi bundles


  Commit: e42b63315f41c68804d621118a0279c652076682
      https://github.com/weld/core/commit/e42b63315f41c68804d621118a0279c652076682
  Author: TAN Sun Seng David <sunix at sunix.org>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/resources/META-INF/weld-osgi-core-extension.bnd

  Log Message:
  -----------
  WELD-1407 Removing hard coded versions for third party libraries from OSGi bundles. weld-osgi-core-extension


  Commit: 76fdb0584390d12cf16972c2a7b4235be9ce8a89
      https://github.com/weld/core/commit/76fdb0584390d12cf16972c2a7b4235be9ce8a89
  Author: TAN Sun Seng David <sunix at sunix.org>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/examples/container-equinox/pom.xml
    M environments/osgi/examples/container-equinox/src/main/resources/config.ini
    M environments/osgi/examples/container-felix/pom.xml
    M environments/osgi/examples/container-felix/src/main/resources/config.properties
    M environments/osgi/examples/container-knopflerfish/pom.xml
    M environments/osgi/examples/container-knopflerfish/src/main/resources/config.xargs
    M environments/osgi/examples/container-pojosr/pom.xml
    M environments/osgi/examples/pom.xml

  Log Message:
  -----------
  WELD-1444 clean up weld-osgi examples, using maven properties

Conflicts:
	environments/osgi/examples/container-knopflerfish/pom.xml
	environments/osgi/examples/pom.xml


  Commit: 41ac44e377431a051a781ab794db19dc259af3a2
      https://github.com/weld/core/commit/41ac44e377431a051a781ab794db19dc259af3a2
  Author: TAN Sun Seng David <sunix at sunix.org>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/examples/container-equinox/pom.xml
    M environments/osgi/examples/container-equinox/src/main/assembly/assembly.xml
    M environments/osgi/examples/container-equinox/src/main/resources/config.ini
    M environments/osgi/examples/container-felix/pom.xml
    M environments/osgi/examples/container-felix/src/main/assembly/assembly.xml
    M environments/osgi/examples/container-felix/src/main/resources/config.properties
    M environments/osgi/examples/container-knopflerfish/pom.xml
    M environments/osgi/examples/container-knopflerfish/src/main/assembly/assembly.xml
    M environments/osgi/examples/container-knopflerfish/src/main/resources/config.xargs
    M environments/osgi/examples/container-pojosr/pom.xml
    M environments/osgi/examples/container-pojosr/src/main/assembly/assembly.xml
    M environments/osgi/examples/pom.xml
    M environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/HttpServiceTracker.java
    M pom.xml

  Log Message:
  -----------
  WELD-1444 updating weld-osgi examples containers versions so it works on OSGi 4.3.1

Conflicts:
	environments/osgi/examples/container-equinox/pom.xml
	pom.xml


  Commit: 9e8704b492936f572050a91358335315136300c4
      https://github.com/weld/core/commit/9e8704b492936f572050a91358335315136300c4
  Author: TAN Sun Seng David <sunix at sunix.org>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/tests/tester/pom.xml

  Log Message:
  -----------
  WELD-1446 Excluding org.osgi.core in weld-osgi tests, OSGi classes conflict with Felix OSGi classes

Conflicts:
	environments/osgi/tests/tester/pom.xml


  Commit: 48dc79d3f93a94d4798fbbd86c435e0f782e79ef
      https://github.com/weld/core/commit/48dc79d3f93a94d4798fbbd86c435e0f782e79ef
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/tests/utils/pom.xml
    M pom.xml

  Log Message:
  -----------
  Fix build


  Commit: 30295810be1266fd7751c1ae062d7b5a624aa970
      https://github.com/weld/core/commit/30295810be1266fd7751c1ae062d7b5a624aa970
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/Activator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/ExtensionActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/FilterGenerator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceAnnotatedType.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/OSGiServiceProducerBean.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/OSGiUtilitiesProducer.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/beans/ServiceImpl.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/EmbeddedContainer.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/extension/service/WeldOSGiExtension.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/IntegrationActivator.java
    M environments/osgi/core/extension/src/main/java/org/jboss/weld/environment/osgi/impl/integration/ServicePublisher.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/WeldCDIContainer.java
    M environments/osgi/core/integration/src/main/java/org/jboss/weld/environment/osgi/impl/integration/discovery/bundle/BundleBeanDeploymentArchiveFactory.java
    M environments/osgi/examples/calculator/calculator-core/src/main/java/org/jboss/weld/osgi/examples/calculator/core/CalculatorGUI.java

  Log Message:
  -----------
  Make checkstyle happy


  Commit: 812bef69297e9f6002a6d178eefe761779a75378
      https://github.com/weld/core/commit/812bef69297e9f6002a6d178eefe761779a75378
  Author: Matus Abaffy <maabaffy at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/examples/ee/src/main/java/org/jboss/weld/environment/osgi/samples/ee/HotelController.java
    M environments/osgi/examples/paint/paint-core/src/main/java/org/jboss/weld/osgi/examples/paint/circle/Circle.java
    M environments/osgi/examples/paint/paint-core/src/main/java/org/jboss/weld/osgi/examples/paint/gui/PaintFrame.java
    M environments/osgi/examples/paint/paint-square/src/main/java/org/jboss/weld/osgi/examples/paint/square/Square.java
    M environments/osgi/examples/paint/paint-triangle/src/main/java/org/jboss/weld/osgi/examples/paint/triangle/Triangle.java
    M environments/osgi/examples/user-doc/user-doc-chapter2/hello-world-consumer2-multilingual/src/main/java/org/jboss/weld/osgi/examples/userdoc/helloworld/consumer/multilingual2/App.java
    M environments/osgi/examples/user-doc/user-doc-chapter3/talkative-dick/src/main/java/org/jboss/weld/osgi/examples/userdoc/talkative/dick/App.java
    M environments/osgi/examples/user-doc/user-doc-chapter3/talkative-harry/src/main/java/org/jboss/weld/osgi/examples/userdoc/talkative/harry/App.java
    M environments/osgi/examples/user-doc/user-doc-chapter3/talkative-tom/src/main/java/org/jboss/weld/osgi/examples/userdoc/talkative/tom/App.java
    M environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-dick/src/main/java/org/jboss/weld/osgi/examples/userdoc/welcoming/dick/App.java
    M environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-harry/src/main/java/org/jboss/weld/osgi/examples/userdoc/welcoming/harry/App.java
    M environments/osgi/examples/user-doc/user-doc-chapter3/welcoming-tom/src/main/java/org/jboss/weld/osgi/examples/userdoc/welcoming/tom/App.java
    M environments/osgi/examples/web/web-england/src/main/java/org/jboss/weld/osgi/examples/web/england/EnglandHotelProvider.java
    M environments/osgi/examples/web/web-france/src/main/java/org/jboss/weld/osgi/examples/web/france/FranceHotelProvider.java
    M environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/HttpServiceTracker.java
    M environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/view/Render.java
    M environments/osgi/examples/web/web-fwk/src/main/java/org/jboss/weld/osgi/examples/web/fwk/view/Renderable.java
    M environments/osgi/examples/web/web-spain/src/main/java/org/jboss/weld/osgi/examples/web/spain/SpainHotelProvider.java
    M environments/osgi/examples/web/web-webapp/src/main/java/org/jboss/weld/osgi/examples/web/app/HotelController.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/AsynchronousListener.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/CDIActivator.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/FlagFarm.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/OSGiActivator.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/SynchronousListener.java
    M environments/osgi/tests/bundles/life-cycle/src/main/java/org/jboss/weld/osgi/tests/lifecycle/Timer.java
    M environments/osgi/tests/utils/src/main/java/org/jboss/weld/environment/osgi/tests/util/Environment.java
    M environments/osgi/tests/utils/src/main/java/org/jboss/weld/environment/osgi/tests/util/WeldOSGiWait.java

  Log Message:
  -----------
  Make checkstyle even happier


  Commit: 0154ca5a9715a549b20609443815f979877967cf
      https://github.com/weld/core/commit/0154ca5a9715a549b20609443815f979877967cf
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/extension/src/main/resources/META-INF/weld-osgi-core-extension.bnd
    M environments/osgi/core/integration/src/main/resources/META-INF/weld-osgi-core-integration.bnd
    M environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd

  Log Message:
  -----------
  Define javax.interceptor version properly in exports


  Commit: 82c7e347078d874828c78263035563f6d67356f8
      https://github.com/weld/core/commit/82c7e347078d874828c78263035563f6d67356f8
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/LifeCycleTest.java
    M environments/osgi/tests/utils/src/main/java/org/jboss/weld/environment/osgi/tests/util/Environment.java

  Log Message:
  -----------
  Use correct project version in tests


  Commit: bf22df4a21458e9547db801bec84ed049dabf579
      https://github.com/weld/core/commit/bf22df4a21458e9547db801bec84ed049dabf579
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M environments/osgi/core/integration/src/main/resources/META-INF/weld-osgi-core-integration.bnd
    M environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd

  Log Message:
  -----------
  Fix imports and exports


  Commit: bcde22b0acddfecbfa7cd8344d2ea192096d0173
      https://github.com/weld/core/commit/bcde22b0acddfecbfa7cd8344d2ea192096d0173
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-20 (Sat, 20 Jul 2013)

  Changed paths:
    M environments/osgi/core/mandatory/pom.xml
    M environments/osgi/core/mandatory/src/main/resources/META-INF/weld-osgi-core-mandatory.bnd
    M environments/osgi/tests/bundles/importing-bundle/src/main/resources/META-INF/weld-osgi-importing.bnd

  Log Message:
  -----------
  Fix exports


  Commit: affa467861f041a0d445a1656ff2edd61a544275
      https://github.com/weld/core/commit/affa467861f041a0d445a1656ff2edd61a544275
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2013-07-20 (Sat, 20 Jul 2013)

  Changed paths:
    M environments/osgi/tests/tester/pom.xml

  Log Message:
  -----------
  Allocate more memory for weld-osgi test run


Compare: https://github.com/weld/core/compare/26658e4b9038^...affa467861f0


More information about the weld-commits mailing list