Skip to content

Commit 946e3b3

Browse files
committedOct 15, 2024
Generated all OSGi Declarative Services component files by PDE-DS/Tycho
Remove the now generated OSGi Declarative Services component-xml files from git. Resolve wildcards in Service-Component header.
1 parent 1ee6274 commit 946e3b3

File tree

15 files changed

+40
-27
lines changed

15 files changed

+40
-27
lines changed
 
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
dsVersion=V1_4
2+
eclipse.preferences.version=1
3+
enabled=true
4+
generateBundleActivationPolicyLazy=true
5+
path=OSGI-INF
6+
validationErrorLevel=error
7+
validationErrorLevel.missingImplicitUnbindMethod=error

‎bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
2121
Bundle-RequiredExecutionEnvironment: JavaSE-17
2222
Bundle-ActivationPolicy: lazy
2323
Export-Package: org.eclipse.e4.ui.progress
24-
Service-Component: OSGI-INF/progress.xml
24+
Service-Component: OSGI-INF/org.eclipse.e4.ui.progress.internal.ProgressServiceCreationFunction.xml
2525
Automatic-Module-Name: org.eclipse.e4.ui.progress

‎bundles/org.eclipse.e4.ui.progress/OSGI-INF/progress.xml

-8
This file was deleted.

‎bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressServiceCreationFunction.java

+5
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@
1616

1717
import org.eclipse.e4.core.contexts.ContextFunction;
1818
import org.eclipse.e4.core.contexts.ContextInjectionFactory;
19+
import org.eclipse.e4.core.contexts.IContextFunction;
1920
import org.eclipse.e4.core.contexts.IEclipseContext;
21+
import org.eclipse.e4.ui.progress.IProgressService;
22+
import org.osgi.service.component.annotations.Component;
2023

24+
@Component(service = IContextFunction.class)
25+
@IContextFunction.ServiceContextKey(IProgressService.class)
2126
public class ProgressServiceCreationFunction extends ContextFunction {
2227

2328
@Override

‎bundles/org.eclipse.search/.project

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
<arguments>
2626
</arguments>
2727
</buildCommand>
28+
<buildCommand>
29+
<name>org.eclipse.pde.ds.core.builder</name>
30+
<arguments>
31+
</arguments>
32+
</buildCommand>
2833
</buildSpec>
2934
<natures>
3035
<nature>org.eclipse.jdt.core.javanature</nature>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
dsVersion=V1_4
2+
eclipse.preferences.version=1
3+
enabled=true
4+
generateBundleActivationPolicyLazy=true
5+
path=OSGI-INF
6+
validationErrorLevel=error
7+
validationErrorLevel.missingImplicitUnbindMethod=error

‎bundles/org.eclipse.search/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ Require-Bundle:
3232
org.eclipse.search.core;bundle-version="[3.16.0,4.0.0)";visibility:=reexport
3333
Bundle-RequiredExecutionEnvironment: JavaSE-17
3434
Automatic-Module-Name: org.eclipse.search
35-
Service-Component: OSGI-INF/*.xml
35+
Service-Component: OSGI-INF/org.eclipse.search.internal.ui.text.DirtyFileSearchParticipant.xml

‎bundles/org.eclipse.search/OSGI-INF/dirtyEditorService.xml

-8
This file was deleted.

‎bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/DirtyFileSearchParticipant.java

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import java.util.HashMap;
1717
import java.util.Map;
1818

19+
import org.osgi.service.component.annotations.Component;
20+
1921
import org.eclipse.core.resources.IFile;
2022

2123
import org.eclipse.core.filebuffers.FileBuffers;
@@ -38,6 +40,7 @@
3840

3941
import org.eclipse.search.internal.core.text.DirtyFileProvider;
4042

43+
@Component(service = DirtyFileProvider.class, immediate = false, property = { "weight:Integer=100" })
4144
public class DirtyFileSearchParticipant implements DirtyFileProvider {
4245

4346
@Override
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/OSGI-INF/org.eclipse.*.xml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
dsVersion=V1_4
2+
eclipse.preferences.version=1
3+
enabled=true
4+
generateBundleActivationPolicyLazy=true
5+
path=OSGI-INF
6+
validationErrorLevel=error
7+
validationErrorLevel.missingImplicitUnbindMethod=error

‎examples/org.eclipse.e4.demo.cssbridge/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Export-Package: org.eclipse.e4.demo.cssbridge.core,
1515
org.eclipse.e4.demo.cssbridge.ui.views,
1616
org.eclipse.e4.demo.cssbridge.util
1717
Bundle-ActivationPolicy: lazy
18-
Service-Component: OSGI-INF/mailservice.xml
18+
Service-Component: OSGI-INF/org.eclipse.e4.demo.cssbridge.internal.core.DummyMailService.xml
1919
Automatic-Module-Name: org.eclipse.e4.demo.cssbridge
2020
Bundle-Vendor: %Bundle-Vendor
2121
Bundle-Localization: plugin

‎examples/org.eclipse.e4.demo.cssbridge/OSGI-INF/mailservice.xml

-7
This file was deleted.

‎examples/org.eclipse.e4.demo.cssbridge/build.properties

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ bin.includes = plugin.xml,\
33
.,\
44
icons/,\
55
splash.bmp,\
6-
OSGI-INF/mailservice.xml,\
76
OSGI-INF/,\
87
plugin.properties
98
output.. = bin/

‎examples/org.eclipse.e4.demo.cssbridge/src/org/eclipse/e4/demo/cssbridge/internal/core/DummyMailService.java

+2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
import org.eclipse.e4.demo.cssbridge.model.Importance;
2727
import org.eclipse.e4.demo.cssbridge.model.Mail;
2828
import org.eclipse.e4.demo.cssbridge.util.MailBuilder;
29+
import org.osgi.service.component.annotations.Component;
2930

31+
@Component(service = IMailService.class)
3032
public class DummyMailService implements IMailService {
3133
private static final String MAILBOX_NAME = "me@this.com";
3234

0 commit comments

Comments
 (0)
Please sign in to comment.