More fixup of namespace changes

laeubi · laeubi · commit a5a46f8300b4 · 2025-06-24T14:34:10.000+02:00
diff --git a/terminal/bundles/org.eclipse.terminal.connector.local/.options b/terminal/bundles/org.eclipse.terminal.connector.local/.options
@@ -1 +1 @@
-org.eclipse.tm.terminal.connector.local/debugmode = 0
+org.eclipse.terminal.connector.local/debugmode = 0
diff --git a/terminal/bundles/org.eclipse.terminal.connector.local/META-INF/MANIFEST.MF b/terminal/bundles/org.eclipse.terminal.connector.local/META-INF/MANIFEST.MF
@@ -22,4 +22,4 @@ Bundle-Localization: plugin
 Export-Package: org.eclipse.terminal.connector.local.activator;x-internal:=true,
  org.eclipse.terminal.connector.local.controls,
  org.eclipse.terminal.connector.local.launcher
-Automatic-Module-Name: org.eclipse.tm.terminal.connector.local
+Automatic-Module-Name: org.eclipse.terminal.connector.local
diff --git a/terminal/bundles/org.eclipse.terminal.connector.process/.options b/terminal/bundles/org.eclipse.terminal.connector.process/.options
@@ -1 +1 @@
-org.eclipse.tm.terminal.connector.process/debugmode = 0
+org.eclipse.terminal.connector.process/debugmode = 0
diff --git a/terminal/bundles/org.eclipse.terminal.connector.process/META-INF/MANIFEST.MF b/terminal/bundles/org.eclipse.terminal.connector.process/META-INF/MANIFEST.MF
@@ -21,4 +21,4 @@ Export-Package: org.eclipse.terminal.connector.process,
  org.eclipse.terminal.connector.process.activator;x-internal:=true,
  org.eclipse.terminal.connector.process.help,
  org.eclipse.terminal.connector.process.nls;x-internal:=true
-Automatic-Module-Name: org.eclipse.tm.terminal.connector.process
+Automatic-Module-Name: org.eclipse.terminal.connector.process
diff --git a/terminal/bundles/org.eclipse.terminal.connector.ssh/.options b/terminal/bundles/org.eclipse.terminal.connector.ssh/.options
@@ -1 +1 @@
-org.eclipse.tm.terminal.connector.ssh/debugmode = 0
+org.eclipse.terminal.connector.ssh/debugmode = 0
diff --git a/terminal/bundles/org.eclipse.terminal.connector.ssh/META-INF/MANIFEST.MF b/terminal/bundles/org.eclipse.terminal.connector.ssh/META-INF/MANIFEST.MF
@@ -22,4 +22,4 @@ Export-Package: org.eclipse.terminal.connector.ssh.activator;x-internal:=true,
  org.eclipse.terminal.connector.ssh.controls,
  org.eclipse.terminal.connector.ssh.launcher,
  org.eclipse.terminal.connector.ssh.nls;x-internal:=true
-Automatic-Module-Name: org.eclipse.tm.terminal.connector.ssh
+Automatic-Module-Name: org.eclipse.terminal.connector.ssh
diff --git a/terminal/bundles/org.eclipse.terminal.connector.telnet/.options b/terminal/bundles/org.eclipse.terminal.connector.telnet/.options
@@ -1 +1 @@
-org.eclipse.tm.terminal.connector.telnet/debugmode = 0
+org.eclipse.terminal.connector.telnet/debugmode = 0
diff --git a/terminal/bundles/org.eclipse.terminal.connector.telnet/META-INF/MANIFEST.MF b/terminal/bundles/org.eclipse.terminal.connector.telnet/META-INF/MANIFEST.MF
@@ -20,4 +20,4 @@ Export-Package: org.eclipse.terminal.connector.telnet.activator;x-internal:=true
  org.eclipse.terminal.connector.telnet.controls,
  org.eclipse.terminal.connector.telnet.launcher,
  org.eclipse.terminal.connector.telnet.nls;x-internal:=true
