From d9130f679c48d78f0a54d11f2ced535ec9704e56 Mon Sep 17 00:00:00 2001 From: Uwe Stieber Date: Mon, 27 Apr 2015 07:20:48 +0200 Subject: [PATCH] Releng: Complete Terminal namespace cleanup. Renamed remote connector plug-in and features. --- .../.project | 2 +- .../build.properties | 0 .../feature.properties | 33 ++++ .../feature.xml | 4 +- .../pom.xml | 2 +- .../.project | 2 +- .../build.properties | 0 .../feature.properties | 33 ++++ .../feature.xml | 6 +- .../pom.xml | 2 +- .../feature.properties | 165 ------------------ .../feature.properties | 165 ------------------ .../.classpath | 0 .../.cvsignore | 0 .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../META-INF/MANIFEST.MF | 8 +- .../about.html | 0 .../build.properties | 0 .../plugin.properties | 0 .../plugin.xml | 25 +-- .../pom.xml | 2 +- .../schema/parsers.exsd | 0 .../connector}/remote/IRemoteSettings.java | 2 +- .../remote/IRemoteTerminalConstants.java | 2 +- .../remote/IRemoteTerminalParser.java | 2 +- .../connector/remote/internal}/Activator.java | 4 +- .../remote/internal}/ArgumentParser.java | 2 +- .../internal}/RemoteConnectionManager.java | 8 +- .../remote/internal}/RemoteConnector.java | 5 +- .../remote/internal}/RemoteSettings.java | 4 +- .../remote/internal}/RemoteSettingsPage.java | 2 +- .../remote/internal}/messages/Messages.java | 2 +- .../internal}/messages/messages.properties | 0 .../RemoteTerminalPreferenceInitializer.java | 6 +- .../RemoteTerminalPreferencePage.java | 8 +- pom.xml | 8 +- .../org.eclipse.tm.terminal.repo/category.xml | 4 +- 40 files changed, 123 insertions(+), 387 deletions(-) rename features/{org.eclipse.tm.terminal.remote.feature => org.eclipse.tm.terminal.connector.remote.feature}/.project (84%) rename features/{org.eclipse.tm.terminal.remote.feature => org.eclipse.tm.terminal.connector.remote.feature}/build.properties (100%) create mode 100644 features/org.eclipse.tm.terminal.connector.remote.feature/feature.properties rename features/{org.eclipse.tm.terminal.remote.feature => org.eclipse.tm.terminal.connector.remote.feature}/feature.xml (93%) rename features/{org.eclipse.tm.terminal.remote.sdk.feature => org.eclipse.tm.terminal.connector.remote.feature}/pom.xml (92%) rename features/{org.eclipse.tm.terminal.remote.sdk.feature => org.eclipse.tm.terminal.connector.remote.sdk.feature}/.project (83%) rename features/{org.eclipse.tm.terminal.remote.sdk.feature => org.eclipse.tm.terminal.connector.remote.sdk.feature}/build.properties (100%) create mode 100644 features/org.eclipse.tm.terminal.connector.remote.sdk.feature/feature.properties rename features/{org.eclipse.tm.terminal.remote.sdk.feature => org.eclipse.tm.terminal.connector.remote.sdk.feature}/feature.xml (86%) rename features/{org.eclipse.tm.terminal.remote.feature => org.eclipse.tm.terminal.connector.remote.sdk.feature}/pom.xml (92%) delete mode 100644 features/org.eclipse.tm.terminal.remote.feature/feature.properties delete mode 100644 features/org.eclipse.tm.terminal.remote.sdk.feature/feature.properties rename plugins/{org.eclipse.tm.terminal.remote => org.eclipse.tm.terminal.connnector.remote}/.classpath (100%) rename plugins/{org.eclipse.tm.terminal.remote => org.eclipse.tm.terminal.connnector.remote}/.cvsignore (100%) rename plugins/{org.eclipse.tm.terminal.remote => org.eclipse.tm.terminal.connnector.remote}/.gitignore (100%) rename plugins/{org.eclipse.tm.terminal.remote => org.eclipse.tm.terminal.connnector.remote}/.project (93%) rename plugins/{org.eclipse.tm.terminal.remote => org.eclipse.tm.terminal.connnector.remote}/.settings/org.eclipse.jdt.core.prefs (100%) rename plugins/{org.eclipse.tm.terminal.remote => org.eclipse.tm.terminal.connnector.remote}/.settings/org.eclipse.jdt.ui.prefs (100%) rename plugins/{org.eclipse.tm.terminal.remote => org.eclipse.tm.terminal.connnector.remote}/META-INF/MANIFEST.MF (66%) rename plugins/{org.eclipse.tm.terminal.remote => org.eclipse.tm.terminal.connnector.remote}/about.html (100%) rename plugins/{org.eclipse.tm.terminal.remote => org.eclipse.tm.terminal.connnector.remote}/build.properties (100%) rename plugins/{org.eclipse.tm.terminal.remote => org.eclipse.tm.terminal.connnector.remote}/plugin.properties (100%) rename plugins/{org.eclipse.tm.terminal.remote => org.eclipse.tm.terminal.connnector.remote}/plugin.xml (51%) rename plugins/{org.eclipse.tm.terminal.remote => org.eclipse.tm.terminal.connnector.remote}/pom.xml (89%) rename plugins/{org.eclipse.tm.terminal.remote => org.eclipse.tm.terminal.connnector.remote}/schema/parsers.exsd (100%) rename plugins/{org.eclipse.tm.terminal.remote/src/org/eclipse/tm/terminal => org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector}/remote/IRemoteSettings.java (95%) rename plugins/{org.eclipse.tm.terminal.remote/src/org/eclipse/tm/terminal => org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector}/remote/IRemoteTerminalConstants.java (92%) rename plugins/{org.eclipse.tm.terminal.remote/src/org/eclipse/tm/terminal => org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector}/remote/IRemoteTerminalParser.java (96%) rename plugins/{org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote => org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal}/Activator.java (96%) rename plugins/{org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote => org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal}/ArgumentParser.java (99%) rename plugins/{org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote => org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal}/RemoteConnectionManager.java (96%) rename plugins/{org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote => org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal}/RemoteConnector.java (95%) rename plugins/{org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote => org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal}/RemoteSettings.java (93%) rename plugins/{org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote => org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal}/RemoteSettingsPage.java (97%) rename plugins/{org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote => org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal}/messages/Messages.java (93%) rename plugins/{org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote => org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal}/messages/messages.properties (100%) rename plugins/{org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote => org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal}/preferences/RemoteTerminalPreferenceInitializer.java (83%) rename plugins/{org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote => org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal}/preferences/RemoteTerminalPreferencePage.java (83%) diff --git a/features/org.eclipse.tm.terminal.remote.feature/.project b/features/org.eclipse.tm.terminal.connector.remote.feature/.project similarity index 84% rename from features/org.eclipse.tm.terminal.remote.feature/.project rename to features/org.eclipse.tm.terminal.connector.remote.feature/.project index 3dbd83bf56c..678a8ee6245 100644 --- a/features/org.eclipse.tm.terminal.remote.feature/.project +++ b/features/org.eclipse.tm.terminal.connector.remote.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.remote.feature + org.eclipse.tm.terminal.connector.remote.feature diff --git a/features/org.eclipse.tm.terminal.remote.feature/build.properties b/features/org.eclipse.tm.terminal.connector.remote.feature/build.properties similarity index 100% rename from features/org.eclipse.tm.terminal.remote.feature/build.properties rename to features/org.eclipse.tm.terminal.connector.remote.feature/build.properties diff --git a/features/org.eclipse.tm.terminal.connector.remote.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.remote.feature/feature.properties new file mode 100644 index 00000000000..6d9ae2a9d28 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.remote.feature/feature.properties @@ -0,0 +1,33 @@ +############################################################################### +# Copyright (c) 2015 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +############################################################################### +# feature.properties +# contains externalized strings for feature.xml +# "%foo" in feature.xml corresponds to the key "foo" in this file +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file should be translated. + +# "featureName" property - name of the feature +featureName=TM Terminal Remote Connector Extensions + +# "providerName" property - name of the company that provides the feature +providerName=Eclipse.org - Target Management + +# "updateSiteName" property - label for the update site +updateSiteName=TM Terminal 4.0 Updates + +# "description" property - description of the feature +description=An remote connector implementation for the Terminal. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2015 IBM Corporation and others.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License v1.0\n\ +which accompanies this distribution, and is available at\n\ +http://www.eclipse.org/legal/epl-v10.html +################ end of copyright property #################################### diff --git a/features/org.eclipse.tm.terminal.remote.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.remote.feature/feature.xml similarity index 93% rename from features/org.eclipse.tm.terminal.remote.feature/feature.xml rename to features/org.eclipse.tm.terminal.connector.remote.feature/feature.xml index 487dbbed29e..dae09f29463 100644 --- a/features/org.eclipse.tm.terminal.remote.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.connector.remote.feature/feature.xml @@ -10,7 +10,7 @@ IBM Corporation - initial API and implementation --> 4.0.0.qualifier - org.eclipse.tm.terminal.remote.sdk.feature + org.eclipse.tm.terminal.connector.remote.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.remote.sdk.feature/.project b/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/.project similarity index 83% rename from features/org.eclipse.tm.terminal.remote.sdk.feature/.project rename to features/org.eclipse.tm.terminal.connector.remote.sdk.feature/.project index 974f53b28e2..f63833fdb66 100644 --- a/features/org.eclipse.tm.terminal.remote.sdk.feature/.project +++ b/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.remote.sdk.feature + org.eclipse.tm.terminal.connector.remote.sdk.feature diff --git a/features/org.eclipse.tm.terminal.remote.sdk.feature/build.properties b/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/build.properties similarity index 100% rename from features/org.eclipse.tm.terminal.remote.sdk.feature/build.properties rename to features/org.eclipse.tm.terminal.connector.remote.sdk.feature/build.properties diff --git a/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/feature.properties new file mode 100644 index 00000000000..a0639c0e2fc --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/feature.properties @@ -0,0 +1,33 @@ +############################################################################### +# Copyright (c) 2015 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +############################################################################### +# feature.properties +# contains externalized strings for feature.xml +# "%foo" in feature.xml corresponds to the key "foo" in this file +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file should be translated. + +# "featureName" property - name of the feature +featureName=TM Terminal Remote Connector Extensions, SDK + +# "providerName" property - name of the company that provides the feature +providerName=Eclipse.org - Target Management + +# "updateSiteName" property - label for the update site +updateSiteName=TM Terminal 4.0 Updates + +# "description" property - description of the feature +description=An remote connector implementation for the Terminal. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2015 IBM Corporation and others.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License v1.0\n\ +which accompanies this distribution, and is available at\n\ +http://www.eclipse.org/legal/epl-v10.html +################ end of copyright property #################################### diff --git a/features/org.eclipse.tm.terminal.remote.sdk.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/feature.xml similarity index 86% rename from features/org.eclipse.tm.terminal.remote.sdk.feature/feature.xml rename to features/org.eclipse.tm.terminal.connector.remote.sdk.feature/feature.xml index f6009c2a4cb..0c56510128a 100644 --- a/features/org.eclipse.tm.terminal.remote.sdk.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/feature.xml @@ -10,7 +10,7 @@ IBM Corporation - initial API and implementation --> @@ -42,7 +42,7 @@ 4.0.0.qualifier - org.eclipse.tm.terminal.remote.feature + org.eclipse.tm.terminal.connector.remote.sdk.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.remote.feature/feature.properties b/features/org.eclipse.tm.terminal.remote.feature/feature.properties deleted file mode 100644 index 22329c5c36d..00000000000 --- a/features/org.eclipse.tm.terminal.remote.feature/feature.properties +++ /dev/null @@ -1,165 +0,0 @@ -############################################################################### -# Copyright (c) 2015 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -############################################################################### -# feature.properties -# contains externalized strings for feature.xml -# "%foo" in feature.xml corresponds to the key "foo" in this file -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file should be translated. - -# "featureName" property - name of the feature -featureName=TM Terminal Remote Connector Extensions - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - Target Management - -# "updateSiteName" property - label for the update site -updateSiteName=TM Terminal 4.0 Updates - -# "description" property - description of the feature -description=An remote connector implementation for the Terminal. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2015 IBM Corporation and others.\n\ -All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ -which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html -################ end of copyright property #################################### - -# "licenseURL" property - URL of the "Feature License" -# do not translate value - just change to point to a locale-specific HTML page -licenseURL=license.html - -# "license" property - text of the "Feature Update License" -# should be plain text version of license agreement pointed to be "licenseURL" -license=\ -Eclipse Foundation Software User Agreement\n\ -February 1, 2011\n\ -\n\ -Usage Of Content\n\ -\n\ -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ -USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ -AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ -AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ -AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ -TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ -BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ -\n\ -Applicable Licenses\n\ -\n\ -Unless otherwise indicated, all Content made available by the\n\ -Eclipse Foundation is provided to you under the terms and conditions of\n\ -the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ -provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ -For purposes of the EPL, "Program" will mean the Content.\n\ -\n\ -Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse Foundation source code\n\ -repository ("Repository") in software modules ("Modules") and made available\n\ -as downloadable archives ("Downloads").\n\ -\n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -The terms and conditions governing Plug-ins and Fragments should be\n\ -contained in files named "about.html" ("Abouts"). The terms and\n\ -conditions governing Features and Included Features should be contained\n\ -in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ -Licenses may be located in any directory of a Download or Module\n\ -including, but not limited to the following locations:\n\ -\n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ -\n\ -Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ -Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ -Update License") during the installation process. If the Feature contains\n\ -Included Features, the Feature Update License should either provide you\n\ -with the terms and conditions governing the Included Features or inform\n\ -you where you can locate them. Feature Update Licenses may be found in\n\ -the "license" property of files named "feature.properties" found within a Feature.\n\ -Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ -terms and conditions (or references to such terms and conditions) that\n\ -govern your use of the associated Content in that directory.\n\ -\n\ -THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ -SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ -\n\ - - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ -\n\ -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ -TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ -is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ -govern that particular Content.\n\ -\n\ -\n\Use of Provisioning Technology\n\ -\n\ -The Eclipse Foundation makes available provisioning software, examples of which include,\n\ -but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ -the purpose of allowing users to install software, documentation, information and/or\n\ -other materials (collectively "Installable Software"). This capability is provided with\n\ -the intent of allowing such users to install, extend and update Eclipse-based products.\n\ -Information about packaging Installable Software is available at\n\ -http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ -\n\ -You may use Provisioning Technology to allow other parties to install Installable Software.\n\ -You shall be responsible for enabling the applicable license agreements relating to the\n\ -Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ -in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ -making it available in accordance with the Specification, you further acknowledge your\n\ -agreement to, and the acquisition of all necessary rights to permit the following:\n\ -\n\ - 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ - the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ - extending or updating the functionality of an Eclipse-based product.\n\ - 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ - Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ - 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ - govern the use of the Installable Software ("Installable Software Agreement") and such\n\ - Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ - with the Specification. Such Installable Software Agreement must inform the user of the\n\ - terms and conditions that govern the Installable Software and must solicit acceptance by\n\ - the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ - indication of agreement by the user, the provisioning Technology will complete installation\n\ - of the Installable Software.\n\ -\n\ -Cryptography\n\ -\n\ -Content may contain encryption software. The country in which you are\n\ -currently may have restrictions on the import, possession, and use,\n\ -and/or re-export to another country, of encryption software. BEFORE\n\ -using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use, and\n\ -re-export of encryption software, to see if this is permitted.\n\ -\n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n -########### end of license property ########################################## diff --git a/features/org.eclipse.tm.terminal.remote.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.remote.sdk.feature/feature.properties deleted file mode 100644 index a5815f6f622..00000000000 --- a/features/org.eclipse.tm.terminal.remote.sdk.feature/feature.properties +++ /dev/null @@ -1,165 +0,0 @@ -############################################################################### -# Copyright (c) 2015 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -############################################################################### -# feature.properties -# contains externalized strings for feature.xml -# "%foo" in feature.xml corresponds to the key "foo" in this file -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file should be translated. - -# "featureName" property - name of the feature -featureName=TM Terminal Remote Connector Extensions, SDK - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - Target Management - -# "updateSiteName" property - label for the update site -updateSiteName=TM Terminal 4.0 Updates - -# "description" property - description of the feature -description=An remote connector implementation for the Terminal. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2015 IBM Corporation and others.\n\ -All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ -which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html -################ end of copyright property #################################### - -# "licenseURL" property - URL of the "Feature License" -# do not translate value - just change to point to a locale-specific HTML page -licenseURL=license.html - -# "license" property - text of the "Feature Update License" -# should be plain text version of license agreement pointed to be "licenseURL" -license=\ -Eclipse Foundation Software User Agreement\n\ -February 1, 2011\n\ -\n\ -Usage Of Content\n\ -\n\ -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ -USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ -AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ -AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ -AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ -TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ -BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ -\n\ -Applicable Licenses\n\ -\n\ -Unless otherwise indicated, all Content made available by the\n\ -Eclipse Foundation is provided to you under the terms and conditions of\n\ -the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ -provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ -For purposes of the EPL, "Program" will mean the Content.\n\ -\n\ -Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse Foundation source code\n\ -repository ("Repository") in software modules ("Modules") and made available\n\ -as downloadable archives ("Downloads").\n\ -\n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -The terms and conditions governing Plug-ins and Fragments should be\n\ -contained in files named "about.html" ("Abouts"). The terms and\n\ -conditions governing Features and Included Features should be contained\n\ -in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ -Licenses may be located in any directory of a Download or Module\n\ -including, but not limited to the following locations:\n\ -\n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ -\n\ -Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ -Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ -Update License") during the installation process. If the Feature contains\n\ -Included Features, the Feature Update License should either provide you\n\ -with the terms and conditions governing the Included Features or inform\n\ -you where you can locate them. Feature Update Licenses may be found in\n\ -the "license" property of files named "feature.properties" found within a Feature.\n\ -Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ -terms and conditions (or references to such terms and conditions) that\n\ -govern your use of the associated Content in that directory.\n\ -\n\ -THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ -SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ -\n\ - - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ -\n\ -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ -TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ -is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ -govern that particular Content.\n\ -\n\ -\n\Use of Provisioning Technology\n\ -\n\ -The Eclipse Foundation makes available provisioning software, examples of which include,\n\ -but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ -the purpose of allowing users to install software, documentation, information and/or\n\ -other materials (collectively "Installable Software"). This capability is provided with\n\ -the intent of allowing such users to install, extend and update Eclipse-based products.\n\ -Information about packaging Installable Software is available at\n\ -http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ -\n\ -You may use Provisioning Technology to allow other parties to install Installable Software.\n\ -You shall be responsible for enabling the applicable license agreements relating to the\n\ -Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ -in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ -making it available in accordance with the Specification, you further acknowledge your\n\ -agreement to, and the acquisition of all necessary rights to permit the following:\n\ -\n\ - 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ - the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ - extending or updating the functionality of an Eclipse-based product.\n\ - 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ - Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ - 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ - govern the use of the Installable Software ("Installable Software Agreement") and such\n\ - Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ - with the Specification. Such Installable Software Agreement must inform the user of the\n\ - terms and conditions that govern the Installable Software and must solicit acceptance by\n\ - the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ - indication of agreement by the user, the provisioning Technology will complete installation\n\ - of the Installable Software.\n\ -\n\ -Cryptography\n\ -\n\ -Content may contain encryption software. The country in which you are\n\ -currently may have restrictions on the import, possession, and use,\n\ -and/or re-export to another country, of encryption software. BEFORE\n\ -using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use, and\n\ -re-export of encryption software, to see if this is permitted.\n\ -\n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n -########### end of license property ########################################## diff --git a/plugins/org.eclipse.tm.terminal.remote/.classpath b/plugins/org.eclipse.tm.terminal.connnector.remote/.classpath similarity index 100% rename from plugins/org.eclipse.tm.terminal.remote/.classpath rename to plugins/org.eclipse.tm.terminal.connnector.remote/.classpath diff --git a/plugins/org.eclipse.tm.terminal.remote/.cvsignore b/plugins/org.eclipse.tm.terminal.connnector.remote/.cvsignore similarity index 100% rename from plugins/org.eclipse.tm.terminal.remote/.cvsignore rename to plugins/org.eclipse.tm.terminal.connnector.remote/.cvsignore diff --git a/plugins/org.eclipse.tm.terminal.remote/.gitignore b/plugins/org.eclipse.tm.terminal.connnector.remote/.gitignore similarity index 100% rename from plugins/org.eclipse.tm.terminal.remote/.gitignore rename to plugins/org.eclipse.tm.terminal.connnector.remote/.gitignore diff --git a/plugins/org.eclipse.tm.terminal.remote/.project b/plugins/org.eclipse.tm.terminal.connnector.remote/.project similarity index 93% rename from plugins/org.eclipse.tm.terminal.remote/.project rename to plugins/org.eclipse.tm.terminal.connnector.remote/.project index 772df90ccb9..da3152ba6b3 100644 --- a/plugins/org.eclipse.tm.terminal.remote/.project +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.remote + org.eclipse.tm.terminal.connector.remote diff --git a/plugins/org.eclipse.tm.terminal.remote/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.connnector.remote/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.remote/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.connnector.remote/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tm.terminal.remote/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.connnector.remote/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.remote/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.connnector.remote/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tm.terminal.remote/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connnector.remote/META-INF/MANIFEST.MF similarity index 66% rename from plugins/org.eclipse.tm.terminal.remote/META-INF/MANIFEST.MF rename to plugins/org.eclipse.tm.terminal.connnector.remote/META-INF/MANIFEST.MF index 57a6b9ae663..70b1cc30d7d 100644 --- a/plugins/org.eclipse.tm.terminal.remote/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.remote;singleton:=true +Bundle-SymbolicName: org.eclipse.tm.terminal.connector.remote;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -14,9 +14,9 @@ Require-Bundle: org.eclipse.ui, org.eclipse.swt, org.eclipse.jface Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.tm.internal.terminal.remote;x-internal:=true, - org.eclipse.tm.terminal.remote -Bundle-Activator: org.eclipse.tm.internal.terminal.remote.Activator +Export-Package: org.eclipse.tm.terminal.connector.remote, + org.eclipse.tm.terminal.connector.remote.internal;x-internal:=true +Bundle-Activator: org.eclipse.tm.terminal.connector.remote.internal.Activator Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true Import-Package: org.eclipse.core.resources, diff --git a/plugins/org.eclipse.tm.terminal.remote/about.html b/plugins/org.eclipse.tm.terminal.connnector.remote/about.html similarity index 100% rename from plugins/org.eclipse.tm.terminal.remote/about.html rename to plugins/org.eclipse.tm.terminal.connnector.remote/about.html diff --git a/plugins/org.eclipse.tm.terminal.remote/build.properties b/plugins/org.eclipse.tm.terminal.connnector.remote/build.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.remote/build.properties rename to plugins/org.eclipse.tm.terminal.connnector.remote/build.properties diff --git a/plugins/org.eclipse.tm.terminal.remote/plugin.properties b/plugins/org.eclipse.tm.terminal.connnector.remote/plugin.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.remote/plugin.properties rename to plugins/org.eclipse.tm.terminal.connnector.remote/plugin.properties diff --git a/plugins/org.eclipse.tm.terminal.remote/plugin.xml b/plugins/org.eclipse.tm.terminal.connnector.remote/plugin.xml similarity index 51% rename from plugins/org.eclipse.tm.terminal.remote/plugin.xml rename to plugins/org.eclipse.tm.terminal.connnector.remote/plugin.xml index 46ea8858d99..fd40fcf4c85 100644 --- a/plugins/org.eclipse.tm.terminal.remote/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/plugin.xml @@ -9,23 +9,26 @@ --> - - + + + + - + + + + class="org.eclipse.tm.terminal.connector.remote.internal.preferences.RemoteTerminalPreferenceInitializer"> - + + diff --git a/plugins/org.eclipse.tm.terminal.remote/pom.xml b/plugins/org.eclipse.tm.terminal.connnector.remote/pom.xml similarity index 89% rename from plugins/org.eclipse.tm.terminal.remote/pom.xml rename to plugins/org.eclipse.tm.terminal.connnector.remote/pom.xml index 5f11544d2bd..e76aad3bf17 100644 --- a/plugins/org.eclipse.tm.terminal.remote/pom.xml +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/pom.xml @@ -11,7 +11,7 @@ ../../admin/pom-build.xml - org.eclipse.tm.terminal.remote + org.eclipse.tm.terminal.connector.remote 1.0.0-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.tm.terminal.remote/schema/parsers.exsd b/plugins/org.eclipse.tm.terminal.connnector.remote/schema/parsers.exsd similarity index 100% rename from plugins/org.eclipse.tm.terminal.remote/schema/parsers.exsd rename to plugins/org.eclipse.tm.terminal.connnector.remote/schema/parsers.exsd diff --git a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/terminal/remote/IRemoteSettings.java b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/IRemoteSettings.java similarity index 95% rename from plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/terminal/remote/IRemoteSettings.java rename to plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/IRemoteSettings.java index 22b07d0107d..9436f26f65b 100644 --- a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/terminal/remote/IRemoteSettings.java +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/IRemoteSettings.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tm.terminal.remote; +package org.eclipse.tm.terminal.connector.remote; public interface IRemoteSettings { public static final String CONNECTION_NAME = "ConnectionName"; //$NON-NLS-1$ diff --git a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/terminal/remote/IRemoteTerminalConstants.java b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/IRemoteTerminalConstants.java similarity index 92% rename from plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/terminal/remote/IRemoteTerminalConstants.java rename to plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/IRemoteTerminalConstants.java index d0f29e085c8..512248c6162 100644 --- a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/terminal/remote/IRemoteTerminalConstants.java +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/IRemoteTerminalConstants.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tm.terminal.remote; +package org.eclipse.tm.terminal.connector.remote; public interface IRemoteTerminalConstants { public static final String PREF_TERMINAL_SHELL_COMMAND = "TERMINAL_SHELL_COMMAND"; //$NON-NLS-1$ diff --git a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/terminal/remote/IRemoteTerminalParser.java b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/IRemoteTerminalParser.java similarity index 96% rename from plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/terminal/remote/IRemoteTerminalParser.java rename to plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/IRemoteTerminalParser.java index f951e2309e8..43858e09b3c 100644 --- a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/terminal/remote/IRemoteTerminalParser.java +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/IRemoteTerminalParser.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tm.terminal.remote; +package org.eclipse.tm.terminal.connector.remote; import java.io.IOException; diff --git a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/Activator.java b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/Activator.java similarity index 96% rename from plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/Activator.java rename to plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/Activator.java index 2e5ecad2515..8c59e988e1f 100644 --- a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/Activator.java +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/Activator.java @@ -5,13 +5,13 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tm.internal.terminal.remote; +package org.eclipse.tm.terminal.connector.remote.internal; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.tm.internal.terminal.remote.messages.Messages; +import org.eclipse.tm.terminal.connector.remote.internal.messages.Messages; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; diff --git a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/ArgumentParser.java b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/ArgumentParser.java similarity index 99% rename from plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/ArgumentParser.java rename to plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/ArgumentParser.java index 28add0f3f99..17831ce0913 100644 --- a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/ArgumentParser.java +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/ArgumentParser.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.remote; +package org.eclipse.tm.terminal.connector.remote.internal; import java.text.CharacterIterator; import java.text.StringCharacterIterator; diff --git a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/RemoteConnectionManager.java b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteConnectionManager.java similarity index 96% rename from plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/RemoteConnectionManager.java rename to plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteConnectionManager.java index 5b3a7e30480..040c180437a 100644 --- a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/RemoteConnectionManager.java +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteConnectionManager.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tm.internal.terminal.remote; +package org.eclipse.tm.terminal.connector.remote.internal; import java.io.IOException; import java.io.InputStream; @@ -32,9 +32,9 @@ import org.eclipse.remote.core.IRemoteServicesManager; import org.eclipse.remote.core.exception.RemoteConnectionException; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.internal.terminal.remote.messages.Messages; -import org.eclipse.tm.terminal.remote.IRemoteTerminalConstants; -import org.eclipse.tm.terminal.remote.IRemoteTerminalParser; +import org.eclipse.tm.terminal.connector.remote.IRemoteTerminalConstants; +import org.eclipse.tm.terminal.connector.remote.IRemoteTerminalParser; +import org.eclipse.tm.terminal.connector.remote.internal.messages.Messages; @SuppressWarnings("restriction") public class RemoteConnectionManager extends Job { diff --git a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/RemoteConnector.java b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteConnector.java similarity index 95% rename from plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/RemoteConnector.java rename to plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteConnector.java index f52eb22ec10..9534da8bbf8 100644 --- a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/RemoteConnector.java +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteConnector.java @@ -5,18 +5,17 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tm.internal.terminal.remote; +package org.eclipse.tm.terminal.connector.remote.internal; import java.io.InputStream; import java.io.OutputStream; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.NullSettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; -import org.eclipse.tm.terminal.remote.IRemoteSettings; +import org.eclipse.tm.terminal.connector.remote.IRemoteSettings; @SuppressWarnings("restriction") public class RemoteConnector extends TerminalConnectorImpl { diff --git a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/RemoteSettings.java b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteSettings.java similarity index 93% rename from plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/RemoteSettings.java rename to plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteSettings.java index f0670d5018d..74b6c8f80f2 100644 --- a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/RemoteSettings.java +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteSettings.java @@ -5,10 +5,10 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tm.internal.terminal.remote; +package org.eclipse.tm.terminal.connector.remote.internal; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; -import org.eclipse.tm.terminal.remote.IRemoteSettings; +import org.eclipse.tm.terminal.connector.remote.IRemoteSettings; @SuppressWarnings("restriction") public class RemoteSettings implements IRemoteSettings { diff --git a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/RemoteSettingsPage.java b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteSettingsPage.java similarity index 97% rename from plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/RemoteSettingsPage.java rename to plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteSettingsPage.java index 646274136e0..07a8737c293 100644 --- a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/RemoteSettingsPage.java +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteSettingsPage.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tm.internal.terminal.remote; +package org.eclipse.tm.terminal.connector.remote.internal; import org.eclipse.remote.ui.widgets.RemoteConnectionWidget; import org.eclipse.swt.SWT; diff --git a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/messages/Messages.java b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/messages/Messages.java similarity index 93% rename from plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/messages/Messages.java rename to plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/messages/Messages.java index a0df4052781..cbd28f45ea6 100644 --- a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/messages/Messages.java +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/messages/Messages.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tm.internal.terminal.remote.messages; +package org.eclipse.tm.terminal.connector.remote.internal.messages; import org.eclipse.osgi.util.NLS; diff --git a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/messages/messages.properties b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/messages/messages.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/messages/messages.properties rename to plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/messages/messages.properties diff --git a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/preferences/RemoteTerminalPreferenceInitializer.java b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/preferences/RemoteTerminalPreferenceInitializer.java similarity index 83% rename from plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/preferences/RemoteTerminalPreferenceInitializer.java rename to plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/preferences/RemoteTerminalPreferenceInitializer.java index 99d3a8ac91c..895da449685 100644 --- a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/preferences/RemoteTerminalPreferenceInitializer.java +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/preferences/RemoteTerminalPreferenceInitializer.java @@ -5,13 +5,13 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tm.internal.terminal.remote.preferences; +package org.eclipse.tm.terminal.connector.remote.internal.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.eclipse.tm.internal.terminal.remote.Activator; -import org.eclipse.tm.terminal.remote.IRemoteTerminalConstants; +import org.eclipse.tm.terminal.connector.remote.IRemoteTerminalConstants; +import org.eclipse.tm.terminal.connector.remote.internal.Activator; public class RemoteTerminalPreferenceInitializer extends AbstractPreferenceInitializer { diff --git a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/preferences/RemoteTerminalPreferencePage.java b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/preferences/RemoteTerminalPreferencePage.java similarity index 83% rename from plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/preferences/RemoteTerminalPreferencePage.java rename to plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/preferences/RemoteTerminalPreferencePage.java index cfc75187ddf..993f4e34608 100644 --- a/plugins/org.eclipse.tm.terminal.remote/src/org/eclipse/tm/internal/terminal/remote/preferences/RemoteTerminalPreferencePage.java +++ b/plugins/org.eclipse.tm.terminal.connnector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/preferences/RemoteTerminalPreferencePage.java @@ -5,16 +5,16 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tm.internal.terminal.remote.preferences; +package org.eclipse.tm.terminal.connector.remote.internal.preferences; import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.StringFieldEditor; import org.eclipse.swt.widgets.Composite; -import org.eclipse.tm.internal.terminal.remote.Activator; -import org.eclipse.tm.internal.terminal.remote.messages.Messages; -import org.eclipse.tm.terminal.remote.IRemoteTerminalConstants; +import org.eclipse.tm.terminal.connector.remote.IRemoteTerminalConstants; +import org.eclipse.tm.terminal.connector.remote.internal.Activator; +import org.eclipse.tm.terminal.connector.remote.internal.messages.Messages; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.preferences.ScopedPreferenceStore; diff --git a/pom.xml b/pom.xml index 32c87863c7d..1a85d69cf3d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,14 +27,15 @@ plugins/org.eclipse.tm.terminal.connector.local plugins/org.eclipse.tm.terminal.connector.process + plugins/org.eclipse.tm.terminal.connector.remote plugins/org.eclipse.tm.terminal.connector.serial plugins/org.eclipse.tm.terminal.connector.ssh plugins/org.eclipse.tm.terminal.connector.telnet - - plugins/org.eclipse.tm.terminal.remote features/org.eclipse.tm.terminal.connector.local.feature features/org.eclipse.tm.terminal.connector.local.sdk.feature + features/org.eclipse.tm.terminal.connector.remote.feature + features/org.eclipse.tm.terminal.connector.remote.sdk.feature features/org.eclipse.tm.terminal.connector.serial.feature features/org.eclipse.tm.terminal.connector.serial.sdk.feature features/org.eclipse.tm.terminal.connector.ssh.feature @@ -42,9 +43,6 @@ features/org.eclipse.tm.terminal.connector.telnet.feature features/org.eclipse.tm.terminal.connector.telnet.sdk.feature - features/org.eclipse.tm.terminal.remote.feature - features/org.eclipse.tm.terminal.remote.sdk.feature - plugins/org.eclipse.tm.terminal.view.core plugins/org.eclipse.tm.terminal.view.ui diff --git a/repos/org.eclipse.tm.terminal.repo/category.xml b/repos/org.eclipse.tm.terminal.repo/category.xml index 3d19634b4c9..4ecf2e72e45 100644 --- a/repos/org.eclipse.tm.terminal.repo/category.xml +++ b/repos/org.eclipse.tm.terminal.repo/category.xml @@ -33,10 +33,10 @@ - + - +