From 8062a11eacf6d89f2f7ca184eae0da974ffabc2b Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Tue, 14 Dec 2021 14:19:55 -0500
Subject: [PATCH] Bug 577097: Add o.e.remote features to CDT's p2 repo

Change-Id: Ia5ef4a868d52389aefa3ef800a412ce53628da3e
---
 releng/org.eclipse.cdt.repo/category.xml      | 30 +++++++++
 remote/org.eclipse.remote.repo/.project       | 11 ----
 .../org.eclipse.core.resources.prefs          |  2 -
 remote/org.eclipse.remote.repo/category.xml   | 33 ----------
 remote/org.eclipse.remote.repo/pom.xml        | 64 -------------------
 5 files changed, 30 insertions(+), 110 deletions(-)
 delete mode 100644 remote/org.eclipse.remote.repo/.project
 delete mode 100644 remote/org.eclipse.remote.repo/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 remote/org.eclipse.remote.repo/category.xml
 delete mode 100644 remote/org.eclipse.remote.repo/pom.xml

diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml
index faa6a9d09d7..8d6012b751f 100644
--- a/releng/org.eclipse.cdt.repo/category.xml
+++ b/releng/org.eclipse.cdt.repo/category.xml
@@ -254,6 +254,36 @@
    <bundle id="org.eclipse.cdt.jsoncdb.nvidia.source">
       <category name="extra-jsoncdb"/>
    </bundle>
+   <feature url="features/org.eclipse.remote_0.0.0.jar" id="org.eclipse.remote" version="0.0.0">
+      <category name="Remote Services"/>
+   </feature>
+   <feature url="features/org.eclipse.remote.source_0.0.0.jar" id="org.eclipse.remote.source" version="0.0.0">
+      <category name="Remote Services SDK"/>
+   </feature>
+   <feature url="features/org.eclipse.remote.serial_0.0.0.jar" id="org.eclipse.remote.serial" version="0.0.0">
+      <category name="Remote Serial Port"/>
+   </feature>
+   <feature url="features/org.eclipse.remote.serial.source_0.0.0.jar" id="org.eclipse.remote.serial.source" version="0.0.0">
+      <category name="Remote Console SDK"/>
+   </feature>
+   <feature url="features/org.eclipse.remote.console_0.0.0.jar" id="org.eclipse.remote.console" version="0.0.0">
+      <category name="Remote Console"/>
+   </feature>
+   <feature url="features/org.eclipse.remote.console.source_0.0.0.jar" id="org.eclipse.remote.console.source" version="0.0.0">
+      <category name="Remote Console SDK"/>
+   </feature>
+   <feature url="features/org.eclipse.remote.telnet_0.0.0.jar" id="org.eclipse.remote.telnet" version="0.0.0">
+      <category name="Telnet Protocol Support"/>
+   </feature>
+   <feature url="features/org.eclipse.remote.telnet.source_0.0.0.jar" id="org.eclipse.remote.telnet.source" version="0.0.0">
+      <category name="Telnet Protocol Support SDK"/>
+   </feature>
+   <feature url="features/org.eclipse.remote.proxy_0.0.0.jar" id="org.eclipse.remote.proxy" version="0.0.0">
+      <category name="Remote Proxy Agent"/>
+   </feature>
+   <feature url="features/org.eclipse.remote.proxy.source_0.0.0.jar" id="org.eclipse.remote.proxy.source" version="0.0.0">
+      <category name="Remote Proxy Agent SDK"/>
+   </feature>
    <category-def name="main" label="CDT Main Features"/>
    <category-def name="extra" label="CDT Optional Features"/>
    <category-def name="launchbar" label="LaunchBar"/>
diff --git a/remote/org.eclipse.remote.repo/.project b/remote/org.eclipse.remote.repo/.project
deleted file mode 100644
index 0c9525e4817..00000000000
--- a/remote/org.eclipse.remote.repo/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.remote.repo</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/remote/org.eclipse.remote.repo/.settings/org.eclipse.core.resources.prefs b/remote/org.eclipse.remote.repo/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0203a..00000000000
--- a/remote/org.eclipse.remote.repo/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/remote/org.eclipse.remote.repo/category.xml b/remote/org.eclipse.remote.repo/category.xml
deleted file mode 100644
index d3be7727fb7..00000000000
--- a/remote/org.eclipse.remote.repo/category.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/org.eclipse.remote_0.0.0.jar" id="org.eclipse.remote" version="0.0.0">
-      <category name="Remote Services"/>
-   </feature>
-   <feature url="features/org.eclipse.remote.source_0.0.0.jar" id="org.eclipse.remote.source" version="0.0.0">
-      <category name="Remote Services SDK"/>
-   </feature>
-   <feature url="features/org.eclipse.remote.serial_0.0.0.jar" id="org.eclipse.remote.serial" version="0.0.0">
-      <category name="Remote Serial Port"/>
-   </feature>
-   <feature url="features/org.eclipse.remote.serial.source_0.0.0.jar" id="org.eclipse.remote.serial.source" version="0.0.0">
-      <category name="Remote Console SDK"/>
-   </feature>
-   <feature url="features/org.eclipse.remote.console_0.0.0.jar" id="org.eclipse.remote.console" version="0.0.0">
-      <category name="Remote Console"/>
-   </feature>
-   <feature url="features/org.eclipse.remote.console.source_0.0.0.jar" id="org.eclipse.remote.console.source" version="0.0.0">
-      <category name="Remote Console SDK"/>
-   </feature>
-   <feature url="features/org.eclipse.remote.telnet_0.0.0.jar" id="org.eclipse.remote.telnet" version="0.0.0">
-      <category name="Telnet Protocol Support"/>
-   </feature>
-   <feature url="features/org.eclipse.remote.telnet.source_0.0.0.jar" id="org.eclipse.remote.telnet.source" version="0.0.0">
-      <category name="Telnet Protocol Support SDK"/>
-   </feature>
-   <feature url="features/org.eclipse.remote.proxy_0.0.0.jar" id="org.eclipse.remote.proxy" version="0.0.0">
-      <category name="Remote Proxy Agent"/>
-   </feature>
-   <feature url="features/org.eclipse.remote.proxy.source_0.0.0.jar" id="org.eclipse.remote.proxy.source" version="0.0.0">
-      <category name="Remote Proxy Agent SDK"/>
-   </feature>
-</site>
diff --git a/remote/org.eclipse.remote.repo/pom.xml b/remote/org.eclipse.remote.repo/pom.xml
deleted file mode 100644
index 2e7da9e656b..00000000000
--- a/remote/org.eclipse.remote.repo/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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.remote</groupId>
-		<artifactId>remote-parent</artifactId>
-		<version>3.0.2-SNAPSHOT</version>
-		<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
-	</parent>
-
-	<artifactId>org.eclipse.remote.repo</artifactId>
-	<packaging>eclipse-repository</packaging>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-publisher-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<publishArtifacts>true</publishArtifacts>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	
-	<profiles>
-		<profile>
-			<id>production</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>deploy</id>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<tasks>
-										<mkdir dir="${remote-install-dir}" />
-										<delete includeemptydirs="true">
-											<fileset dir="${remote-install-dir}">
-												<include name="**/*" />
-											</fileset>
-										</delete>
-										<unzip
-											src="${project.build.directory}/${project.build.finalName}.zip"
-											dest="${remote-install-dir}" />
-									</tasks>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>