-Automatic-Module-Name: org.eclipse.tm.terminal.connector.telnet
+Automatic-Module-Name: org.eclipse.terminal.connector.telnet
diff --git a/terminal/bundles/org.eclipse.terminal.control/.options b/terminal/bundles/org.eclipse.terminal.control/.options
@@ -1,4 +1,4 @@
-org.eclipse.tm.terminal.control/debug/log = false
-org.eclipse.tm.terminal.control/debug/log/char = false
-org.eclipse.tm.terminal.control/debug/log/VT100Backend = false
-org.eclipse.tm.terminal.control/debug/log/hover = false
+org.eclipse.terminal.control/debug/log = false
+org.eclipse.terminal.control/debug/log/char = false
+org.eclipse.terminal.control/debug/log/VT100Backend = false
+org.eclipse.terminal.control/debug/log/hover = false
diff --git a/terminal/bundles/org.eclipse.terminal.view.core/.options b/terminal/bundles/org.eclipse.terminal.view.core/.options
@@ -1 +1 @@
-org.eclipse.tm.terminal.view.core/debugmode = 0
+org.eclipse.terminal.view.core/debugmode = 0
diff --git a/terminal/bundles/org.eclipse.terminal.view.core/META-INF/MANIFEST.MF b/terminal/bundles/org.eclipse.terminal.view.core/META-INF/MANIFEST.MF
@@ -19,4 +19,4 @@ Export-Package: org.eclipse.terminal.view.core,
  org.eclipse.terminal.view.core.preferences,
  org.eclipse.terminal.view.core.tracing,
  org.eclipse.terminal.view.core.utils
-Automatic-Module-Name: org.eclipse.tm.terminal.view.core
+Automatic-Module-Name: org.eclipse.terminal.view.core
diff --git a/terminal/bundles/org.eclipse.terminal.view.core/plugin.xml b/terminal/bundles/org.eclipse.terminal.view.core/plugin.xml
@@ -17,8 +17,8 @@
    <extension point="org.eclipse.core.expressions.propertyTesters">
       <propertyTester
             class="org.eclipse.terminal.view.core.internal.PropertyTester"
-            id="org.eclipse.tm.terminal.view.core.PropertyTester"
-            namespace="org.eclipse.tm.terminal.view.core"
+            id="org.eclipse.terminal.view.core.PropertyTester"
+            namespace="org.eclipse.terminal.view.core"
             properties="hasContextPropertiesProvider"
             type="java.lang.Object">
       </propertyTester>
diff --git a/terminal/bundles/org.eclipse.terminal.view.core/schema/contextPropertiesProviders.exsd b/terminal/bundles/org.eclipse.terminal.view.core/schema/contextPropertiesProviders.exsd
@@ -64,10 +64,10 @@ The terminal context is passed in as default variable to the enablement expressi
          <attribute name="class" type="string">
             <annotation>
                <documentation>
-                  The class that implements &lt;code&gt;org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider&lt;/code&gt;.
+                  The class that implements &lt;code&gt;org.eclipse.terminal.view.core.interfaces.ITerminalContextPropertiesProvider&lt;/code&gt;.
                </documentation>
                <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider"/>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.terminal.view.core.interfaces.ITerminalContextPropertiesProvider"/>
                </appinfo>
             </annotation>
          </attribute>
@@ -91,7 +91,7 @@ The terminal context is passed in as default variable to the enablement expressi
          This is an example of the extension point usage:
 &lt;p&gt;
 &lt;pre&gt;&lt;code&gt;
-  &lt;extension point=&quot;org.eclipse.tm.terminal.view.core.contextPropertiesProviders&quot;&gt;
+  &lt;extension point=&quot;org.eclipse.terminal.view.core.contextPropertiesProviders&quot;&gt;
       &lt;contextPropertiesProvider
             class=&quot;com.my.contribution.MyContextPropertiesProviderImpl&quot;&gt;
       &lt;/contextPropertiesProvider&gt;
