aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r1780127 [1/5] - in /aries/trunk/cdi: ./ cdi-api-provider-fragment/ cdi-api-provider-fragment/src/ cdi-api-provider-fragment/src/main/ cdi-api-provider-fragment/src/main/resources/ cdi-api-provider-fragment/src/main/resources/META-INF/ cdi-...
Date Wed, 25 Jan 2017 00:08:05 GMT
Author: davidb
Date: Wed Jan 25 00:08:04 2017
New Revision: 1780127

URL: http://svn.apache.org/viewvc?rev=1780127&view=rev
Log:
ARIES-1665 Initial contribution of implementation of OSGi RFC-193

Committed on behalf of Raymond Augé with many thanks.
This closes https://github.com/apache/aries/pull/64

Added:
    aries/trunk/cdi/LICENSE
    aries/trunk/cdi/NOTICE
    aries/trunk/cdi/README.md
    aries/trunk/cdi/cdi-api-provider-fragment/
    aries/trunk/cdi/cdi-api-provider-fragment/LICENSE
    aries/trunk/cdi/cdi-api-provider-fragment/NOTICE
    aries/trunk/cdi/cdi-api-provider-fragment/bnd.bnd
    aries/trunk/cdi/cdi-api-provider-fragment/pom.xml
    aries/trunk/cdi/cdi-api-provider-fragment/src/
    aries/trunk/cdi/cdi-api-provider-fragment/src/main/
    aries/trunk/cdi/cdi-api-provider-fragment/src/main/resources/
    aries/trunk/cdi/cdi-api-provider-fragment/src/main/resources/META-INF/
    aries/trunk/cdi/cdi-api-provider-fragment/src/main/resources/META-INF/services/
    aries/trunk/cdi/cdi-api-provider-fragment/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider
    aries/trunk/cdi/cdi-executable/
    aries/trunk/cdi/cdi-executable/LICENSE
    aries/trunk/cdi/cdi-executable/NOTICE
    aries/trunk/cdi/cdi-executable/cdi-executable.bndrun
    aries/trunk/cdi/cdi-executable/pom.xml
    aries/trunk/cdi/cdi-extender/
    aries/trunk/cdi/cdi-extender/LICENSE
    aries/trunk/cdi/cdi-extender/NOTICE
    aries/trunk/cdi/cdi-extender/bnd.bnd
    aries/trunk/cdi/cdi-extender/pom.xml
    aries/trunk/cdi/cdi-extender/src/
    aries/trunk/cdi/cdi-extender/src/main/
    aries/trunk/cdi/cdi-extender/src/main/java/
    aries/trunk/cdi/cdi-extender/src/main/java/org/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/CdiBundleExtension.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/BundleContextBean.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CdiCommand.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/BindType.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/BundleDeployment.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/BundleDeploymentArchive.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/CdiContainerService.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/CdiContainerState.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ExtensionDependency.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ExtensionMetadata.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/FilterBuilder.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Phase_1_Init.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Phase_2_Extension.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Phase_3_Reference.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Phase_4_Publish.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ReferenceDependency.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ReferenceExtension.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ServiceDeclaration.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ServiceExtension.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/SimpleEnvironment.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/literal/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/literal/AnyLiteral.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/literal/DefaultLiteral.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/literal/ReferenceLiteral.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/literal/ServiceLiteral.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/loader/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/loader/BundleClassLoader.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/loader/BundleResourcesLoader.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/locate/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/locate/ClassLocater.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/locate/ClassLocaterResult.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Reflection.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Sets.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Strings.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Throw.java
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/provider/
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/provider/CDIProvider.java
    aries/trunk/cdi/cdi-extender/src/main/resources/
    aries/trunk/cdi/cdi-extender/src/main/resources/org/
    aries/trunk/cdi/cdi-extender/src/main/resources/org/apache/
    aries/trunk/cdi/cdi-extender/src/main/resources/org/apache/aries/
    aries/trunk/cdi/cdi-extender/src/main/resources/org/apache/aries/cdi/
    aries/trunk/cdi/cdi-extender/src/main/resources/org/apache/aries/cdi/provider/
    aries/trunk/cdi/cdi-extender/src/main/resources/org/apache/aries/cdi/provider/packageinfo
    aries/trunk/cdi/cdi-extension-jndi/
    aries/trunk/cdi/cdi-extension-jndi/LICENSE
    aries/trunk/cdi/cdi-extension-jndi/NOTICE
    aries/trunk/cdi/cdi-extension-jndi/bnd.bnd
    aries/trunk/cdi/cdi-extension-jndi/pom.xml
    aries/trunk/cdi/cdi-extension-jndi/src/
    aries/trunk/cdi/cdi-extension-jndi/src/main/
    aries/trunk/cdi/cdi-extension-jndi/src/main/java/
    aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/
    aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/
    aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/
    aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/
    aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/
    aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/
    aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiContext.java
    aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtension.java
    aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiObjectFactory.java
    aries/trunk/cdi/cdi-itests/
    aries/trunk/cdi/cdi-itests/LICENSE
    aries/trunk/cdi/cdi-itests/NOTICE
    aries/trunk/cdi/cdi-itests/bnd/
    aries/trunk/cdi/cdi-itests/bnd.bnd
    aries/trunk/cdi/cdi-itests/bnd/basic-beans.bnd
    aries/trunk/cdi/cdi-itests/bnd/basic-beans.xml
    aries/trunk/cdi/cdi-itests/bnd/services-one.bnd
    aries/trunk/cdi/cdi-itests/bnd/tb1.bnd
    aries/trunk/cdi/cdi-itests/bnd/tb2.bnd
    aries/trunk/cdi/cdi-itests/itest.bndrun
    aries/trunk/cdi/cdi-itests/pom.xml
    aries/trunk/cdi/cdi-itests/src/
    aries/trunk/cdi/cdi-itests/src/main/
    aries/trunk/cdi/cdi-itests/src/main/java/
    aries/trunk/cdi/cdi-itests/src/main/java/org/
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/BeanWithReference.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/BundleContextBean.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/CdiEventObserver.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/ConstructorInjectedService.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedBundleScopedImpl.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedPrototypeScopedImpl.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedService.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/InstanceBean.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/InstanceCardinality0Bean.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/InstanceOrderBean.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/InstancePropertiesBean.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/InstanceServiceReferenceBean.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/MethodInjectedService.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/PojoImpl.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/ServiceWithProperties.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiContainerTests.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiExtenderTests.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiJndiExtensionTests.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTestCase.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/ManifestReferencesAndServicesTestCase.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/components/
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/components/ServiceBundleScope.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/components/ServicePrototypeScope.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/components/ServiceSingletonFour.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/components/ServiceSingletonOne.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/components/ServiceSingletonThree.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/components/ServiceSingletonTwo.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/interfaces/
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/interfaces/BeanService.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/interfaces/BundleContextBeanQualifier.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/interfaces/BundleScoped.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/interfaces/CdiEventObserverQualifier.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/interfaces/FieldInjectedReference.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/interfaces/Pojo.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/interfaces/PrototypeScoped.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/interfaces/SingletonScoped.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb1/
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb1/BeanImpl.java
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb2/
    aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb2/PojoImpl.java
    aries/trunk/cdi/cdi-log4j-configuration-fragment/
    aries/trunk/cdi/cdi-log4j-configuration-fragment/LICENSE
    aries/trunk/cdi/cdi-log4j-configuration-fragment/NOTICE
    aries/trunk/cdi/cdi-log4j-configuration-fragment/bnd.bnd
    aries/trunk/cdi/cdi-log4j-configuration-fragment/pom.xml
    aries/trunk/cdi/cdi-log4j-configuration-fragment/src/
    aries/trunk/cdi/cdi-log4j-configuration-fragment/src/main/
    aries/trunk/cdi/cdi-log4j-configuration-fragment/src/main/resources/
    aries/trunk/cdi/cdi-log4j-configuration-fragment/src/main/resources/log4j.properties
    aries/trunk/cdi/pom.xml

