From 44a81f92fbac289724cd74cf6888b2c4b2a84856 Mon Sep 17 00:00:00 2001
From: Scott Lewis <scottslewis@gmail.com>
Date: Wed, 1 Apr 2026 12:18:30 -0700
Subject: [PATCH] Added support for ECF RS bndtool workspace template.

---
 .../feature.xml                                  |  2 +-
 .../pom.xml                                      |  2 +-
 .../META-INF/MANIFEST.MF                         |  2 +-
 .../plugin.xml                                   | 16 ++++++++++++++++
 .../pom.xml                                      |  2 +-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/feature.xml
index b6c88dc4c..b8628aa03 100644
--- a/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservices.tooling.bndtools.feature"
       label="ECF Remote Services Bndtools Support"
-      version="1.3.0.qualifier"
+      version="1.4.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/pom.xml
index 8d0da8779..7269ac017 100644
--- a/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservices.tooling.bndtools.feature</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF
index 775525f78..b4060d69b 100644
--- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF
+++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.remoteservices.tooling.bndtools;singleton:=true
-Bundle-Version: 1.4.1.qualifier
+Bundle-Version: 1.5.0.qualifier
 Import-Package: org.eclipse.core.resources,
  org.eclipse.jface.resource,
  org.osgi.service.component.annotations;version="1.3.0";resolution:=optional
diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/plugin.xml b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/plugin.xml
index 98c31bfb5..5d655d611 100644
--- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/plugin.xml
+++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/plugin.xml
@@ -8,6 +8,11 @@
             name=" ECF Remote Services"
             parentCategory="bndtools.serviceWizardCategory">
       </category>
+      <category
+            id="org.eclipse.ecf.mcp.category"
+            name=" Model Context Protocol (MCP) Services"
+            parentCategory="bndtools.serviceWizardCategory">
+      </category>
 
       <wizard
             category="bndtools.serviceWizardCategory/org.eclipse.ecf.remoteservices.category"
@@ -42,6 +47,17 @@
             project="true">
       </wizard>
       
+      <wizard
+            category="bndtools.serviceWizardCategory/org.eclipse.ecf.mcp.category"
+            finalPerspective="bndtools.perspective"
+            class="org.bndtools.core.ui.wizards.service.NewBndTemplateBasedServiceWizard:toolgroup"
+            icon="icons/grpc16x16.gif"
+            id="org.eclipse.ecf.bndtools.mcp.ui.toolgroup"
+            name="MCP ToolGroup Example Service (api, mcpserver, mcpclient)"
+            preferredPerspectives="bndtools.perspective"
+            project="true">
+      </wizard>
+      
    </extension>
 
    <extension
diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml
index 1dbf8b62b..474074000 100644
--- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml
+++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservices.tooling.bndtools</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>