@@ -105,7 +105,7 @@ The terminal context is passed in as default variable to the enablement expressi
          <meta.section type="apiinfo"/>
       </appinfo>
       <documentation>
-         The provider of a terminal context properties provider must implement &lt;samp&gt;org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider&lt;/samp&gt;.
+         The provider of a terminal context properties provider must implement &lt;samp&gt;org.eclipse.terminal.view.core.interfaces.ITerminalContextPropertiesProvider&lt;/samp&gt;.
       </documentation>
    </annotation>
 
diff --git a/terminal/bundles/org.eclipse.terminal.view.ui/.options b/terminal/bundles/org.eclipse.terminal.view.ui/.options
@@ -1,3 +1,3 @@
-org.eclipse.tm.terminal.view.ui/debugmode = 0
-org.eclipse.tm.terminal.view.ui/trace/outputStreamMonitor = false
-org.eclipse.tm.terminal.view.ui/trace/launchTerminalCommandHandler = false
+org.eclipse.terminal.view.ui/debugmode = 0
+org.eclipse.terminal.view.ui/trace/outputStreamMonitor = false
+org.eclipse.terminal.view.ui/trace/launchTerminalCommandHandler = false
diff --git a/terminal/bundles/org.eclipse.terminal.view.ui/META-INF/MANIFEST.MF b/terminal/bundles/org.eclipse.terminal.view.ui/META-INF/MANIFEST.MF
@@ -40,4 +40,4 @@ Export-Package: org.eclipse.terminal.view.ui.actions,
  org.eclipse.terminal.view.ui.streams,
  org.eclipse.terminal.view.ui.tabs,
  org.eclipse.terminal.view.ui.view
-Automatic-Module-Name: org.eclipse.tm.terminal.view.ui
+Automatic-Module-Name: org.eclipse.terminal.view.ui
diff --git a/terminal/bundles/org.eclipse.terminal.view.ui/plugin.xml b/terminal/bundles/org.eclipse.terminal.view.ui/plugin.xml
@@ -30,38 +30,10 @@
             id="org.eclipse.terminal.view.ui.TerminalsView"
             name="%TerminalsView.name">
       </view>
-
-      <!-- Bug 466644: Contribute another view with the old (TCF) ID to handle the ID change -->
-      <!-- The sole purpose of this view is to close itself when it's in an old workspace/persepctive -->
-      <view
-            allowMultiple="true"
-            class="org.eclipse.terminal.view.ui.view.OldTerminalsViewHandler"
-            icon="icons/eview16/terminal_view.gif"
-            id="org.eclipse.tcf.te.ui.terminals.TerminalsView"
-            name="%TerminalsView.name.old">
-      </view>
     </extension>
 
 <!-- Perspective extension contributions -->    
    <extension point="org.eclipse.ui.perspectiveExtensions">
-      <!-- This next line will be a warning about
-               Referenced identifier 'org.eclipse.tcf.te.ui.perspective' in attribute 'targetID' cannot be found
-           If you don't have TCF bundles in your target platform. As TCF is not part of standard CDT target platform
-           this message has been downgraded to a warning.
-        -->
-      <perspectiveExtension targetID="org.eclipse.tcf.te.ui.perspective">
-		 <!-- Register the view shortcuts  -->
-         <viewShortcut id="org.eclipse.terminal.view.ui.TerminalsView"/>
-         <!-- Place the Terminal view relative to the Task List view -->
-         <view
-               id="org.eclipse.terminal.view.ui.TerminalsView"
-               minimized="false"
-               relationship="stack"
-               relative="org.eclipse.ui.views.TaskList"
-               visible="false">
-         </view>
-      </perspectiveExtension>
-
       <perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
 		 <!-- Register the view shortcuts  -->
          <viewShortcut id="org.eclipse.terminal.view.ui.TerminalsView"/>
