support osgi mediator spec

Signed-off-by: Lukas Jungmann <[email protected]>
eclipse-ee4j · Oct 17, 2023 · 9154934 · 9154934
1 parent fef9113
commit 9154934
Show file tree

Hide file tree

Showing 8 changed files with 240 additions and 0 deletions.
diff --git a/jaxws-ri/bundles/jaxws-rt/pom.xml b/jaxws-ri/bundles/jaxws-rt/pom.xml
@@ -243,6 +243,142 @@
                                 <probe-provider-class-names>com.sun.xml.ws.transport.http.servlet.JAXWSRIDeploymentProbeProvider</probe-provider-class-names>
                                 <Class-Path>jakarta.annotation-api.jar jakarta.activation-api.jar jakarta.mail-api.jar jakarta.xml.bind-api.jar jakarta.xml.ws-api.jar jakarta.xml.soap-api.jar angus-activation.jar angus-mail.jar FastInfoset.jar gmbal-api-only.jar ha-api.jar jaxb-core.jar jaxb-impl.jar management-api.jar mimepull.jar saaj-impl.jar stax-ex.jar stax2-api.jar streambuffer.jar woodstox-core.jar</Class-Path>
                                 <Extension-Name>com.sun.xml.ws</Extension-Name>
+                                <Require-Capability><![CDATA[
+                            osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)
+                              (version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=jakarta.xml.ws.spi.Provider)";
+                                osgi.serviceloader="jakarta.xml.ws.spi.Provider";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=jakarta.xml.soap.MessageFactory)";
+                                osgi.serviceloader="jakarta.xml.soap.MessageFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=jakarta.xml.soap.SAAJMetaFactory)";
+                                osgi.serviceloader="jakarta.xml.soap.SAAJMetaFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=jakarta.xml.soap.SOAPConnectionFactory)";
+                                osgi.serviceloader="jakarta.xml.soap.SOAPConnectionFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=jakarta.xml.soap.SOAPFactory)";
+                                osgi.serviceloader="jakarta.xml.soap.SOAPFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.policy.jaxws.spi.PolicyFeatureConfigurator)";
+                                osgi.serviceloader="com.sun.xml.ws.policy.jaxws.spi.PolicyFeatureConfigurator";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.policy.jaxws.spi.PolicyMapConfigurator)";
+                                osgi.serviceloader="com.sun.xml.ws.policy.jaxws.spi.PolicyMapConfigurator";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.policy.spi.LoggingProvider)";
+                                osgi.serviceloader="com.sun.xml.ws.policy.spi.LoggingProvider";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.policy.spi.PolicyAssertionValidator)";
+                                osgi.serviceloader="com.sun.xml.ws.policy.spi.PolicyAssertionValidator";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.policy.spi.PolicyAssertionCreator)";
+                                osgi.serviceloader="com.sun.xml.ws.policy.spi.PolicyAssertionCreator";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.policy.spi.PrefixMapper)";
+                                osgi.serviceloader="com.sun.xml.ws.policy.spi.PrefixMapper";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.wsdl.parser.MetadataResolverFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.api.wsdl.parser.MetadataResolverFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.spi.db.DatabindingProvider)";
+                                osgi.serviceloader="com.sun.xml.ws.spi.db.DatabindingProvider";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.spi.db.BindingContextFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.spi.db.BindingContextFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.oracle.webservices.impl.internalspi.encoding.StreamDecoder)";
+                                osgi.serviceloader="com.oracle.webservices.impl.internalspi.encoding.StreamDecoder";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.message.saaj.SAAJFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.api.message.saaj.SAAJFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.oracle.webservices.api.message.MessageContextFactory)";
+                                osgi.serviceloader="com.oracle.webservices.api.message.MessageContextFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.BindingIDFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.api.BindingIDFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.client.ServiceInterceptorFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.api.client.ServiceInterceptorFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.policy.PolicyResolverFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.api.policy.PolicyResolverFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.pipe.TransportTubeFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.api.pipe.TransportTubeFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.pipe.TransportPipeFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.api.pipe.TransportPipeFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.pipe.TubelineAssemblerFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.api.pipe.TubelineAssemblerFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.pipe.PipelineAssemblerFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.api.pipe.PipelineAssemblerFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.server.ProviderInvokerTubeFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.api.server.ProviderInvokerTubeFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.config.management.ManagedEndpointFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.api.config.management.ManagedEndpointFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.assembler.dev.TubelineAssemblyDecorator)";
+                                osgi.serviceloader="com.sun.xml.ws.assembler.dev.TubelineAssemblyDecorator";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.wsdl.parser.WSDLParserExtension)";
+                                osgi.serviceloader="com.sun.xml.ws.api.wsdl.parser.WSDLParserExtension";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.wsdl.writer.WSDLGeneratorExtension)";
+                                osgi.serviceloader="com.sun.xml.ws.api.wsdl.writer.WSDLGeneratorExtension";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.client.ServiceInterceptorFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.api.server.EndpointReferenceExtensionContributor";
+                                cardinality:=multiple;resolution:=optional
+                          ]]>
+                                </Require-Capability>
+                                <Provide-Capability><![CDATA[
+                            osgi.serviceloader;
+                              osgi.serviceloader="jakarta.xml.ws.spi.Provider",
+                            osgi.serviceloader;
+                              osgi.serviceloader="com.sun.xml.ws.policy.spi.LoggingProvider",
+                            osgi.serviceloader;
+                              osgi.serviceloader="com.sun.xml.ws.spi.db.DatabindingProvider",
+                            osgi.serviceloader;
+                              osgi.serviceloader="com.sun.xml.ws.spi.db.BindingContextFactory"
+                            ]]>
+                                </Provide-Capability>
                             </instructions>
                         </configuration>
                     </execution>