Added: aries/trunk/cdi/LICENSE
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/LICENSE?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/LICENSE (added)
+++ aries/trunk/cdi/LICENSE Wed Jan 25 00:08:04 2017
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Added: aries/trunk/cdi/NOTICE
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/NOTICE?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/NOTICE (added)
+++ aries/trunk/cdi/NOTICE Wed Jan 25 00:08:04 2017
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+

Added: aries/trunk/cdi/README.md
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/README.md?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/README.md (added)
+++ aries/trunk/cdi/README.md Wed Jan 25 00:08:04 2017
@@ -0,0 +1,23 @@
+# Aries CDI Integration
+
+This is an implementation of [OSGi RFC 0193](https://github.com/osgi/design/blob/master/rfcs/rfc0193/rfc-0193-CDI-Integration.pdf).
+
+## License
+
+[Apache License Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)
+
+## Building From Source
+
+The build uses maven so it should look pretty familiar to most developers.
+
+`mvn clean install`
+
+## Pre-built runtime
+
+This repository contains an [OSGi enRoute](http://enroute.osgi.org/) based, pre-assembled executable jar providing a complete runtime for you to just drop in your CDI bundles. It comes preconfigured with logging, Gogo shell and Felix SCR.
+
+Once you've completed a successfull build, you should be able to execute the command:
+
+`java -jar cdi-extender-executable/cdi-executable.jar`
+
+and be presented with a gogo shell prompt ready for you to install a CDI bundle.

Added: aries/trunk/cdi/cdi-api-provider-fragment/LICENSE
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-api-provider-fragment/LICENSE?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-api-provider-fragment/LICENSE (added)
+++ aries/trunk/cdi/cdi-api-provider-fragment/LICENSE Wed Jan 25 00:08:04 2017
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Added: aries/trunk/cdi/cdi-api-provider-fragment/NOTICE
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-api-provider-fragment/NOTICE?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-api-provider-fragment/NOTICE (added)
+++ aries/trunk/cdi/cdi-api-provider-fragment/NOTICE Wed Jan 25 00:08:04 2017
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+

Added: aries/trunk/cdi/cdi-api-provider-fragment/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-api-provider-fragment/bnd.bnd?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-api-provider-fragment/bnd.bnd (added)
+++ aries/trunk/cdi/cdi-api-provider-fragment/bnd.bnd Wed Jan 25 00:08:04 2017
@@ -0,0 +1,4 @@
+Fragment-Host: javax.enterprise.cdi-api
+Import-Package: org.apache.aries.cdi.provider;cdi-api-bundle=true
+-resourceonly: true
+-includeresource: META-INF/=LICENSE, META-INF/=NOTICE
\ No newline at end of file

Added: aries/trunk/cdi/cdi-api-provider-fragment/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-api-provider-fragment/pom.xml?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-api-provider-fragment/pom.xml (added)
+++ aries/trunk/cdi/cdi-api-provider-fragment/pom.xml Wed Jan 25 00:08:04 2017
@@ -0,0 +1,28 @@
+<project
+xmlns="http://maven.apache.org/POM/4.0.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.aries.cdi</groupId>
+		<artifactId>org.apache.aries.cdi</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<artifactId>org.apache.aries.cdi.api.provider.fragment</artifactId>
+	<description>CDI API Provider Fragment</description>
+	<name>CDI API Provider Fragment</name>
+	<version>0.0.1-SNAPSHOT</version>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

Added: aries/trunk/cdi/cdi-api-provider-fragment/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-api-provider-fragment/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-api-provider-fragment/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider (added)
+++ aries/trunk/cdi/cdi-api-provider-fragment/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider Wed Jan 25 00:08:04 2017
@@ -0,0 +1 @@
+org.apache.aries.cdi.provider.CDIProvider
\ No newline at end of file

Added: aries/trunk/cdi/cdi-executable/LICENSE
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-executable/LICENSE?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-executable/LICENSE (added)
+++ aries/trunk/cdi/cdi-executable/LICENSE Wed Jan 25 00:08:04 2017
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Added: aries/trunk/cdi/cdi-executable/NOTICE
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-executable/NOTICE?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-executable/NOTICE (added)
+++ aries/trunk/cdi/cdi-executable/NOTICE Wed Jan 25 00:08:04 2017
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+

Added: aries/trunk/cdi/cdi-executable/cdi-executable.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-executable/cdi-executable.bndrun?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-executable/cdi-executable.bndrun (added)
+++ aries/trunk/cdi/cdi-executable/cdi-executable.bndrun Wed Jan 25 00:08:04 2017
@@ -0,0 +1,45 @@
+
+#-runtrace: false
+#-runvm: -Xdebug, "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
+
+-standalone: target/index.xml
+
+-runrequires: \
+	osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.extender)',\
+	osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.log4j.configuration.fragment)',\
+	osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
+	osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)',\
+	osgi.identity;filter:='(osgi.identity=slf4j.log4j12)'
+
+-runbundles: \
+	javax.enterprise.cdi-api; version='[1.2.0,1.2.1)',\
+	jboss-classfilewriter; version='[1.1.2,1.1.3)',\
+	log4j; version='[1.2.17,1.2.18)',\
+	org.apache.aries.cdi.extender; version='[0.0.1,0.0.2)',\
+	org.apache.aries.cdi.log4j.configuration.fragment; version='[0.0.1,0.0.2)',\
+	org.apache.aries.cdi.osgi.api; version='[0.0.1,0.0.2)',\
+	org.apache.felix.bundlerepository; version='[1.6.0,1.6.1)',\
+	org.apache.felix.gogo.command; version='[1.0.0,1.0.1)',\
+	org.apache.felix.gogo.jline; version='[1.0.0,1.0.1)',\
+	org.apache.felix.gogo.runtime; version='[1.0.0,1.0.1)',\
+	org.apache.logging.log4j.api; version='[2.7.0,2.7.1)',\
+	org.glassfish.hk2.external.javax.inject; version='[2.5.0,2.5.1)',\
+	org.jboss.logging.jboss-logging; version='[3.2.1,3.2.2)',\
+	org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec; version='[1.0.0,1.0.1)',\
+	org.jboss.spec.javax.el.jboss-el-api_3.0_spec; version='[1.0.0,1.0.1)',\
+	org.jboss.spec.javax.interceptor.jboss-interceptors-api_1.2_spec; version='[1.0.0,1.0.1)',\
+	org.jboss.weld.osgi-bundle; version='[2.4.0,2.4.1)',\
+	org.jline; version='[3.0.0,3.0.1)',\
+	slf4j.api; version='[1.7.21,1.7.22)',\
+	slf4j.log4j12; version='[1.6.1,1.6.2)'
+
+-resolve.effective: resolve, active
+-runee: JavaSE-1.8
+-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
+-runproperties: \
+	osgi.console.enable.builtin=false, \
+	osgi.console=, \
+	org.osgi.service.http.port=8080,\
+	org.jboss.logging.provider=slf4j
+-runsystemcapabilities.dflt: ${native_capability}
+-runsystempackages: javax.script