@@ -88,19 +60,6 @@
          </view>
       </perspectiveExtension>
 
-      <perspectiveExtension targetID="org.eclipse.cdt.ui.CPerspective">
-		 <!-- Register the view shortcuts  -->
-         <viewShortcut id="org.eclipse.terminal.view.ui.TerminalsView"/>
-         <!-- Place the Terminal view relative to the Task List view -->
-         <view
-               id="org.eclipse.terminal.view.ui.TerminalsView"
-               minimized="false"
-               relationship="stack"
-               relative="org.eclipse.ui.views.TaskList"
-               visible="false">
-         </view>
-      </perspectiveExtension>
-
       <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
 		 <!-- Register the view shortcuts  -->
          <viewShortcut id="org.eclipse.terminal.view.ui.TerminalsView"/>
diff --git a/terminal/bundles/org.eclipse.terminal.view.ui/schema/launcherDelegates.exsd b/terminal/bundles/org.eclipse.terminal.view.ui/schema/launcherDelegates.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.tcf.te.ui.terminals" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.terminal.view.ui" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
       <appinfo>
-         <meta.schema plugin="org.eclipse.tcf.te.ui.terminals" id="launcherDelegates" name="Terminal Launcher Delegates"/>
+         <meta.schema plugin="org.eclipse.terminal.view.ui" id="launcherDelegates" name="Terminal Launcher Delegates"/>
       </appinfo>
       <documentation>
          This extension point is used to contribute terminal launcher delegates.
@@ -80,12 +80,12 @@ Terminal launcher delegates contributes terminal settings widget to the &lt;code
          <attribute name="class" type="string">
             <annotation>
                <documentation>
-                  The class that implements &lt;code&gt;org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate&lt;/code&gt;.
+                  The class that implements &lt;code&gt;org.eclipse.terminal.view.uiinterfaces.ILauncherDelegate&lt;/code&gt; or extends &lt;code&gt;org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate&lt;/code&gt;.
 &lt;p&gt;
 The terminal launcher delegate implementation class must be specified either by the class attribute or the class child element!
                </documentation>
                <appinfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate:org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate"/>
+                  <meta.attribute kind="java" basedOn="org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate:org.eclipse.terminal.view.ui.interfaces.ILauncherDelegate"/>
                </appinfo>
             </annotation>
          </attribute>
@@ -120,12 +120,12 @@ The terminal launcher delegate implementation class must be specified either by
          <attribute name="class" type="string">
             <annotation>
                <documentation>
-                  The class that implements &lt;code&gt;org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tcf.te.ui.terminals.launcher.AbstractLauncherDelegate&lt;/code&gt;.
+                  The class that implements &lt;code&gt;org.eclipse.terminal.view.ui.interfaces.ILauncherDelegate&lt;/code&gt; or extends &lt;code&gt;org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate&lt;/code&gt;.
 &lt;p&gt;
 The terminal launcher delegate implementation class must be specified either by the class attribute or the class child element!
                </documentation>
                <appinfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate:org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate"/>
+                  <meta.attribute kind="java" basedOn="org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate:org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate"/>
                </appinfo>
             </annotation>
          </attribute>
@@ -173,10 +173,10 @@ The terminal launcher delegate implementation class must be specified either by
          This is an example of the extension point usage:
 &lt;p&gt;
 &lt;pre&gt;&lt;code&gt;
-  &lt;extension point=&quot;org.eclipse.tcf.te.ui.terminals.launcherDelegates&quot;&gt;
+  &lt;extension point=&quot;org.eclipse.terminal.view.ui.launcherDelegates&quot;&gt;
       &lt;delegate
