From 915493487c976323c2e8cd6b8604e2a550d61f93 Mon Sep 17 00:00:00 2001 From: Lukas Jungmann Date: Tue, 17 Oct 2023 15:30:06 +0200 Subject: [PATCH] support osgi mediator spec Signed-off-by: Lukas Jungmann --- jaxws-ri/bundles/jaxws-rt/pom.xml | 136 ++++++++++++++++++ jaxws-ri/bundles/jaxws-tools/pom.xml | 40 ++++++ .../src/main/docbook/changelog.xml | 3 + jaxws-ri/extras/eclipselink_jaxb/pom.xml | 10 ++ jaxws-ri/extras/eclipselink_sdo/pom.xml | 10 ++ .../transports/async-client-transport/pom.xml | 10 ++ jaxws-ri/extras/transports/local/pom.xml | 10 ++ jaxws-ri/runtime/policy/pom.xml | 21 +++ 8 files changed, 240 insertions(+) diff --git a/jaxws-ri/bundles/jaxws-rt/pom.xml b/jaxws-ri/bundles/jaxws-rt/pom.xml index 831f985af..3bb4fd779 100644 --- a/jaxws-ri/bundles/jaxws-rt/pom.xml +++ b/jaxws-ri/bundles/jaxws-rt/pom.xml @@ -243,6 +243,142 @@ com.sun.xml.ws.transport.http.servlet.JAXWSRIDeploymentProbeProvider 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 com.sun.xml.ws + =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 + ]]> + + + diff --git a/jaxws-ri/bundles/jaxws-tools/pom.xml b/jaxws-ri/bundles/jaxws-tools/pom.xml index 84b73df79..3ed136e09 100644 --- a/jaxws-ri/bundles/jaxws-tools/pom.xml +++ b/jaxws-ri/bundles/jaxws-tools/pom.xml @@ -172,6 +172,46 @@ lazy jaxws-rt.jar jaxb-xjc.jar jaxb-jxc.jar com.sun.tools.jaxws + =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 + ]]> + + + diff --git a/jaxws-ri/docs/release-documentation/src/main/docbook/changelog.xml b/jaxws-ri/docs/release-documentation/src/main/docbook/changelog.xml index 944c49658..b73292959 100644 --- 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 @@ 4.0.2 + + Adds support for OSGi Mediator specification + Replaces the last resort fallback to Java SE provided runtime by the fallback to the current WS runtime diff --git a/jaxws-ri/extras/eclipselink_jaxb/pom.xml b/jaxws-ri/extras/eclipselink_jaxb/pom.xml index 986f02a17..7db63e5b2 100644 --- a/jaxws-ri/extras/eclipselink_jaxb/pom.xml +++ b/jaxws-ri/extras/eclipselink_jaxb/pom.xml @@ -105,6 +105,16 @@ org.eclipse.persistence.*;version=!, * + =1.0.0)(!(version>=2.0.0)))";resolution:=optional + ]]> + + + diff --git a/jaxws-ri/extras/eclipselink_sdo/pom.xml b/jaxws-ri/extras/eclipselink_sdo/pom.xml index 102700015..406d6361f 100644 --- a/jaxws-ri/extras/eclipselink_sdo/pom.xml +++ b/jaxws-ri/extras/eclipselink_sdo/pom.xml @@ -94,6 +94,16 @@ org.eclipse.persistence.*;version=!, * + =1.0.0)(!(version>=2.0.0)))";resolution:=optional + ]]> + + + diff --git a/jaxws-ri/extras/transports/async-client-transport/pom.xml b/jaxws-ri/extras/transports/async-client-transport/pom.xml index 77ea1dbbc..64359f633 100644 --- a/jaxws-ri/extras/transports/async-client-transport/pom.xml +++ b/jaxws-ri/extras/transports/async-client-transport/pom.xml @@ -53,6 +53,16 @@ lazy + =1.0.0)(!(version>=2.0.0)))";resolution:=optional + ]]> + + + diff --git a/jaxws-ri/extras/transports/local/pom.xml b/jaxws-ri/extras/transports/local/pom.xml index 0ca3a4a1c..54b6c4438 100644 --- a/jaxws-ri/extras/transports/local/pom.xml +++ b/jaxws-ri/extras/transports/local/pom.xml @@ -52,6 +52,16 @@ lazy + =1.0.0)(!(version>=2.0.0)))";resolution:=optional + ]]> + + + diff --git a/jaxws-ri/runtime/policy/pom.xml b/jaxws-ri/runtime/policy/pom.xml index 72d2a87b9..55ebc3f0d 100644 --- a/jaxws-ri/runtime/policy/pom.xml +++ b/jaxws-ri/runtime/policy/pom.xml @@ -363,6 +363,27 @@ ${project.version} - ${buildNumber} + =1.0.0)(!(version>=2.0.0)))";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 + ]]> +