Added: aries/trunk/cdi/cdi-executable/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-executable/pom.xml?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-executable/pom.xml (added)
+++ aries/trunk/cdi/cdi-executable/pom.xml Wed Jan 25 00:08:04 2017
@@ -0,0 +1,153 @@
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.aries.cdi</groupId>
+		<artifactId>org.apache.aries.cdi</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<artifactId>org.apache.aries.cdi.executable</artifactId>
+	<name>CDI Extender Executable Jar</name>
+	<packaging>pom</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-indexer-maven-plugin</artifactId>
+				<configuration>
+					<localURLs>REQUIRED</localURLs>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-export-maven-plugin</artifactId>
+				<configuration>
+					<failOnChanges>false</failOnChanges>
+					<resolve>true</resolve>
+					<bndruns>
+						<bndrun>cdi-executable.bndrun</bndrun>
+					</bndruns>
+					<targetDir>.</targetDir>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.21</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>2.7</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.aries.cdi</groupId>
+			<artifactId>org.apache.aries.cdi.extender</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.aries.cdi</groupId>
+			<artifactId>org.apache.aries.cdi.log4j.configuration.fragment</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.aries.jndi</groupId>
+			<artifactId>org.apache.aries.jndi.api</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.aries.jndi</groupId>
+			<artifactId>org.apache.aries.jndi.core</artifactId>
+			<version>1.0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.configadmin</artifactId>
+			<version>1.8.8</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.gogo.command</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.gogo.jline</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.scr</artifactId>
+			<version>2.0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.hk2.external</groupId>
+			<artifactId>javax.inject</artifactId>
+			<version>2.5.0-b27</version>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.eclipse.equinox.metatype</artifactId>
+			<version>1.4.100.v20150408-1437</version>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<version>3.10.100.v20150529-1857</version>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>osgi.enroute.junit.wrapper</artifactId>
+			<version>4.12.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>osgi.enroute.hamcrest.wrapper</artifactId>
+			<version>1.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.namespace.extender</artifactId>
+			<version>1.0.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.service.component.annotations</artifactId>
+			<version>1.3.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.service.metatype</artifactId>
+			<version>1.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>osgi.core</artifactId>
+			<version>6.0.0</version>
+		</dependency>
+	</dependencies>
+
+</project>

