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.
eclipse-platform · Oct 1, 2024 · b3de554 · b3de554
1 parent 04dc50b
commit b3de554
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 27 deletions.
diff --git a/bundles/org.eclipse.e4.ui.progress/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.e4.ui.progress/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,7 @@
+dsVersion=V1_4
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF
@@ -21,5 +21,5 @@ Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.e4.ui.progress
-Service-Component: OSGI-INF/progress.xml
+Service-Component: OSGI-INF/org.eclipse.e4.ui.progress.internal.ProgressServiceCreationFunction.xml
 Automatic-Module-Name: org.eclipse.e4.ui.progress
diff --git a/bundles/org.eclipse.e4.ui.progress/OSGI-INF/progress.xml b/bundles/org.eclipse.e4.ui.progress/OSGI-INF/progress.xml
diff --git a/....ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressServiceCreationFunction.java b/....ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressServiceCreationFunction.java
@@ -16,8 +16,13 @@
 
 import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IContextFunction;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.ui.progress.IProgressService;
+import org.osgi.service.component.annotations.Component;
 
+@Component(service = IContextFunction.class)
+@IContextFunction.ServiceContextKey(IProgressService.class)
 public class ProgressServiceCreationFunction extends ContextFunction {
 
 	@Override

diff --git a/bundles/org.eclipse.search/.project b/bundles/org.eclipse.search/.project
@@ -25,6 +25,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>

diff --git a/bundles/org.eclipse.search/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.search/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,7 @@
+dsVersion=V1_4
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.search/META-INF/MANIFEST.MF b/bundles/org.eclipse.search/META-INF/MANIFEST.MF
@@ -32,4 +32,4 @@ Require-Bundle:
  org.eclipse.search.core;bundle-version="[3.16.0,4.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.search
-Service-Component: OSGI-INF/*.xml
+Service-Component: OSGI-INF/org.eclipse.search.internal.ui.text.DirtyFileSearchParticipant.xml
diff --git a/bundles/org.eclipse.search/OSGI-INF/dirtyEditorService.xml b/bundles/org.eclipse.search/OSGI-INF/dirtyEditorService.xml
diff --git a/...eclipse.search/search/org/eclipse/search/internal/ui/text/DirtyFileSearchParticipant.java b/...eclipse.search/search/org/eclipse/search/internal/ui/text/DirtyFileSearchParticipant.java
@@ -16,6 +16,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.osgi.service.component.annotations.Component;
+
 import org.eclipse.core.resources.IFile;
 
 import org.eclipse.core.filebuffers.FileBuffers;
@@ -38,6 +40,7 @@
 
 import org.eclipse.search.internal.core.text.DirtyFileProvider;
 
+@Component(service = DirtyFileProvider.class, immediate = false, property = { "weight:Integer=100" })
 public class DirtyFileSearchParticipant implements DirtyFileProvider {
 
 	@Override

diff --git a/examples/org.eclipse.e4.demo.cssbridge/.gitignore b/examples/org.eclipse.e4.demo.cssbridge/.gitignore
@@ -0,0 +1 @@
+/OSGI-INF/org.eclipse.*.xml
diff --git a/examples/org.eclipse.e4.demo.cssbridge/.settings/org.eclipse.pde.ds.annotations.prefs b/examples/org.eclipse.e4.demo.cssbridge/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,7 @@
+dsVersion=V1_4
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/examples/org.eclipse.e4.demo.cssbridge/META-INF/MANIFEST.MF b/examples/org.eclipse.e4.demo.cssbridge/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Export-Package: org.eclipse.e4.demo.cssbridge.core,
  org.eclipse.e4.demo.cssbridge.ui.views,
  org.eclipse.e4.demo.cssbridge.util
 Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/mailservice.xml
+Service-Component: OSGI-INF/org.eclipse.e4.demo.cssbridge.internal.core.DummyMailService.xml
 Automatic-Module-Name: org.eclipse.e4.demo.cssbridge
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.e4.demo.cssbridge/OSGI-INF/mailservice.xml b/examples/org.eclipse.e4.demo.cssbridge/OSGI-INF/mailservice.xml
diff --git a/examples/org.eclipse.e4.demo.cssbridge/build.properties b/examples/org.eclipse.e4.demo.cssbridge/build.properties
@@ -3,7 +3,6 @@ bin.includes = plugin.xml,\
                .,\
                icons/,\
                splash.bmp,\
-               OSGI-INF/mailservice.xml,\
                OSGI-INF/,\
                plugin.properties
 output.. = bin/

diff --git a/...e.e4.demo.cssbridge/src/org/eclipse/e4/demo/cssbridge/internal/core/DummyMailService.java b/...e.e4.demo.cssbridge/src/org/eclipse/e4/demo/cssbridge/internal/core/DummyMailService.java
@@ -26,7 +26,9 @@
 import org.eclipse.e4.demo.cssbridge.model.Importance;
 import org.eclipse.e4.demo.cssbridge.model.Mail;
 import org.eclipse.e4.demo.cssbridge.util.MailBuilder;
+import org.osgi.service.component.annotations.Component;
 
+@Component(service = IMailService.class)
 public class DummyMailService implements IMailService {
 	private static final String MAILBOX_NAME = "[email protected]";