#428 Split Java code between core & UI plug-ins

Extract "org.eclipse.embedcdt.debug.gdbjtag.core" bundle.

Signed-off-by: Alexander Fedorov <[email protected]>

Author: ruspl-afed

features/org.eclipse.embedcdt.debug.gdbjtag-feature/feature.xml

@@ -50,6 +50,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.embedcdt.debug.gdbjtag.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.eclipse.embedcdt.debug.gdbjtag.ui"
          download-size="0"

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.eclipse.embedcdt.debug.gdbjtag/.options renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/.options

@@ -13,4 +13,4 @@
 ###############################################################################
 
 # Control if trace messages are shown.
-org.eclipse.embedcdt.debug.gdbjtag/debug=false
+org.eclipse.embedcdt.debug.gdbjtag.core/debug=false

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/.project

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.embedcdt.debug.gdbjtag.core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/META-INF/MANIFEST.MF

@@ -0,0 +1,33 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundle.name
+Bundle-SymbolicName: org.eclipse.embedcdt.debug.gdbjtag.core;singleton:=true
+Bundle-Version: 5.0.0.qualifier
+Bundle-Activator: org.eclipse.embedcdt.debug.gdbjtag.Activator
+Require-Bundle: org.eclipse.embedcdt.core;bundle-version="6.0.0",
+ org.eclipse.embedcdt.debug.core,
+ org.eclipse.embedcdt.packs.core;bundle-version="3.0.0",
+ org.eclipse.cdt.debug.gdbjtag.core;bundle-version="10.0.0",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="9.0.0",
+ org.eclipse.cdt.core;bundle-version="7.0.0",
+ org.eclipse.cdt.debug.core;bundle-version="8.5.0",
+ org.eclipse.cdt.dsf;bundle-version="2.9.0",
+ org.eclipse.cdt.dsf.gdb;bundle-version="6.0.0",
+ org.eclipse.cdt.launch;bundle-version="10.0.0",
+ org.eclipse.core.runtime;bundle-version="3.19.0",
+ org.eclipse.core.variables;bundle-version="3.4.800",
+ org.eclipse.debug.core;bundle-version="3.14.600"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-Vendor: %bundle.vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Export-Package: org.eclipse.embedcdt.debug.gdbjtag,
+ org.eclipse.embedcdt.debug.gdbjtag.core.preferences,
+ org.eclipse.embedcdt.debug.gdbjtag.data,
+ org.eclipse.embedcdt.debug.gdbjtag.datamodel,
+ org.eclipse.embedcdt.debug.gdbjtag.dsf,
+ org.eclipse.embedcdt.debug.gdbjtag.memory,
+ org.eclipse.embedcdt.debug.gdbjtag.properties,
+ org.eclipse.embedcdt.debug.gdbjtag.services,
+ org.eclipse.embedcdt.debug.gdbjtag.viewmodel.peripheral
+Import-Package: org.eclipse.embedcdt.packs.data.xcdl

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/about.html

@@ -0,0 +1,36 @@
+<!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>November 30, 2017</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 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</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>

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/build.properties

@@ -0,0 +1,24 @@
+###############################################################################
+# Copyright (c) 2014, 2020 Liviu Ionescu and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#   Liviu Ionescu - Arm version   
+#   Alexander Fedorov - normalize content of source bundles
+###############################################################################
+
+source.. = src/
+output.. = target/classes
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               .options,\
+               preferences.ini,\
+               about.html
+src.includes = about.html

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/plugin.properties

@@ -0,0 +1,16 @@
+###############################################################################
+# Copyright (c) 2014 Liviu Ionescu.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#   Liviu Ionescu - Arm version   
+###############################################################################
+
+bundle.name=Embedded C/C++ Debugging GDB Core Plug-in (incubation)
+bundle.vendor=Eclipse Embedded CDT

plugins/org.eclipse.embedcdt.debug.gdbjtag/preferences.ini renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/preferences.ini

