From db1d88d076282c5a61de3dbf3a0644d2f50b74ae Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Sun, 16 Sep 2018 16:56:32 +0200
Subject: [PATCH] Fix maven-scr-plugin does not generate XML for DS annotations
 in test bundles (#6214)

The maven-resources-plugin is used to copy back the generated XML to the OSGI-INF directory so it is on the classpath in tests.
The outputDirectory configuration parameter of the maven-scr-plugin is not used because when it is set to ${project.basedir} it empties the OSGI-INF dir and would remove non-generated SCR XML files.

Signed-off-by: Wouter Born <eclipse@maindrain.net>
---
 .../OSGI-INF/.gitignore                       |  1 +
 ...l.thing.test.hue.DumbThingTypeProvider.xml |  7 -------
 ...ng.test.hue.TestHueChannelTypeProvider.xml |  8 -------
 ...t.hue.TestHueConfigDescriptionProvider.xml |  7 -------
 ...ng.test.hue.TestHueThingHandlerFactory.xml |  7 -------
 ...hing.test.hue.TestHueThingTypeProvider.xml |  7 -------
 bundles/pom.xml                               | 21 +++++++++++++++++++
 .../OSGI-INF/.gitignore                       |  1 +
 .../OSGI-INF/binding.dmx.test.xml             | 21 -------------------
 .../dmx/test/DmxTestHandlerFactory.java       |  2 +-
 extensions/pom.xml                            | 21 +++++++++++++++++++
 pom.xml                                       |  1 +
 12 files changed, 46 insertions(+), 58 deletions(-)
 create mode 100644 bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/.gitignore
 delete mode 100644 bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.DumbThingTypeProvider.xml
 delete mode 100644 bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueChannelTypeProvider.xml
 delete mode 100644 bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueConfigDescriptionProvider.xml
 delete mode 100644 bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingHandlerFactory.xml
 delete mode 100644 bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingTypeProvider.xml
 create mode 100644 extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/.gitignore
 delete mode 100644 extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/binding.dmx.test.xml

diff --git a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/.gitignore b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/.gitignore
new file mode 100644
index 00000000000..b878e882aca
--- /dev/null
+++ b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/.gitignore
@@ -0,0 +1 @@
+/*.xml
diff --git a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.DumbThingTypeProvider.xml b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.DumbThingTypeProvider.xml
deleted file mode 100644
index f5350c0dff6..00000000000
--- a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.DumbThingTypeProvider.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" name="org.eclipse.smarthome.model.thing.test.hue.DumbThingTypeProvider">
-   <service>
-      <provide interface="org.eclipse.smarthome.core.thing.binding.ThingTypeProvider"/>
-   </service>
-   <implementation class="org.eclipse.smarthome.model.thing.test.hue.DumbThingTypeProvider"/>
-</scr:component>
\ No newline at end of file
diff --git a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueChannelTypeProvider.xml b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueChannelTypeProvider.xml
deleted file mode 100644
index 2ecfa621d40..00000000000
--- a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueChannelTypeProvider.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.1.0" name="org.eclipse.smarthome.model.thing.test.hue.TestHueChannelTypeProvider">
-   <service>
-      <provide interface="org.eclipse.smarthome.core.thing.type.ChannelTypeProvider"/>
-      <provide interface="org.eclipse.smarthome.core.thing.type.ChannelGroupTypeProvider"/>
-   </service>
-   <implementation class="org.eclipse.smarthome.model.thing.test.hue.TestHueChannelTypeProvider"/>
-</scr:component>
\ No newline at end of file
diff --git a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueConfigDescriptionProvider.xml b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueConfigDescriptionProvider.xml
deleted file mode 100644
index 443104a73ff..00000000000
--- a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueConfigDescriptionProvider.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" name="org.eclipse.smarthome.model.thing.test.hue.TestHueConfigDescriptionProvider">
-   <service>
-      <provide interface="org.eclipse.smarthome.config.core.ConfigDescriptionProvider"/>
-   </service>
-   <implementation class="org.eclipse.smarthome.model.thing.test.hue.TestHueConfigDescriptionProvider"/>
-</scr:component>
\ No newline at end of file
diff --git a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingHandlerFactory.xml b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingHandlerFactory.xml
deleted file mode 100644
index ca66a690afb..00000000000
--- a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingHandlerFactory.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" name="org.eclipse.smarthome.model.thing.test.hue.TestHueThingHandlerFactory">
-   <service>
-      <provide interface="org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory"/>
-   </service>
-   <implementation class="org.eclipse.smarthome.model.thing.test.hue.TestHueThingHandlerFactory"/>
-</scr:component>
\ No newline at end of file
diff --git a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingTypeProvider.xml b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingTypeProvider.xml
deleted file mode 100644
index 754a64d3f65..00000000000
--- a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingTypeProvider.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" name="org.eclipse.smarthome.model.thing.test.hue.TestHueThingTypeProvider">
-   <service>
-      <provide interface="org.eclipse.smarthome.core.thing.binding.ThingTypeProvider"/>
-   </service>
-   <implementation class="org.eclipse.smarthome.model.thing.test.hue.TestHueThingTypeProvider"/>
-</scr:component>
\ No newline at end of file
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 47492c4816e..573f4ef66ea 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -62,6 +62,27 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <phase>process-test-resources</phase>
+            <configuration>
+              <outputDirectory>${project.basedir}/OSGI-INF</outputDirectory>
+              <overwrite>true</overwrite>
+              <resources>
+                <resource>
+                  <directory>${project.basedir}/target/classes/OSGI-INF</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/.gitignore b/extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/.gitignore
new file mode 100644
index 00000000000..b878e882aca
--- /dev/null
+++ b/extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/.gitignore
@@ -0,0 +1 @@
+/*.xml
diff --git a/extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/binding.dmx.test.xml b/extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/binding.dmx.test.xml
deleted file mode 100644
index 09018538bab..00000000000
--- a/extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/binding.dmx.test.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-	Copyright (c) 2014,2018 Contributors to the Eclipse Foundation
-
-	See the NOTICE file(s) distributed with this work for additional
-	information regarding copyright ownership.
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	http://www.eclipse.org/legal/epl-2.0
-
-	SPDX-License-Identifier: EPL-2.0
-
--->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" configuration-policy="optional" immediate="true" name="binding.dmx.test">
-	<service>
-		<provide interface="org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory"/>
-	</service>
-	<implementation class="org.eclipse.smarthome.binding.dmx.test.DmxTestHandlerFactory"/>
-</scr:component>
diff --git a/extensions/binding/org.eclipse.smarthome.binding.dmx.test/src/test/java/org/eclipse/smarthome/binding/dmx/test/DmxTestHandlerFactory.java b/extensions/binding/org.eclipse.smarthome.binding.dmx.test/src/test/java/org/eclipse/smarthome/binding/dmx/test/DmxTestHandlerFactory.java
index 7698959591a..7960bc0db82 100644
--- a/extensions/binding/org.eclipse.smarthome.binding.dmx.test/src/test/java/org/eclipse/smarthome/binding/dmx/test/DmxTestHandlerFactory.java
+++ b/extensions/binding/org.eclipse.smarthome.binding.dmx.test/src/test/java/org/eclipse/smarthome/binding/dmx/test/DmxTestHandlerFactory.java
@@ -26,7 +26,7 @@
  *
  * @author Jan N. Klug - Initial contribution
  */
-@Component(service = ThingHandlerFactory.class, immediate = true, name = "binding.dmx.test")
+@Component(service = ThingHandlerFactory.class)
 public class DmxTestHandlerFactory extends BaseThingHandlerFactory {
 
     @Override
diff --git a/extensions/pom.xml b/extensions/pom.xml
index e1c99c82241..c6d613bb582 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -60,6 +60,27 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <phase>process-test-resources</phase>
+            <configuration>
+              <outputDirectory>${project.basedir}/OSGI-INF</outputDirectory>
+              <overwrite>true</overwrite>
+              <resources>
+                <resource>
+                  <directory>${project.basedir}/target/classes/OSGI-INF</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/pom.xml b/pom.xml
index 76d7afa2d9b..51e1616222a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,6 +176,7 @@
           <configuration>
             <supportedProjectTypes>
               <supportedProjectType>eclipse-plugin</supportedProjectType>
+              <supportedProjectType>eclipse-test-plugin</supportedProjectType>
             </supportedProjectTypes>
           </configuration>
         </plugin>