From 230b2332fbc54404f948787b5245c1f512e81ee5 Mon Sep 17 00:00:00 2001
From: Scott Lewis <scottslewis@gmail.com>
Date: Tue, 14 Jan 2025 13:35:19 -0800
Subject: [PATCH 1/3] Added bndtools and eclipse sdk features/categories to
 repository

---
 pom.xml                                       |   2 +
 .../.project                                  |  17 +++
 .../org.eclipse.core.resources.prefs          |   2 +
 .../about.html                                |  28 +++++
 .../build.properties                          |   6 +
 .../feature.properties                        |  19 ++++
 .../feature.xml                               | 100 +++++++++++++++++
 .../pom.xml                                   |  14 +++
 .../.project                                  |  17 +++
 .../org.eclipse.core.resources.prefs          |   2 +
 .../about.html                                |  28 +++++
 .../build.properties                          |   6 +
 .../feature.properties                        |  19 ++++
 .../feature.xml                               | 104 ++++++++++++++++++
 .../pom.xml                                   |  14 +++
 .../feature.xml                               |   2 +-
 .../category.xml                              |  28 +++--
 17 files changed, 397 insertions(+), 11 deletions(-)
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/.project
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/.settings/org.eclipse.core.resources.prefs
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/about.html
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/build.properties
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/feature.properties
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/feature.xml
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/pom.xml
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/.project
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/.settings/org.eclipse.core.resources.prefs
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/about.html
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/build.properties
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.properties
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml
 create mode 100644 releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml

diff --git a/pom.xml b/pom.xml
index 36d3103eab..b1d1b97f34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,6 +206,8 @@
     <module>releng/features/org.eclipse.ecf.remoteservice.rest.feature</module>
     <module>releng/features/org.eclipse.ecf.remoteservice.rosgi.feature</module>
     <module>releng/features/org.eclipse.ecf.remoteservice.sdk.feature</module>
+    <module>releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature</module>
+    <module>releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature</module>
     <module>releng/features/org.eclipse.ecf.remoteservice.servlet.feature</module>
     <module>releng/features/org.eclipse.ecf.sharedobject.feature</module>
     <module>releng/features/org.eclipse.ecf.tests.feature</module>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/.project b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/.project