@@ -6,7 +6,7 @@ Bundle-Version: 5.0.0.qualifier
 Bundle-Activator: org.eclipse.embedcdt.debug.gdbjtag.jlink.Activator
 Require-Bundle: org.eclipse.embedcdt.core,
  org.eclipse.embedcdt.debug.core,
- org.eclipse.embedcdt.debug.gdbjtag;bundle-version="5.0.0",
+ org.eclipse.embedcdt.debug.gdbjtag.core;bundle-version="5.0.0",
  org.eclipse.embedcdt.debug.gdbjtag.ui;bundle-version="5.0.0",
  org.eclipse.embedcdt.managedbuild.cross,
  org.eclipse.embedcdt.ui;bundle-version="6.0.0",

plugins/org.eclipse.embedcdt.debug.gdbjtag/src/org/eclipse/embedcdt/debug/gdbjtag/Activator.java renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/Activator.java

@@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.embedcdt.debug.gdbjtag.jumper.Activator
 Require-Bundle: org.eclipse.embedcdt.core,
  org.eclipse.embedcdt.debug.core,
- org.eclipse.embedcdt.debug.gdbjtag;bundle-version="5.0.0",
+ org.eclipse.embedcdt.debug.gdbjtag.core;bundle-version="5.0.0",
  org.eclipse.embedcdt.debug.gdbjtag.ui;bundle-version="5.0.0",
  org.eclipse.embedcdt.ui;bundle-version="6.0.0",
  org.eclipse.cdt.core;bundle-version="7.0.0",

plugins/org.eclipse.embedcdt.debug.gdbjtag/src/org/eclipse/embedcdt/debug/gdbjtag/ConfigurationAttributes.java renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/ConfigurationAttributes.java

@@ -6,7 +6,7 @@ Bundle-Version: 5.0.0.qualifier
 Bundle-Activator: org.eclipse.embedcdt.debug.gdbjtag.openocd.Activator
 Require-Bundle: org.eclipse.embedcdt.core,
  org.eclipse.embedcdt.debug.core,
- org.eclipse.embedcdt.debug.gdbjtag;bundle-version="5.0.0",
+ org.eclipse.embedcdt.debug.gdbjtag.core;bundle-version="5.0.0",
  org.eclipse.embedcdt.debug.gdbjtag.ui;bundle-version="5.0.0",
  org.eclipse.embedcdt.managedbuild.cross,
  org.eclipse.embedcdt.ui;bundle-version="6.0.0",

plugins/org.eclipse.embedcdt.debug.gdbjtag/src/org/eclipse/embedcdt/debug/gdbjtag/DebugUtils.java renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/DebugUtils.java

@@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.embedcdt.debug.gdbjtag.pyocd.Activator
 Require-Bundle: org.eclipse.embedcdt.core,
  org.eclipse.embedcdt.debug.core,
- org.eclipse.embedcdt.debug.gdbjtag;bundle-version="5.0.0",
+ org.eclipse.embedcdt.debug.gdbjtag.core;bundle-version="5.0.0",
  org.eclipse.embedcdt.debug.gdbjtag.ui;bundle-version="5.0.0",
  org.eclipse.embedcdt.managedbuild.cross,
  org.eclipse.embedcdt.ui;bundle-version="6.0.0",

plugins/org.eclipse.embedcdt.debug.gdbjtag/src/org/eclipse/embedcdt/debug/gdbjtag/ILaunchConfigurationProvider.java renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/ILaunchConfigurationProvider.java

@@ -6,7 +6,7 @@ Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.embedcdt.debug.gdbjtag.qemu.Activator
 Require-Bundle: org.eclipse.embedcdt.core,
  org.eclipse.embedcdt.debug.core,
