Move org.eclipse.equinox.event to use automatic manifest generation

bundles/org.eclipse.equinox.event/.project

@@ -11,17 +11,7 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
+			<name>org.eclipse.pde.BndBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -32,7 +22,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.pde.BndNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>

bundles/org.eclipse.equinox.event/pde.bnd

@@ -0,0 +1,20 @@
+Bundle-Name: %bundleName
+Bundle-Version: 1.6.300.qualifier
+Bundle-SymbolicName: org.eclipse.equinox.event
+Bundle-Vendor: %bundleVendor
+Bundle-Localization: plugin
+Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.equinox.event
+Export-Package: org.eclipse.equinox.internal.event;x-internal:=true, \
+				org.eclipse.equinox.internal.event.mapper;x-internal:=true
+
+-dsannotations-options: version;maximum=1.3
+-runee: JavaSE-1.8
+-includeresource: plugin.properties,\
+               about.html
+
+-buildpath: org.eclipse.osgi, \
+			org.osgi.service.event
+
+# pomless configuration options
+pom.model.property.tck.artifact = org.osgi.test.cases.event

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, 2023 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -10,25 +10,31 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Christoph Läubrich - switch to annotations
  *******************************************************************************/
 package org.eclipse.equinox.internal.event;
 
 import org.eclipse.equinox.internal.event.mapper.EventRedeliverer;
+import org.osgi.annotation.bundle.Capability;
 import org.osgi.framework.BundleContext;
-import org.osgi.service.event.Event;
-import org.osgi.service.event.EventAdmin;
+import org.osgi.service.component.annotations.*;
+import org.osgi.service.event.*;
 
+@Component(service = EventAdmin.class)
+@Capability(namespace = "osgi.implementation", name = EventConstants.EVENT_ADMIN_IMPLEMENTATION, uses = Event.class, version = EventConstants.EVENT_ADMIN_SPECIFICATION_VERSION)
 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();