new file mode 100644
index 0000000000..3a2cd7eb24
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.ecf.remoteservice.sdk.eclipse.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/.settings/org.eclipse.core.resources.prefs b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..68a0304527
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=windows-1252
diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/about.html b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/about.html
new file mode 100644
index 0000000000..9f1dc0dd58
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 25, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/build.properties b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/build.properties
new file mode 100644
index 0000000000..8e8ac79bc3
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/build.properties
@@ -0,0 +1,6 @@
+bin.includes = feature.xml,\
+               about.html,\
+               feature.properties
+src.includes = feature.properties,\
+               feature.xml,\
+               about.html
diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/feature.properties b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/feature.properties
new file mode 100644
index 0000000000..9ed81f8155
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/feature.properties
@@ -0,0 +1,19 @@
+############################################################################
+# Copyright (c) 2010 Composent Inc., and others.
+#
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+############################################################################
+featureName=ECF Remote Services SDK for Eclipse
+providerName=Eclipse.org - ECF
+
+copyright=Copyright (c) 2025 Composent, Inc. and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n
diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/feature.xml
new file mode 100644
index 0000000000..a7cdadeeac
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/feature.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.ecf.remoteservice.sdk.eclipse.feature"
+      label="ECF Remote Services SDK for Eclipse"
+      version="3.15.3.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description url="http://www.eclipse.org/ecf">
+      This feature provides an all-in-one distribution of ECFs implementation
+of the OSGi Remote Service (chapter 100) and
+Remote Service Admin (chapter 122) standards.  Included are multiple
+discovery and 
+remote services provider implementations, allowing the remote
+service developer to modularly select, use, or
+create for themselves implementations needed to discover and use
+OSGi Remote Services and Remote Service Admin.  For example, discovery based
+upon
+discovery protocols Zeroconf, SLP, DNSSD, and Zookeeper are present
+in this distribution.  Also present are 
+multiple distribution providers such as r-OSGi, ECF generic, XML-RPC, SOAP,
+and multiple REST-based transports.  The SDK also supports the
+creation
+of custom discovery and/or distribution providers via open, community-tested and maintained 
+APIs.
+Also included in this SDK is a distributed implementation of
+the OSGi Event Admin service.  Note that the contents of this
+feature do not require Eclipse or Equinox specifically, but rather
+may be run
+on other frameworks (e.g. Felix) and with other tools.  For tutorials, examples, and documentation about OSGi Remote Services see
+
+https://wiki.eclipse.org/ECF#OSGi_Remote_Services
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <includes
+         id="org.eclipse.ecf.remoteservice.rosgi.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.remoteservice.servlet.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.remoteservice.rest.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.server.generic.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.osgi.services.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.discovery.jmdns.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.discovery.slp.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.discovery.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.provider.generic.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.provider.generic.remoteservice.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.sharedobject.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.remoteservice.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.core.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.remoteservice.ui"
+         version="0.0.0"/>
+
+</feature>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/pom.xml
new file mode 100644
index 0000000000..a6b064e380
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/pom.xml
@@ -0,0 +1,14 @@
+<?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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.eclipse.ecf.remoteservice.sdk.eclipse.feature</artifactId>
+  <version>3.15.3-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/.project b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/.project
new file mode 100644
index 0000000000..824339a6d5
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.ecf.remoteservice.sdk.bndtools.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/.settings/org.eclipse.core.resources.prefs b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..68a0304527
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=windows-1252
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/about.html b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/about.html
new file mode 100644
index 0000000000..9f1dc0dd58
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 25, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/build.properties b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/build.properties
new file mode 100644
index 0000000000..8e8ac79bc3
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/build.properties
@@ -0,0 +1,6 @@
+bin.includes = feature.xml,\
+               about.html,\
+               feature.properties
+src.includes = feature.properties,\
+               feature.xml,\
+               about.html
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.properties b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.properties
new file mode 100644
index 0000000000..b3114ea9a6
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.properties
@@ -0,0 +1,19 @@
+############################################################################
+# Copyright (c) 2010 Composent Inc., and others.
+#
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+############################################################################
+featureName=ECF Remote Services SDK for Bndtools
+providerName=Eclipse.org - ECF
+
+copyright=Copyright (c) 2025 Composent, Inc. and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml
new file mode 100644
index 0000000000..0914f583b4
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.ecf.remoteservice.sdk.bndtools.feature"
+      label="ECF Remote Services SDK for Bndtools"
+      version="3.15.3.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description url="http://www.eclipse.org/ecf">
+      This feature provides an all-in-one distribution of ECFs implementation
+of the OSGi Remote Service (chapter 100) and
+Remote Service Admin (chapter 122) standards.  Included are multiple
+discovery and 
+remote services provider implementations, allowing the remote
+service developer to modularly select, use, or
+create for themselves implementations needed to discover and use
+OSGi Remote Services and Remote Service Admin.  For example, discovery based
+upon
+discovery protocols Zeroconf, SLP, DNSSD, and Zookeeper are present
+in this distribution.  Also present are 
+multiple distribution providers such as r-OSGi, ECF generic, XML-RPC, SOAP,
+and multiple REST-based transports.  The SDK also supports the
+creation
+of custom discovery and/or distribution providers via open, community-tested and maintained 
+APIs.
+Also included in this SDK is a distributed implementation of
+the OSGi Event Admin service.  Note that the contents of this
+feature do not require Eclipse or Equinox specifically, but rather
+may be run
+on other frameworks (e.g. Felix) and with other tools.  For tutorials, examples, and documentation about OSGi Remote Services see
+
+https://wiki.eclipse.org/ECF#OSGi_Remote_Services
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <includes
+         id="org.eclipse.ecf.remoteservice.rosgi.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.remoteservice.servlet.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.remoteservice.rest.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.server.generic.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.osgi.services.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.discovery.jmdns.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.discovery.slp.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.discovery.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.provider.generic.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.provider.generic.remoteservice.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.sharedobject.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.remoteservice.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.core.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.remoteservice.ui"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.remoteservices.tooling.bndtools"
+         version="0.0.0"/>
+
+</feature>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml
new file mode 100644
index 0000000000..c113159e86
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml
@@ -0,0 +1,14 @@
+<?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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.eclipse.ecf.remoteservice.sdk.bndtools.feature</artifactId>
+  <version>3.15.3-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
index 70a455c25d..a12cf9caad 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.feature"
-      label="ECF Remote Services SDK"
+      label="ECF Remote Services SDK for OSGi clients and servers"
       version="3.15.3.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