- org.eclipse.embedcdt.debug.gdbjtag;bundle-version="5.0.0",
+ org.eclipse.embedcdt.debug.gdbjtag.core;bundle-version="5.0.0",
  org.eclipse.embedcdt.debug.gdbjtag.ui;bundle-version="5.0.0",
  org.eclipse.embedcdt.managedbuild.cross,
  org.eclipse.embedcdt.ui;bundle-version="6.0.0",

plugins/org.eclipse.embedcdt.debug.gdbjtag/src/org/eclipse/embedcdt/debug/gdbjtag/ImmediateDataRequestMonitor.java renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/ImmediateDataRequestMonitor.java

@@ -27,8 +27,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                icons/,\
                .options,\
-               GME-32.png,\
-               about.html,\
-               about.ini,\
-               about.mappings
+               about.html
 src.includes = about.html

plugins/org.eclipse.embedcdt.debug.gdbjtag/src/org/eclipse/embedcdt/debug/gdbjtag/core/preferences/PersistentPreferences.java renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/preferences/PersistentPreferences.java

@@ -6,7 +6,7 @@ Bundle-Version: 5.0.0.qualifier
 Bundle-Activator: org.eclipse.embedcdt.debug.gdbjtag.ui.Activator
 Require-Bundle: org.eclipse.embedcdt.core,
  org.eclipse.embedcdt.debug.core,
- org.eclipse.embedcdt.debug.gdbjtag;bundle-version="5.0.0",
+ org.eclipse.embedcdt.debug.gdbjtag.core;bundle-version="5.0.0",
  org.eclipse.embedcdt.packs.core;bundle-version="3.0.0",
  org.eclipse.embedcdt.ui;bundle-version="6.0.0",
  org.eclipse.cdt.debug.gdbjtag.core;bundle-version="10.0.0",

plugins/org.eclipse.embedcdt.debug.gdbjtag/src/org/eclipse/embedcdt/debug/gdbjtag/data/CProjectAttributes.java renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/data/CProjectAttributes.java

