Leverage OSGi-DS component-xml file generation of PDE-DS/Tycho

Remove generated xml-files from equinox.ds.tests.
eclipse-equinox · Aug 11, 2024 · 04225a0 · 04225a0
1 parent ff46be8
commit 04225a0
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 70 deletions.
diff --git a/bundles/org.eclipse.equinox.ds.tests/.gitignore b/bundles/org.eclipse.equinox.ds.tests/.gitignore
@@ -1 +1,2 @@
 /scr_test
+OSGI-INF/org.eclipse.equinox.*.xml
diff --git a/bundles/org.eclipse.equinox.ds.tests/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.equinox.ds.tests/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -1,4 +1,3 @@
-classpath=true
 dsVersion=V1_3
 eclipse.preferences.version=1
 enabled=true

diff --git a/...NF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component1.xml b/...NF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component1.xml
diff --git a/...NF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component2.xml b/...NF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component2.xml
diff --git a/...NF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component3.xml b/...NF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component3.xml
diff --git a/...tests.LazyServiceComponentActivationDeadLockTest$Component4$AwaitComponent5Activation.xml b/...tests.LazyServiceComponentActivationDeadLockTest$Component4$AwaitComponent5Activation.xml
diff --git a/...NF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4.xml b/...NF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4.xml
diff --git a/...ests.LazyServiceComponentActivationDeadLockTest$Component5$ActivationStartedIndicator.xml b/...ests.LazyServiceComponentActivationDeadLockTest$Component5$ActivationStartedIndicator.xml
diff --git a/...NF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5.xml b/...NF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5.xml
diff --git a/bundles/org.eclipse.equinox.event/.gitignore b/bundles/org.eclipse.equinox.event/.gitignore
@@ -0,0 +1 @@
+/OSGI-INF/org.eclipse.equinox.*.xml
diff --git a/bundles/org.eclipse.equinox.event/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.equinox.event/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,7 @@
+dsVersion=V1_3
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Export-Package: org.eclipse.equinox.internal.event;x-internal:=true,
 Bundle-Vendor: %bundleVendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Service-Component: OSGI-INF/component.xml
+Service-Component: OSGI-INF/org.eclipse.equinox.internal.event.EventComponent.xml
 Bundle-ActivationPolicy: lazy
 Provide-Capability: 
  osgi.service;

diff --git a/bundles/org.eclipse.equinox.event/OSGI-INF/component.xml b/bundles/org.eclipse.equinox.event/OSGI-INF/component.xml
diff --git a/bundles/org.eclipse.equinox.event/build.properties b/bundles/org.eclipse.equinox.event/build.properties
@@ -12,10 +12,9 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               plugin*.properties,\
+               plugin.properties,\
                about.html,\
                .,\
-               OSGI-INF/component.xml,\
                OSGI-INF/
 output.. = bin/
 src.includes = about.html

diff --git a/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/EventComponent.java b/bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/EventComponent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2018 IBM Corporation and others.
+ * Copyright (c) 2009, 2024 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -15,20 +15,24 @@
 
 import org.eclipse.equinox.internal.event.mapper.EventRedeliverer;
 import org.osgi.framework.BundleContext;
+import org.osgi.service.component.annotations.*;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;
 
+@Component(service = EventAdmin.class)
 public class EventComponent implements EventAdmin {
 	private EventRedeliverer eventRedeliverer;
 	private EventAdminImpl eventAdmin;
 
+	@Activate
 	void activate(BundleContext context) {
 		eventAdmin = new EventAdminImpl(context);
 		eventAdmin.start();
 		eventRedeliverer = new EventRedeliverer(context, eventAdmin);
 		eventRedeliverer.open();
 	}
 
+	@Deactivate
 	void deactivate(BundleContext context) {
 		eventRedeliverer.close();
 		eventAdmin.stop();