From 2de4b41e64703e5daf87e5b59a53bb11d8fa7b53 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Fri, 9 Aug 2024 19:04:30 +0200
Subject: [PATCH] Leverage OSGi-DS component-xml file generation of
 PDE-DS/Tycho

Remove generated xml-files from equinox.ds.tests.
---
 .../org.eclipse.equinox.ds.tests/.gitignore   |  1 +
 .../org.eclipse.pde.ds.annotations.prefs      |  1 -
 ...onentActivationDeadLockTest$Component1.xml |  9 ---
 ...onentActivationDeadLockTest$Component2.xml |  8 ---
 ...onentActivationDeadLockTest$Component3.xml |  9 ---
 ...t$Component4$AwaitComponent5Activation.xml |  7 ---
 ...onentActivationDeadLockTest$Component4.xml |  9 ---
 ...$Component5$ActivationStartedIndicator.xml |  7 ---
 ...onentActivationDeadLockTest$Component5.xml |  9 ---
 .../build.properties                          |  3 -
 bundles/org.eclipse.equinox.ds.tests/pom.xml  | 61 +++++++++++++++++++
 bundles/org.eclipse.equinox.event/.gitignore  |  1 +
 .../org.eclipse.pde.ds.annotations.prefs      |  7 +++
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../OSGI-INF/component.xml                    |  7 ---
 .../build.properties                          |  3 +-
 .../internal/event/EventComponent.java        |  6 +-
 17 files changed, 77 insertions(+), 73 deletions(-)
 delete mode 100644 bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component1.xml
 delete mode 100644 bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component2.xml
 delete mode 100644 bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component3.xml
 delete mode 100644 bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4$AwaitComponent5Activation.xml
 delete mode 100644 bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4.xml
 delete mode 100644 bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5$ActivationStartedIndicator.xml
 delete mode 100644 bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5.xml
 create mode 100644 bundles/org.eclipse.equinox.ds.tests/pom.xml
 create mode 100644 bundles/org.eclipse.equinox.event/.gitignore
 create mode 100644 bundles/org.eclipse.equinox.event/.settings/org.eclipse.pde.ds.annotations.prefs
 delete mode 100644 bundles/org.eclipse.equinox.event/OSGI-INF/component.xml

diff --git a/bundles/org.eclipse.equinox.ds.tests/.gitignore b/bundles/org.eclipse.equinox.ds.tests/.gitignore
index f02e6a763a3..ab5a20ade52 100644
--- 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.*.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
index 73a356b6d05..38f9eecff8e 100644
--- 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/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component1.xml b/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component1.xml
deleted file mode 100644
index 44f687c323c..00000000000
--- a/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component1">
-   <service>
-      <provide interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component1"/>
-   </service>
-   <reference cardinality="1..1" field="a" interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component2" name="a"/>
-   <reference cardinality="1..1" field="b" interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4" name="b"/>
-   <implementation class="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component1"/>
-</scr:component>
diff --git a/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component2.xml b/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component2.xml
deleted file mode 100644
index 64489925cd1..00000000000
--- a/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component2">
-   <service>
-      <provide interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component2"/>
-   </service>
-   <reference cardinality="0..n" field="c3s" field-option="update" interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component3" name="c3s" policy="dynamic"/>
-   <implementation class="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component2"/>
-</scr:component>
diff --git a/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component3.xml b/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component3.xml
deleted file mode 100644
index 1319cf7230e..00000000000
--- a/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component3">
-   <service>
-      <provide interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component3"/>
-   </service>
-   <reference cardinality="1..1" field="a" interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component2" name="a"/>
-   <reference cardinality="1..1" field="b" interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5" name="b"/>
-   <implementation class="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component3"/>
-</scr:component>
diff --git a/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4$AwaitComponent5Activation.xml b/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4$AwaitComponent5Activation.xml
deleted file mode 100644
index 2609119d768..00000000000
--- a/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4$AwaitComponent5Activation.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activated" name="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4$AwaitComponent5Activation">
-   <service>
-      <provide interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4$AwaitComponent5Activation"/>
-   </service>
-   <implementation class="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4$AwaitComponent5Activation"/>
-</scr:component>
diff --git a/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4.xml b/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4.xml
deleted file mode 100644
index 30db282c7ac..00000000000
--- a/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4">
-   <service>
-      <provide interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4"/>
-   </service>
-   <reference cardinality="1..1" field="a" interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4$AwaitComponent5Activation" name="a"/>
-   <reference cardinality="1..1" field="b" interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5" name="b"/>
-   <implementation class="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component4"/>
-</scr:component>
diff --git a/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5$ActivationStartedIndicator.xml b/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5$ActivationStartedIndicator.xml
deleted file mode 100644
index fcc7811c4a9..00000000000
--- a/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5$ActivationStartedIndicator.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activated" name="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5$ActivationStartedIndicator">
-   <service>
-      <provide interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5$ActivationStartedIndicator"/>
-   </service>
-   <implementation class="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5$ActivationStartedIndicator"/>
-</scr:component>
diff --git a/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5.xml b/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5.xml
deleted file mode 100644
index ae5faaa6a34..00000000000
--- a/bundles/org.eclipse.equinox.ds.tests/OSGI-INF/org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5">
-   <service>
-      <provide interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5"/>
-   </service>
-   <reference cardinality="1..1" field="a" interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5$ActivationStartedIndicator" name="a"/>
-   <reference cardinality="0..n" field="c1s" field-option="update" interface="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component1" name="c1s" policy="dynamic"/>
-   <implementation class="org.eclipse.equinox.ds.tests.LazyServiceComponentActivationDeadLockTest$Component5"/>
-</scr:component>
diff --git a/bundles/org.eclipse.equinox.ds.tests/build.properties b/bundles/org.eclipse.equinox.ds.tests/build.properties
index 073d924563e..3cc01180546 100644
--- a/bundles/org.eclipse.equinox.ds.tests/build.properties
+++ b/bundles/org.eclipse.equinox.ds.tests/build.properties
@@ -134,6 +134,3 @@ source.scr_test/tb26.jar = bundles_src/tb26/
 manifest.scr_test/tb26.jar = META-INF/MANIFEST.MF
 source.scr_test/tb27.jar = bundles_src/tb27/
 manifest.scr_test/tb27.jar = META-INF/MANIFEST.MF
