From 6ede2302ad2e4274ee6fa10e04f421e22a4fc708 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Wed, 3 Apr 2024 16:46:46 -0700 Subject: [PATCH 1/3] Removed bndtools support from build. Added grpc wizards to bndtools support --- pom.xml | 4 +- .../feature.xml | 8 +- .../pom.xml | 2 +- .../ecf-bndtools.target | 836 +----------------- ...ECF Remote Service Bndtools Tooling.launch | 256 +++--- .../META-INF/MANIFEST.MF | 5 +- .../build.properties | 3 +- .../icons/bndtools-wizban.png | Bin 0 -> 3623 bytes .../icons/grpc16x16.gif | Bin 0 -> 953 bytes .../plugin.xml | 48 + .../pom.xml | 2 +- 11 files changed, 196 insertions(+), 968 deletions(-) create mode 100644 tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/icons/bndtools-wizban.png create mode 100644 tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/icons/grpc16x16.gif create mode 100644 tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/plugin.xml diff --git a/pom.xml b/pom.xml index 220824119..9752576a9 100644 --- a/pom.xml +++ b/pom.xml @@ -208,7 +208,7 @@ tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde - tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools + releng/features/org.eclipse.ecf.console.feature releng/features/org.eclipse.ecf.core @@ -244,7 +244,7 @@ releng/features/org.eclipse.ecf.tests.feature releng/features/org.eclipse.ecf.tests.filetransfer.feature releng/features/org.eclipse.ecf.xmpp.feature - releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature + releng/org.eclipse.ecf.releng.target releng/org.eclipse.ecf.releng.repository 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 634ec430b..a97ee0e95 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 @@ -1,8 +1,8 @@ @@ -17,6 +17,10 @@ [Enter License Description here.] + + + + ../../../ org.eclipse.ecf.remoteservices.tooling.bndtools.feature - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT eclipse-feature diff --git a/releng/org.eclipse.ecf.releng.target/ecf-bndtools.target b/releng/org.eclipse.ecf.releng.target/ecf-bndtools.target index d3aee3171..00ddce393 100644 --- a/releng/org.eclipse.ecf.releng.target/ecf-bndtools.target +++ b/releng/org.eclipse.ecf.releng.target/ecf-bndtools.target @@ -1,843 +1,13 @@ - - - x86_64 win32 win32 en_US - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/ECF Remote Service Bndtools Tooling.launch b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/ECF Remote Service Bndtools Tooling.launch index 29dd1f920..fa4d42b17 100644 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/ECF Remote Service Bndtools Tooling.launch +++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/ECF Remote Service Bndtools Tooling.launch @@ -73,6 +73,7 @@ + @@ -80,6 +81,8 @@ + + @@ -91,6 +94,8 @@ + + @@ -103,7 +108,6 @@ - @@ -122,8 +126,10 @@ + + @@ -149,7 +155,6 @@ - @@ -172,31 +177,30 @@ - + - - + + - - - - - - - - - + + + + + + + + - + - - - + + + @@ -217,7 +221,7 @@ - + @@ -225,9 +229,9 @@ - + - + @@ -238,27 +242,27 @@ - - + + - - + + - + - - - - - - - - - + + + + + + + + + @@ -277,8 +281,8 @@ + - @@ -295,12 +299,12 @@ - - + + + - + - @@ -309,7 +313,7 @@ - + @@ -326,15 +330,15 @@ - - - - + + + + - + @@ -359,8 +363,8 @@ - - + + @@ -376,7 +380,7 @@ - + @@ -394,22 +398,22 @@ - - + + - - - + + + - + - + @@ -429,45 +433,45 @@ - - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -489,7 +493,7 @@ - + @@ -501,7 +505,7 @@ - + @@ -510,14 +514,14 @@ - - - - - - - - + + + + + + + + @@ -546,17 +550,17 @@ - - - - - - - - + + + + + + + + - - + + @@ -584,25 +588,25 @@ - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + 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 1aacf12ab..5d290b3a8 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.0.100.qualifier +Bundle-Version: 1.2.0.qualifier Import-Package: org.eclipse.core.resources, org.eclipse.jface.resource, org.osgi.service.component.annotations;version="1.3.0";resolution:=optional @@ -10,7 +10,8 @@ Bundle-Activator: org.eclipse.ecf.remoteservices.tooling.bndtools.Activator Bundle-Vendor: %plugin.provider Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui.workbench, - org.eclipse.swt + org.eclipse.swt, + bndtools.core;bundle-version="7.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.ecf.remoteservices.tooling.bndtools Bundle-ActivationPolicy: lazy diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/build.properties b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/build.properties index 545cb4bd7..fa2cbe841 100644 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/build.properties +++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/build.properties @@ -5,6 +5,7 @@ bin.includes = META-INF/,\ OSGI-INF/org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent.xml,\ OSGI-INF/,\ plugin.properties,\ - about.html + about.html,\ + plugin.xml src.includes = ECF Remote Service Bndtools Tooling.launch,\ about.html diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/icons/bndtools-wizban.png b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/icons/bndtools-wizban.png new file mode 100644 index 0000000000000000000000000000000000000000..ecda7ba0b8aefae139752ce1fcb403956c9f9e18 GIT binary patch literal 3623 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 literal 0 HcmV?d00001 diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/plugin.xml b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/plugin.xml new file mode 100644 index 000000000..9a34ddfa3 --- /dev/null +++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/plugin.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + 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 01db26184..8c9f5eadc 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 @@ ../../../ org.eclipse.ecf.remoteservices.tooling.bndtools - 1.0.100-SNAPSHOT + 1.1.0-SNAPSHOT eclipse-plugin From d59b009cb86d5b69fd75c224219fd862f3c734db Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Wed, 3 Apr 2024 16:53:29 -0700 Subject: [PATCH 2/3] Removed bndtools from core feature --- releng/features/org.eclipse.ecf.core/feature.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releng/features/org.eclipse.ecf.core/feature.xml b/releng/features/org.eclipse.ecf.core/feature.xml index 5cb1f123c..673ee1092 100644 --- a/releng/features/org.eclipse.ecf.core/feature.xml +++ b/releng/features/org.eclipse.ecf.core/feature.xml @@ -209,11 +209,11 @@ version="0.0.0" unpack="false"/> - - +--> From 14a0676cf5e03c3a98a9dc3cb430c299677dbf04 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Wed, 3 Apr 2024 16:59:57 -0700 Subject: [PATCH 3/3] Fix for bndtools removal --- releng/org.eclipse.ecf.releng.repository/category.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/releng/org.eclipse.ecf.releng.repository/category.xml b/releng/org.eclipse.ecf.releng.repository/category.xml index b2ced7a4b..af2813de2 100644 --- a/releng/org.eclipse.ecf.releng.repository/category.xml +++ b/releng/org.eclipse.ecf.releng.repository/category.xml @@ -129,13 +129,13 @@ - + - - +