Added: aries/trunk/cdi/cdi-extender/LICENSE
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/LICENSE?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-extender/LICENSE (added)
+++ aries/trunk/cdi/cdi-extender/LICENSE Wed Jan 25 00:08:04 2017
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Added: aries/trunk/cdi/cdi-extender/NOTICE
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/NOTICE?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-extender/NOTICE (added)
+++ aries/trunk/cdi/cdi-extender/NOTICE Wed Jan 25 00:08:04 2017
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+

Added: aries/trunk/cdi/cdi-extender/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/bnd.bnd?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-extender/bnd.bnd (added)
+++ aries/trunk/cdi/cdi-extender/bnd.bnd Wed Jan 25 00:08:04 2017
@@ -0,0 +1,13 @@
+Bundle-Activator: org.apache.aries.cdi.container.internal.Activator
+Conditional-Package: \
+	org.apache.felix.converter.impl,\
+	org.apache.felix.utils.extender,\
+	org.osgi.util.converter,\
+	org.osgi.util.function
+Export-Package: org.apache.aries.cdi.provider;cdi-api-bundle=true;mandatory:=cdi-api-bundle
+Provide-Capability: \
+	osgi.extender; \
+		osgi.extender='osgi.cdi'; \
+		uses:="org.osgi.service.cdi,javax.enterprise.inject.spi"; \
+		version:Version="0.0.1"
+-includeresource: META-INF/=LICENSE, META-INF/=NOTICE
\ No newline at end of file