diff --git a/releng/org.eclipse.ecf.releng.repository/category.xml b/releng/org.eclipse.ecf.releng.repository/category.xml
index 405b11a167..b3c23b4e9f 100644
--- a/releng/org.eclipse.ecf.releng.repository/category.xml
+++ b/releng/org.eclipse.ecf.releng.repository/category.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="org.eclipse.ecf.core" version="0.0.0">
-      <category name="sdk"/>
-   </feature>
-   <feature id="org.eclipse.ecf.core.source" version="0.0.0">
-      <category name="sdk"/>
-   </feature>
    <feature id="org.eclipse.ecf.core.feature" version="0.0.0">
       <category name="core"/>
    </feature>
@@ -49,10 +43,10 @@
       <category name="core sources"/>
    </feature>
    <feature id="org.eclipse.ecf.remoteservice.sdk.feature" version="0.0.0">
-      <category name="remoteservices"/>
+      <category name="sdk.osgi"/>
    </feature>
    <feature id="org.eclipse.ecf.remoteservice.sdk.feature.source" version="0.0.0">
-      <category name="remoteservices"/>
+      <category name="sdk.osgi"/>
    </feature>
    <feature id="org.eclipse.ecf.console.feature" version="0.0.0">
       <category name="other"/>
@@ -105,9 +99,23 @@
    <feature id="org.eclipse.ecf.remoteservices.tooling.bndtools.feature">
       <category name="other"/>
    </feature>
-   <category-def name="sdk" label="ECF SDK for Eclipse"/>
+   <feature id="org.eclipse.ecf.remoteservice.eclipse.sdk.feature">
+      <category name="sdk.eclipse"/>
+   </feature>
+   <feature id="org.eclipse.ecf.remoteservice..sdk.bndtools.feature">
+      <category name="sdk.bndtools"/>
+   </feature>
    <category-def name="core" label="ECF Core Features"/>
    <category-def name="core sources" label="ECF Core Source Features"/>
-   <category-def name="remoteservices" label="ECF Remote Services SDK"/>
+   <category-def name="remoteservices" label="ECF Remote Services SDKs"/>
    <category-def name="other" label="Other ECF Features"/>
+   <category-def name="sdk.osgi" label="SDK for OSGi-based Clients and Servers (e.g. Apache Karaf)">
+      <category name="remoteservices"/>
+   </category-def>
+   <category-def name="sdk.eclipse" label="SDK for Eclipse">
+      <category name="remoteservices"/>
+   </category-def>
+   <category-def name="sdk.bndtools" label="SDK for Bndtools 7.1+">
+      <category name="remoteservices"/>
+   </category-def>
 </site>

From b4ea491a23d0c92b8e0054c0ef549214d04bdc78 Mon Sep 17 00:00:00 2001
From: Scott Lewis <scottslewis@gmail.com>
Date: Tue, 14 Jan 2025 13:42:12 -0800
Subject: [PATCH 2/3] Fix for path naming error