diff --git a/jaxws-ri/bundles/jaxws-tools/pom.xml b/jaxws-ri/bundles/jaxws-tools/pom.xml
@@ -172,6 +172,46 @@
                                 <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                                 <Class-Path>jaxws-rt.jar jaxb-xjc.jar jaxb-jxc.jar</Class-Path>
                                 <Extension-Name>com.sun.tools.jaxws</Extension-Name>
+                                <Require-Capability><![CDATA[
+                            osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)
+                              (version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                            osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)
+                              (version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.wsdl.parser.MetadataResolverFactory)";
+                                osgi.serviceloader="com.sun.xml.ws.api.wsdl.parser.MetadataResolverFactory";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.xml.ws.api.wsdl.writer.WSDLGeneratorExtension)";
+                                osgi.serviceloader="com.sun.xml.ws.api.wsdl.writer.WSDLGeneratorExtension";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.tools.ws.api.TJavaGeneratorExtension)";
+                                osgi.serviceloader="com.sun.tools.ws.api.TJavaGeneratorExtension";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.tools.ws.api.WsgenExtension)";
+                                osgi.serviceloader="com.sun.tools.ws.api.WsgenExtension";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.tools.ws.api.wsdl.TWSDLExtensionHandler)";
+                                osgi.serviceloader="com.sun.tools.ws.api.wsdl.TWSDLExtensionHandler";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.tools.ws.processor.generator.GeneratorExtension)";
+                                osgi.serviceloader="com.sun.tools.ws.processor.generator.GeneratorExtension";
+                                cardinality:=multiple;resolution:=optional,
+                            osgi.serviceloader;
+                              filter:="(osgi.serviceloader=com.sun.tools.ws.wscompile.Plugin)";
+                                osgi.serviceloader="com.sun.tools.ws.wscompile.Plugin";
+                                cardinality:=multiple;resolution:=optional
+                          ]]>
+                                </Require-Capability>
+                                <Provide-Capability><![CDATA[
+                            osgi.serviceloader;
+                              osgi.serviceloader="com.sun.tools.ws.wscompile.Plugin"
+                            ]]>
+                                </Provide-Capability>
                             </instructions>
                         </configuration>
                     </execution>

diff --git a/jaxws-ri/docs/release-documentation/src/main/docbook/changelog.xml b/jaxws-ri/docs/release-documentation/src/main/docbook/changelog.xml
@@ -29,6 +29,9 @@
             <para>4.0.2</para>
 
             <itemizedlist>
+                <listitem>
+                    <para>Adds support for OSGi Mediator specification</para>
+                </listitem>
                 <listitem>
                     <para>Replaces the last resort fallback to Java SE provided runtime by the fallback to the current WS runtime</para>
                 </listitem>

diff --git a/jaxws-ri/extras/eclipselink_jaxb/pom.xml b/jaxws-ri/extras/eclipselink_jaxb/pom.xml
@@ -105,6 +105,16 @@
                                     org.eclipse.persistence.*;version=!,
                                     *
                                 </Import-Package>
+                                <Require-Capability><![CDATA[
+                            osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)
+                              (version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional
+                            ]]>
+                                </Require-Capability>
+                                <Provide-Capability><![CDATA[
+                            osgi.serviceloader;
+                              osgi.serviceloader="com.sun.xml.ws.spi.db.BindingContextFactory"
+                            ]]>
+                                </Provide-Capability>
                             </instructions>
                         </configuration>
                     </execution>

diff --git a/jaxws-ri/extras/eclipselink_sdo/pom.xml b/jaxws-ri/extras/eclipselink_sdo/pom.xml
@@ -94,6 +94,16 @@
                                     org.eclipse.persistence.*;version=!,
                                     *
                                 </Import-Package>
+                                <Require-Capability><![CDATA[
+                            osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)
+                              (version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional
+                            ]]>
+                                </Require-Capability>
+                                <Provide-Capability><![CDATA[
+                            osgi.serviceloader;
+                              osgi.serviceloader="com.sun.xml.ws.spi.db.BindingContextFactory"
+                            ]]>
+                                </Provide-Capability>
                             </instructions>
                         </configuration>
                     </execution>

diff --git a/jaxws-ri/extras/transports/async-client-transport/pom.xml b/jaxws-ri/extras/transports/async-client-transport/pom.xml
@@ -53,6 +53,16 @@
                         <configuration>
                             <instructions>
                                 <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+                                <Require-Capability><![CDATA[
+                            osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)
+                              (version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional
+                            ]]>
+                                </Require-Capability>
+                                <Provide-Capability><![CDATA[
+                            osgi.serviceloader;
+                              osgi.serviceloader="com.sun.xml.ws.api.pipe.TransportTubeFactory"
+                            ]]>
+                                </Provide-Capability>
                             </instructions>
                         </configuration>
                     </execution>

diff --git a/jaxws-ri/extras/transports/local/pom.xml b/jaxws-ri/extras/transports/local/pom.xml
@@ -52,6 +52,16 @@
                         <configuration>
                             <instructions>
                                 <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+                                <Require-Capability><![CDATA[
+                            osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)
+                              (version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional
+                            ]]>
+                                </Require-Capability>
+                                <Provide-Capability><![CDATA[
+                            osgi.serviceloader;
+                              osgi.serviceloader="com.sun.xml.ws.api.pipe.TransportTubeFactory"
+                            ]]>
+                                </Provide-Capability>
                             </instructions>
                         </configuration>
                     </execution>