@@ -26,7 +26,7 @@ public class Activator extends AbstractUIActivator {
 	// ------------------------------------------------------------------------
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.embedcdt.debug.gdbjtag"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.embedcdt.debug.gdbjtag.ui"; //$NON-NLS-1$
 
 	@Override
 	public String getBundleId() {

plugins/org.eclipse.embedcdt.debug.gdbjtag/src/org/eclipse/embedcdt/debug/gdbjtag/data/CProjectExtraDataManagerProxy.java renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/data/CProjectExtraDataManagerProxy.java

@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.eclipse.embedcdt.debug.gdbjtag/src/org/eclipse/embedcdt/debug/gdbjtag/data/SVDPathManagerProxy.java renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/data/SVDPathManagerProxy.java

@@ -3,31 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.eclipse.embedcdt.debug.gdbjtag;singleton:=true
 Bundle-Version: 5.0.0.qualifier
-Bundle-Activator: org.eclipse.embedcdt.debug.gdbjtag.Activator
-Require-Bundle: org.eclipse.embedcdt.core;bundle-version="6.0.0",
- org.eclipse.embedcdt.debug.core,
- org.eclipse.embedcdt.packs.core;bundle-version="3.0.0",
- org.eclipse.cdt.debug.gdbjtag.core;bundle-version="10.0.0",
- org.eclipse.cdt.managedbuilder.core;bundle-version="9.0.0",
- org.eclipse.cdt.core;bundle-version="7.0.0",
- org.eclipse.cdt.debug.core;bundle-version="8.5.0",
- org.eclipse.cdt.dsf;bundle-version="2.9.0",
- org.eclipse.cdt.dsf.gdb;bundle-version="6.0.0",
- org.eclipse.cdt.launch;bundle-version="10.0.0",
- org.eclipse.core.runtime;bundle-version="3.19.0",
- org.eclipse.core.variables;bundle-version="3.4.800",
- org.eclipse.debug.core;bundle-version="3.14.600"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %bundle.vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Export-Package: org.eclipse.embedcdt.debug.gdbjtag,
- org.eclipse.embedcdt.debug.gdbjtag.core.preferences,
- org.eclipse.embedcdt.debug.gdbjtag.data,
- org.eclipse.embedcdt.debug.gdbjtag.datamodel,
- org.eclipse.embedcdt.debug.gdbjtag.dsf,
- org.eclipse.embedcdt.debug.gdbjtag.memory,
- org.eclipse.embedcdt.debug.gdbjtag.properties,
- org.eclipse.embedcdt.debug.gdbjtag.services,
- org.eclipse.embedcdt.debug.gdbjtag.viewmodel.peripheral
 Import-Package: org.eclipse.embedcdt.packs.data.xcdl

plugins/org.eclipse.embedcdt.debug.gdbjtag/src/org/eclipse/embedcdt/debug/gdbjtag/datamodel/IPeripheralDMContext.java renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/datamodel/IPeripheralDMContext.java

@@ -0,0 +1,30 @@
+###############################################################################
+# Copyright (c) 2002, 2009 Wind River Systems and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+# 
+# Contributors:
+#   Wind River Systems - initial API and implementation
+#   Liviu Ionescu - Arm version   
+###############################################################################
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+# NOTE TO TRANSLATOR: Please do not translate the featureVersion variable.
+
+blurb=Embedded C/C++ JTAG Debugging\n\
+\n\
+Version: {featureVersion}\n\
+\n\
+Copyright (c) Liviu Ionescu 2009-2020.\n\
+\n\
+This plug-in is part of the Eclipse Embedded CDT project.\n\
+For more details, visit <https://eclipse-embed-cdt.github.io>.\n\
+For updates, use <https://download.eclipse.org/embed-cdt/updates/v6/>.

plugins/org.eclipse.embedcdt.debug.gdbjtag/src/org/eclipse/embedcdt/debug/gdbjtag/datamodel/PeripheralDMContext.java renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/datamodel/PeripheralDMContext.java

@@ -13,12 +13,12 @@
 #   Alexander Fedorov - normalize content of source bundles
 ###############################################################################
 
-source.. = src/
-output.. = target/classes
 bin.includes = META-INF/,\
                .,\
                plugin.properties,\
-               .options,\
-               preferences.ini,\
-               about.html
+               about.html,\
+               GME-32.png,\
+               about.ini,\
+               about.mappings,\
+               about.properties
 src.includes = about.html

plugins/org.eclipse.embedcdt.debug.gdbjtag/src/org/eclipse/embedcdt/debug/gdbjtag/datamodel/PeripheralDMNode.java renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/datamodel/PeripheralDMNode.java

@@ -14,10 +14,3 @@
 
 bundle.name=Embedded C/C++ Debugging GDB Plug-in (incubation)
 bundle.vendor=Eclipse Embedded CDT
-
-views.peripheral.name=Peripherals
-
-preferences.peripherals=MCU Peripherals Views
-
-properties.svd.tab.name=SVD Path
-properties.svd.page.name=SVD Path

plugins/org.eclipse.embedcdt.debug.gdbjtag/src/org/eclipse/embedcdt/debug/gdbjtag/datamodel/PeripheralValue.java renamed to plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/datamodel/PeripheralValue.java

@@ -53,6 +53,7 @@
 		<module>plugins/org.eclipse.embedcdt.debug.core</module>
 		<module>plugins/org.eclipse.embedcdt.debug.packs</module>
 		<module>plugins/org.eclipse.embedcdt.debug.gdbjtag</module>
+		<module>plugins/org.eclipse.embedcdt.debug.gdbjtag.core</module>
 		<module>plugins/org.eclipse.embedcdt.debug.gdbjtag.ui</module>
 		<module>plugins/org.eclipse.embedcdt.debug.gdbjtag.restart</module>
 		<module>features/org.eclipse.embedcdt.debug.gdbjtag-feature</module>