Skip to content

Add capability and requirement for org.eclipse.equinox.internal.p2.repository.Transport #972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trancexpress wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add capability and requirement for org.eclipse.equinox.internal.p2.repository.Transport #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ Export-Package: org.eclipse.equinox.internal.p2.persistence;
org.eclipse.equinox.p2.repository"
Require-Bundle: org.eclipse.equinox.common,
org.eclipse.equinox.registry;bundle-version="3.3.0"
Require-Capability: osgi.implementation;
filter:="(|(p2.agent.service.name=org.eclipse.equinox.internal.p2.repository.Transport)(p2.agent.servicename=org.eclipse.equinox.internal.p2.repository.Transport))"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Import-Package: org.bouncycastle.bcpg;version="1.72.0",
Expand Down
1 change: 1 addition & 0 deletions bundles/org.eclipse.equinox.p2.transport.ecf/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.ecf;bundle-version="3.1.0",
org.eclipse.core.jobs;bundle-version="3.5.100"
Service-Component: OSGI-INF/ecfTransport.xml,
OSGI-INF/org.eclipse.equinox.internal.p2.transport.ecf.P2SSLContextFactory.xml
Provide-Capability: osgi.implementation;p2.agent.servicename=org.eclipse.equinox.internal.p2.repository.Transport;version=1.4.600
Copy link
Member

@laeubi laeubi Nov 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not look correct, usually the namespace should match the filter see

https://docs.osgi.org/specification/osgi.cmpn/7.0.0/service.namespaces.html#service.namespaces-osgi.implementation.namespace

Also I'm not sure if implementation is a good choice, if we look at how P2 implements this, the osgi service namespace seems a better fit (and we can automate this in the future hopefully to not write these on our own):

https://docs.osgi.org/specification/osgi.cmpn/7.0.0/service.namespaces.html#service.namespaces-osgi.service.namespace

So what we do here is providing an IAgentService with the given property and I would say it must be

osgi.service;objectClass:List<String>="org.eclipse.equinox.p2.core.spi.IAgentServiceFactory";p2.agent.servicename="org.eclipse.equinox.internal.p2.repository.Transport"

@tjwatson can you verify? Sadly the OSGi spec is a bit short on this with examples :-\

Bundle-Activator: org.eclipse.equinox.internal.p2.transport.ecf.Activator
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.equinox.internal.p2.transport.ecf;x-friends:="org.eclipse.equinox.p2.discovery.compatibility,org.eclipse.equinox.p2.installer"
Expand Down
Loading