You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ro...@apache.org on 2018/08/16 15:38:20 UTC
svn commit: r1838204 - in /geronimo/specs/trunk/geronimo-jcdi_2.0_spec:
pom.xml src/main/java/javax/enterprise/inject/se/SeContainerInitializer.java
Author: rotty3000
Date: Thu Aug 16 15:38:19 2018
New Revision: 1838204
URL: http://svn.apache.org/viewvc?rev=1838204&view=rev
Log:
GERONIMO-6617 Apply service loader mediator to key modules useful for microprofile: CDI 2.0
Signed-off-by: Raymond Auge <ro...@apache.org>
Modified:
geronimo/specs/trunk/geronimo-jcdi_2.0_spec/pom.xml
geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/se/SeContainerInitializer.java
Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/pom.xml?rev=1838204&r1=1838203&r2=1838204&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/pom.xml Thu Aug 16 15:38:19 2018
@@ -117,6 +117,11 @@
<Provide-Capability><![CDATA[
osgi.contract;osgi.contract=JavaCDI;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.0,1.2,1.1,1.0'
]]></Provide-Capability>
+ <Require-Capability><![CDATA[
+ osgi.serviceloader;filter:="(osgi.serviceloader=javax.enterprise.inject.se.SeContainerInitializer)";cardinality:=multiple,
+ osgi.serviceloader;filter:="(osgi.serviceloader=javax.enterprise.inject.spi.CDIProvider)";cardinality:=multiple,
+ osgi.extender;filter:="(osgi.extender=osgi.serviceloader.processor)"
+ ]]></Require-Capability>
<_contract>JavaInterceptor, JavaEL, JavaInject, JavaAnnotation</_contract>
</instructions>
</configuration>
Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/se/SeContainerInitializer.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/se/SeContainerInitializer.java?rev=1838204&r1=1838203&r2=1838204&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/se/SeContainerInitializer.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/se/SeContainerInitializer.java Thu Aug 16 15:38:19 2018
@@ -44,9 +44,8 @@ public abstract class SeContainerInitial
*/
public static SeContainerInitializer newInstance()
{
- // TODO: OSGi support -> ProviderLocator or is there something better these days?
final Iterator<SeContainerInitializer> serviceLoader =
- ServiceLoader.load(SeContainerInitializer.class, SeContainerInitializer.class.getClassLoader())
+ ServiceLoader.load(SeContainerInitializer.class)
.iterator();
if (!serviceLoader.hasNext())