Added: aries/trunk/cdi/cdi-extender/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/pom.xml?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-extender/pom.xml (added)
+++ aries/trunk/cdi/cdi-extender/pom.xml Wed Jan 25 00:08:04 2017
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.aries.cdi</groupId>
+		<artifactId>org.apache.aries.cdi</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<artifactId>org.apache.aries.cdi.extender</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>CDI Extender</name>
+	<description>CDI Extender</description>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
+			</plugin>
+			<!--
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-baseline-maven-plugin</artifactId>
+			</plugin>
+			-->
+		</plugins>
+	</build>
+
+	<dependencies>
+		<!-- Keep org.osgi:org.osgi.core:6.0.0 before the other Aries ones because otherwise we get an older version. -->
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>osgi.core</artifactId>
+			<version>6.0.0</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.aries.cdi</groupId>
+			<artifactId>org.apache.aries.cdi.osgi.api</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.converter</artifactId>
+			<version>0.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.utils</artifactId>
+			<version>1.8.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.weld</groupId>
+			<artifactId>weld-osgi-bundle</artifactId>
+			<version>2.4.0.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.namespace.extender</artifactId>
+			<version>1.0.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.0</version>
+		</dependency>
+	</dependencies>
+
+</project>

Added: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java (added)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java Wed Jan 25 00:08:04 2017
@@ -0,0 +1,167 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.container.internal;
+
+import static org.osgi.namespace.extender.ExtenderNamespace.EXTENDER_NAMESPACE;
+import static org.osgi.service.cdi.CdiExtenderConstants.CDI_EXTENDER;
+
+import java.util.Comparator;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentSkipListMap;
+
+import org.apache.aries.cdi.container.internal.command.CdiCommand;
+import org.apache.felix.utils.extender.AbstractExtender;
+import org.apache.felix.utils.extender.Extension;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.framework.wiring.BundleWire;
+import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.service.cdi.CdiListener;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Activator extends AbstractExtender {
+
+	public Activator() {
+		setSynchronous(true);
+	}
+
+	@Override
+	public void start(BundleContext bundleContext) throws Exception {
+		if (_log.isDebugEnabled()) {
+			_log.debug("CDIe - starting {}", bundleContext.getBundle());
+		}
+
+		_bundleContext = bundleContext;
+
+		_listenerTracker = new ServiceTracker<>(_bundleContext, CdiListener.class, new CdiListenerCustomizer());
+		_listenerTracker.open();
+
+		registerCdiCommand(_bundleContext);
+
+		super.start(bundleContext);
+
+		if (_log.isDebugEnabled()) {
+			_log.debug("CDIe - started {}", bundleContext.getBundle());
+		}
+	}
+
+	private void registerCdiCommand(BundleContext bundleContext) {
+		Dictionary<String, Object> properties = new Hashtable<>();
+		properties.put("osgi.command.scope", "cdi");
+		properties.put("osgi.command.function", new String[] {"list", "info"});
+
+		_command = new CdiCommand();
+		_commandRegistration = _bundleContext.registerService(Object.class, _command, properties);
+	}
+
+	@Override
+	public void stop(BundleContext bundleContext) throws Exception {
+		if (_log.isDebugEnabled()) {
+			_log.debug("CDIe - stoping {}", bundleContext.getBundle());
+		}
+
+		super.stop(bundleContext);
+
+		_listenerTracker.close();
+
+		if (_log.isDebugEnabled()) {
+			_log.debug("CDIe - stoped {}", bundleContext.getBundle());
+		}
+	}
+
+	@Override
+	protected Extension doCreateExtension(Bundle bundle) throws Exception {
+		if (!requiresCdiExtender(bundle)) {
+			return null;
+		}
+
+		return new CdiBundleExtension(_bundleContext.getBundle(), bundle, _listeners, _command);
+	}
+
+	@Override
+	protected void debug(Bundle bundle, String msg) {
+		_log.debug(msg);
+	}
+
+	@Override
+	protected void warn(Bundle bundle, String msg, Throwable t) {
+		_log.warn(msg, t);
+	}
+
+	@Override
+	protected void error(String msg, Throwable t) {
+		_log.error(msg, t);
+	}
+
+	private final boolean requiresCdiExtender(Bundle bundle) {
+		BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
+		List<BundleWire> requiredBundleWires = bundleWiring.getRequiredWires(EXTENDER_NAMESPACE);
+
+		for (BundleWire bundleWire : requiredBundleWires) {
+			Map<String, Object> attributes = bundleWire.getCapability().getAttributes();
+
+			if (attributes.containsKey(EXTENDER_NAMESPACE) &&
+				attributes.get(EXTENDER_NAMESPACE).equals(CDI_EXTENDER)) {
+
+				Bundle providerWiringBundle = bundleWire.getProviderWiring().getBundle();
+
+				if (providerWiringBundle.equals(_bundleContext.getBundle())) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	private static final Logger _log = LoggerFactory.getLogger(Activator.class);
+
+	private BundleContext _bundleContext;
+	private CdiCommand _command;
+	private ServiceRegistration<?> _commandRegistration;
+	private Map<ServiceReference<CdiListener>, CdiListener> _listeners =
+		new ConcurrentSkipListMap<>(Comparator.reverseOrder());
+	private ServiceTracker<CdiListener, CdiListener> _listenerTracker;
+
+	private class CdiListenerCustomizer implements ServiceTrackerCustomizer<CdiListener, CdiListener> {
+
+		@Override
+		public CdiListener addingService(ServiceReference<CdiListener> reference) {
+			CdiListener cdiListener = _bundleContext.getService(reference);
+			_listeners.put(reference, cdiListener);
+			return cdiListener;
+		}
+
+		@Override
+		public void modifiedService(ServiceReference<CdiListener> reference, CdiListener service) {
+		}
+
+		@Override
+		public void removedService(ServiceReference<CdiListener> reference, CdiListener service) {
+			_listeners.remove(reference);
+			_bundleContext.ungetService(reference);
+		}
+
+	}
+
+}
\ No newline at end of file

Added: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/CdiBundleExtension.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/CdiBundleExtension.java?rev=1780127&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/CdiBundleExtension.java (added)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/CdiBundleExtension.java Wed Jan 25 00:08:04 2017
@@ -0,0 +1,139 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.cdi.container.internal;
+
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.apache.aries.cdi.container.internal.command.CdiCommand;
+import org.apache.aries.cdi.container.internal.container.CdiContainerState;
+import org.apache.aries.cdi.container.internal.container.Phase_1_Init;
+import org.apache.felix.utils.extender.Extension;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.cdi.CdiEvent;
+import org.osgi.service.cdi.CdiListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CdiBundleExtension implements Extension {
+
+	public CdiBundleExtension(
+		Bundle extenderBundle, Bundle bundle, Map<ServiceReference<CdiListener>, CdiListener> listeners,
+		CdiCommand command) {
+
+		_extenderBundle = extenderBundle;
+		_bundle = bundle;
+		_listeners = listeners;
+		_command = command;
+	}
+
+	@Override
+	public void start() throws Exception {
+		boolean acquired = false;
+		try {
+			try {
+				acquired = _stateLock.tryLock(DEFAULT_STOP_TIMEOUT, TimeUnit.MILLISECONDS);
+			}
+			catch ( InterruptedException e ) {
+				Thread.currentThread().interrupt();
+
+				_log.warn(
+					"The wait for bundle {0}/{1} being destroyed before starting has been interrupted.",
+					_bundle.getSymbolicName(), _bundle.getBundleId(), e );
+			}
+
+			if (_log.isDebugEnabled()) {
+				_log.debug("CDIe - bundle detected {}", _bundle);
+			}
+
+			CdiContainerState cdiHelper = new CdiContainerState(_bundle, _extenderBundle, _listeners);
+
+			_command.add(_bundle.getBundleId(), cdiHelper);
+
+			Phase_1_Init initPhase = null;
+
+			try {
+				initPhase = new Phase_1_Init(_bundle, cdiHelper);
+
+				initPhase.open();
+
+				_initPhase = initPhase;
+			}
+			catch (Throwable t) {
+				cdiHelper.fire(CdiEvent.State.FAILURE, t);
+
+				if (initPhase != null) {
+					initPhase.close();
+				}
+
+				_command.remove(_bundle.getBundleId());
+
+				cdiHelper.close();
+			}
+		}
+		finally {
+			if (acquired) {
+				_stateLock.unlock();
+			}
+		}
+	}
+
+	@Override
+	public void destroy() throws Exception {
+		boolean acquired = false;
+		try {
+			try {
+				acquired = _stateLock.tryLock(DEFAULT_STOP_TIMEOUT, TimeUnit.MILLISECONDS);
+
+			}
+			catch (InterruptedException e) {
+				Thread.currentThread().interrupt();
+				_log.warn(
+					"The wait for bundle {0}/{1} being started before destruction has been interrupted.",
+					_bundle.getSymbolicName(), _bundle.getBundleId(), e);
+			}
+
+			_initPhase.close();
+
+			_initPhase = null;
+
+			_command.remove(_bundle.getBundleId());
+
+			if (_log.isDebugEnabled()) {
+				_log.debug("CDIe - bundle removed {}", _bundle);
+			}
+		}
+		finally {
+			if (acquired) {
+				_stateLock.unlock();
+			}
+		}
+	}
+
+	private static final long DEFAULT_STOP_TIMEOUT = 60000;
+
+	private static final Logger _log = LoggerFactory.getLogger(CdiBundleExtension.class);
+
+	private final Bundle _bundle;
+	private final CdiCommand _command;
+	private final Bundle _extenderBundle;
+	private final Map<ServiceReference<CdiListener>, CdiListener> _listeners;
+	private Phase_1_Init _initPhase;
+	private final Lock _stateLock = new ReentrantLock();
+
+}



Mime
View raw message