Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #3162 - Fixing OSGi manifest for websocket 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2018-12-03 17:31:51 -06:00
parent c3348a0a03
commit 85f74f198a
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-websocket/javax-websocket-server/pom.xml
View File

@ -69,9 +69,13 @@
<Export-Package>
org.eclipse.jetty.websocket.jsr356.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
</Export-Package>
<Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability>
<Require-Capability>
osgi.extender;
filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
</Require-Capability>
<Provide-Capability>
osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=javax.websocket.server.ServerEndpointConfig$Configurator
osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,
osgi.serviceloader;osgi.serviceloader=javax.websocket.server.ServerEndpointConfig$Configurator
</Provide-Capability>
</instructions>
</configuration>

15
jetty-websocket/jetty-websocket-server/pom.xml
View File

@ -61,11 +61,20 @@
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Description>Websocket Server API</Bundle-Description>
<Bundle-Classpath/>
<Bundle-Description>Jetty Websocket Server API</Bundle-Description>
<DynamicImport-Package>
org.eclipse.jetty.websocket.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}",org.eclipse.jetty.websocket.server.pathmap.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}"
org.eclipse.jetty.websocket.api.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}"
</DynamicImport-Package>
<Export-Package>
org.eclipse.jetty.websocket.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}"
</Export-Package>
<Require-Capability>
osgi.extender;
filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
</Require-Capability>
<Provide-Capability>
osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer
</Provide-Capability>
</instructions>
</configuration>
</plugin>