-            id=&quot;org.eclipse.tcf.te.ui.terminals.launcher.tcf&quot;
-            class=&quot;org.eclipse.tcf.te.tcf.terminals.ui.internal.TerminalLauncherDelegate&quot;
+            id=&quot;org.eclipse.terminal.view.ui.launcher.tcf&quot;
+            class=&quot;org.eclipse.terminal.view.ui.internal.TerminalLauncherDelegate&quot;
             label=&quot;TCF Terminal&quot;&gt;
             &lt;enablement&gt;
                ...
@@ -192,7 +192,7 @@ The terminal launcher delegate implementation class must be specified either by
          <meta.section type="apiinfo"/>
       </appinfo>
       <documentation>
-         The provider of a launcher delegate must implement &lt;samp&gt;org.eclipse.tcf.te.ui.terminals.interfaces.ILauncherDelegate&lt;/samp&gt;.
+         The provider of a launcher delegate must implement &lt;samp&gt;org.eclipse.terminal.view.ui.interfaces.ILauncherDelegate&lt;/samp&gt;.
       </documentation>
    </annotation>
 
diff --git a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/view/OldTerminalsViewHandler.java b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/view/OldTerminalsViewHandler.java
diff --git a/terminal/tests/org.eclipse.terminal.test/META-INF/MANIFEST.MF b/terminal/tests/org.eclipse.terminal.test/META-INF/MANIFEST.MF
@@ -22,4 +22,4 @@ Export-Package: org.eclipse.terminal.internal.connector;x-internal:=true,
  org.eclipse.terminal.test
 Import-Package: org.junit.jupiter.api;version="[5.9.3,6.0.0)",
  org.junit.jupiter.api.function;version="[5.9.3,6.0.0)"
-Automatic-Module-Name: org.eclipse.tm.terminal.test
+Automatic-Module-Name: org.eclipse.terminal.test
diff --git a/terminal/tests/org.eclipse.terminal.test/plugin.xml b/terminal/tests/org.eclipse.terminal.test/plugin.xml
@@ -15,10 +15,10 @@
 # Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point
 -->
 <plugin>
-   <extension point="org.eclipse.tm.terminal.control.connectors">
+   <extension point="org.eclipse.terminal.control.connectors">
       <connector
             class="org.eclipse.terminal.internal.speedtest.SpeedTestConnector"
-            id="org.eclipse.tm.internal.terminal.speedtest.SpeedTestConnector"
+            id="org.eclipse.internal.terminal.speedtest.SpeedTestConnector"
             name="Speed Test"/>
    </extension>
 </plugin>
diff --git a/terminal/tests/org.eclipse.terminal.test/teamConfig/Terminal All Unit Tests.launch b/terminal/tests/org.eclipse.terminal.test/teamConfig/Terminal All Unit Tests.launch
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tm.terminal.test/src"/>
+<listEntry value="/org.eclipse.terminal.test/src"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="2"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.tm.terminal.test/src"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.terminal.test/src"/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.tm.terminal.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.terminal.test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
 </launchConfiguration>
diff --git a/terminal/tests/org.eclipse.terminal.test/teamConfig/Terminal AutomatedTests.launch b/terminal/tests/org.eclipse.terminal.test/teamConfig/Terminal AutomatedTests.launch

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-org.eclipse.tm.terminal.connector.local/debugmode = 0`
	`1`	`+org.eclipse.terminal.connector.local/debugmode = 0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-org.eclipse.tm.terminal.connector.process/debugmode = 0`
	`1`	`+org.eclipse.terminal.connector.process/debugmode = 0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-org.eclipse.tm.terminal.connector.ssh/debugmode = 0`
	`1`	`+org.eclipse.terminal.connector.ssh/debugmode = 0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-org.eclipse.tm.terminal.connector.telnet/debugmode = 0`
	`1`	`+org.eclipse.terminal.connector.telnet/debugmode = 0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-org.eclipse.tm.terminal.view.core/debugmode = 0`
	`1`	`+org.eclipse.terminal.view.core/debugmode = 0`