-
-# Maven properties, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
-pom.model.property.testClass = org.eclipse.equinox.ds.tests.AllTests
diff --git a/bundles/org.eclipse.equinox.ds.tests/pom.xml b/bundles/org.eclipse.equinox.ds.tests/pom.xml
new file mode 100644
index 00000000000..55effb9d3c6
--- /dev/null
+++ b/bundles/org.eclipse.equinox.ds.tests/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2024, 2024 Hannes Wellmann and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+     Hannes Wellmann - initial implementation
+-->
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.equinox</groupId>
+		<artifactId>parent</artifactId>
+		<version>4.34.0-SNAPSHOT</version>
+		<relativePath>../..</relativePath>
+	</parent>
+	<artifactId>org.eclipse.equinox.ds.tests</artifactId>
+	<version>1.7.200-SNAPSHOT</version>
+	<packaging>eclipse-test-plugin</packaging>
+	<properties>
+		<testClass>org.eclipse.equinox.ds.tests.AllTests</testClass>
+	</properties>
+	<build>
+		<testSourceDirectory>src</testSourceDirectory>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<!-- The tycho-ds-plugin generates component-xml files into
+					target/classes/OSGI-INF, but when this Plugin is exected in a tycho-surefire
+					runtime, the bundle-root is this project's root directory and the
+					Service-Component-Runtime only searches for component-xml files only in
+					<bundle-root>/OSGI-INF and does not consider the classpath-->
+					<execution>
+						<id>copy-ds-component-xml</id>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<phase>process-test-resources</phase>
+						<configuration>
+							<resources>
+								<resource>
+									<directory>${project.build.outputDirectory}/OSGI-INF</directory>
+									<include>*.xml</include>
+								</resource>
+							</resources>
+							<outputDirectory>${project.basedir}/OSGI-INF</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/bundles/org.eclipse.equinox.event/.gitignore b/bundles/org.eclipse.equinox.event/.gitignore
new file mode 100644
index 00000000000..7bec98dd976
--- /dev/null
+++ b/bundles/org.eclipse.equinox.event/.gitignore
@@ -0,0 +1 @@
+/OSGI-INF/org.eclipse.*.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
new file mode 100644
index 00000000000..38f9eecff8e
--- /dev/null
+++ 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
index 9f43017424a..348f7a3288b 100644
--- 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
deleted file mode 100644
index 89812d4617c..00000000000
--- a/bundles/org.eclipse.equinox.event/OSGI-INF/component.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" immediate="false" name="org.eclipse.equinox.event">
-   <implementation class="org.eclipse.equinox.internal.event.EventComponent"/>
-   <service>
-      <provide interface="org.osgi.service.event.EventAdmin"/>
-   </service>
-</scr:component>
diff --git a/bundles/org.eclipse.equinox.event/build.properties b/bundles/org.eclipse.equinox.event/build.properties
index 10f84b53b76..c109c59603c 100644
--- 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
index e7efe8d5908..88d7c2a3333 100644
--- 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,13 +15,16 @@
 
 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();
@@ -29,6 +32,7 @@ void activate(BundleContext context) {
 		eventRedeliverer.open();
 	}
 
+	@Deactivate
 	void deactivate(BundleContext context) {
 		eventRedeliverer.close();
 		eventAdmin.stop();