---
 .../.project                                                      | 0
 .../.settings/org.eclipse.core.resources.prefs                    | 0
 .../about.html                                                    | 0
 .../build.properties                                              | 0
 .../feature.properties                                            | 0
 .../feature.xml                                                   | 0
 .../pom.xml                                                       | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename releng/features/{org.eclipse.ecf.remoteservice.eclipse.sdk => org.eclipse.ecf.remoteservice.sdk.eclipse.feature}/.project (100%)
 rename releng/features/{org.eclipse.ecf.remoteservice.eclipse.sdk => org.eclipse.ecf.remoteservice.sdk.eclipse.feature}/.settings/org.eclipse.core.resources.prefs (100%)
 rename releng/features/{org.eclipse.ecf.remoteservice.eclipse.sdk => org.eclipse.ecf.remoteservice.sdk.eclipse.feature}/about.html (100%)
 rename releng/features/{org.eclipse.ecf.remoteservice.eclipse.sdk => org.eclipse.ecf.remoteservice.sdk.eclipse.feature}/build.properties (100%)
 rename releng/features/{org.eclipse.ecf.remoteservice.eclipse.sdk => org.eclipse.ecf.remoteservice.sdk.eclipse.feature}/feature.properties (100%)
 rename releng/features/{org.eclipse.ecf.remoteservice.eclipse.sdk => org.eclipse.ecf.remoteservice.sdk.eclipse.feature}/feature.xml (100%)
 rename releng/features/{org.eclipse.ecf.remoteservice.eclipse.sdk => org.eclipse.ecf.remoteservice.sdk.eclipse.feature}/pom.xml (100%)

diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/.project b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/.project
similarity index 100%
rename from releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/.project
rename to releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/.project
diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/.settings/org.eclipse.core.resources.prefs b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/.settings/org.eclipse.core.resources.prefs
rename to releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/.settings/org.eclipse.core.resources.prefs
diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/about.html b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/about.html
similarity index 100%
rename from releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/about.html
rename to releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/about.html
diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/build.properties b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/build.properties
similarity index 100%
rename from releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/build.properties
rename to releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/build.properties
diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/feature.properties b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.properties
similarity index 100%
rename from releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/feature.properties
rename to releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.properties
diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml
similarity index 100%
rename from releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/feature.xml
rename to releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml
diff --git a/releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml
similarity index 100%
rename from releng/features/org.eclipse.ecf.remoteservice.eclipse.sdk/pom.xml
rename to releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml

From 564713a2c68cb2d416dc770847148803d1cd5496 Mon Sep 17 00:00:00 2001
From: Scott Lewis <scottslewis@gmail.com>
Date: Tue, 14 Jan 2025 13:50:00 -0800
Subject: [PATCH 3/3] Fix for category.xml

---
 .../.settings/org.eclipse.core.resources.prefs                | 2 ++
 releng/org.eclipse.ecf.releng.repository/category.xml         | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 releng/org.eclipse.ecf.releng.repository/.settings/org.eclipse.core.resources.prefs

diff --git a/releng/org.eclipse.ecf.releng.repository/.settings/org.eclipse.core.resources.prefs b/releng/org.eclipse.ecf.releng.repository/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..68a0304527
--- /dev/null
+++ b/releng/org.eclipse.ecf.releng.repository/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=windows-1252
diff --git a/releng/org.eclipse.ecf.releng.repository/category.xml b/releng/org.eclipse.ecf.releng.repository/category.xml
index b3c23b4e9f..18152377b8 100644
--- a/releng/org.eclipse.ecf.releng.repository/category.xml
+++ b/releng/org.eclipse.ecf.releng.repository/category.xml
@@ -99,10 +99,10 @@
    <feature id="org.eclipse.ecf.remoteservices.tooling.bndtools.feature">
       <category name="other"/>
    </feature>
-   <feature id="org.eclipse.ecf.remoteservice.eclipse.sdk.feature">
+   <feature id="org.eclipse.ecf.remoteservice.sdk.eclipse.feature">
       <category name="sdk.eclipse"/>
    </feature>
-   <feature id="org.eclipse.ecf.remoteservice..sdk.bndtools.feature">
+   <feature id="org.eclipse.ecf.remoteservice.sdk.bndtools.feature">
       <category name="sdk.bndtools"/>
    </feature>
    <category-def name="core" label="ECF Core Features"/>