Releng: Complete Terminal namespace cleanup. Renamed remote connector

plug-in and features.

features/org.eclipse.tm.terminal.connector.remote.feature/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.tm.terminal.remote.feature</name>
+	<name>org.eclipse.tm.terminal.connector.remote.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>

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 ####################################

features/org.eclipse.tm.terminal.connector.remote.feature/feature.xml

@@ -10,7 +10,7 @@
          IBM Corporation - initial API and implementation
  -->
 <feature
-      id="org.eclipse.tm.terminal.remote.feature"
+      id="org.eclipse.tm.terminal.connector.remote.feature"
       label="%featureName"
       version="4.0.0.qualifier"
       provider-name="%providerName"
@@ -47,7 +47,7 @@
    </requires>
 
    <plugin
-         id="org.eclipse.tm.terminal.remote"
+         id="org.eclipse.tm.terminal.connector.remote"
          download-size="0"
          install-size="0"
          version="0.0.0"

features/org.eclipse.tm.terminal.connector.remote.feature/pom.xml

@@ -12,7 +12,7 @@
   </parent>
 
   <version>4.0.0.qualifier</version>
-  <artifactId>org.eclipse.tm.terminal.remote.sdk.feature</artifactId>
+  <artifactId>org.eclipse.tm.terminal.connector.remote.feature</artifactId>
   <packaging>eclipse-feature</packaging>
   
   <build>

features/org.eclipse.tm.terminal.connector.remote.sdk.feature/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.tm.terminal.remote.sdk.feature</name>
+	<name>org.eclipse.tm.terminal.connector.remote.sdk.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>

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 ####################################

features/org.eclipse.tm.terminal.connector.remote.sdk.feature/feature.xml

@@ -10,7 +10,7 @@
          IBM Corporation - initial API and implementation
  -->
 <feature
-      id="org.eclipse.tm.terminal.remote.sdk.feature"
+      id="org.eclipse.tm.terminal.connector.remote.sdk.feature"
       label="%featureName"
       version="4.0.0.qualifier"
       provider-name="%providerName"
@@ -34,7 +34,7 @@
    </url>
 
    <includes
-         id="org.eclipse.tm.terminal.remote.feature"
+         id="org.eclipse.tm.terminal.connector.remote.feature"
          version="0.0.0"/>
 
    <requires>
@@ -42,7 +42,7 @@
    </requires>
 
    <plugin
-         id="org.eclipse.tm.terminal.remote.source"
+         id="org.eclipse.tm.terminal.connector.remote.source"
          download-size="0"
          install-size="0"
          version="0.0.0"

features/org.eclipse.tm.terminal.connector.remote.sdk.feature/pom.xml

@@ -12,7 +12,7 @@
   </parent>
 
   <version>4.0.0.qualifier</version>
-  <artifactId>org.eclipse.tm.terminal.remote.feature</artifactId>
+  <artifactId>org.eclipse.tm.terminal.connector.remote.sdk.feature</artifactId>
   <packaging>eclipse-feature</packaging>
   
   <build>

features/org.eclipse.tm.terminal.remote.feature/feature.properties

@@ -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 ##########################################

features/org.eclipse.tm.terminal.remote.sdk.feature/feature.properties

@@ -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 ##########################################

plugins/org.eclipse.tm.terminal.connnector.remote/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.tm.terminal.remote</name>
+	<name>org.eclipse.tm.terminal.connector.remote</name>
 	<comment></comment>
 	<projects>
 	</projects>

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,
+Export-Package: org.eclipse.tm.terminal.connector.remote,
- org.eclipse.tm.terminal.remote
+ org.eclipse.tm.terminal.connector.remote.internal;x-internal:=true
-Bundle-Activator: org.eclipse.tm.internal.terminal.remote.Activator
+Bundle-Activator: org.eclipse.tm.terminal.connector.remote.internal.Activator
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
 Import-Package: org.eclipse.core.resources,

plugins/org.eclipse.tm.terminal.connnector.remote/plugin.xml

@@ -9,23 +9,26 @@
 -->
 <plugin>
    <extension-point id="parsers" name="Terminal Parsers" schema="schema/parsers.exsd"/>
-   <extension
+
-         point="org.eclipse.tm.terminal.control.connectors">
+<!-- Terminal connector contributions -->
-      <connector name="%connectionName"
+   <extension point="org.eclipse.tm.terminal.control.connectors">
-      id="org.eclipse.tm.terminal.RemoteConnector"
+      <connector 
-      class="org.eclipse.tm.internal.terminal.remote.RemoteConnector"/>
+            name="%connectionName"
+            id="org.eclipse.tm.terminal.connector.remote.RemoteConnector"
+            class="org.eclipse.tm.terminal.connector.remote.internal.RemoteConnector"/>
    </extension>
-   <extension
+   
-         point="org.eclipse.core.runtime.preferences">
+<!-- Preference contributions -->
+   <extension point="org.eclipse.core.runtime.preferences">
       <initializer
-            class="org.eclipse.tm.internal.terminal.remote.preferences.RemoteTerminalPreferenceInitializer">
+            class="org.eclipse.tm.terminal.connector.remote.internal.preferences.RemoteTerminalPreferenceInitializer">
       </initializer>
    </extension>
-   <extension
+   
-         point="org.eclipse.ui.preferencePages">
+   <extension point="org.eclipse.ui.preferencePages">
       <page
             category="org.eclipse.tm.terminal.TerminalPreferencePage"
-            class="org.eclipse.tm.internal.terminal.remote.preferences.RemoteTerminalPreferencePage"
+            class="org.eclipse.tm.terminal.connector.remote.internal.preferences.RemoteTerminalPreferencePage"
             id="org.eclipse.tm.terminal.remote.page"
             name="%RemoteTerminalPage.name">
       </page>

plugins/org.eclipse.tm.terminal.connnector.remote/pom.xml

@@ -11,7 +11,7 @@
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
-  <artifactId>org.eclipse.tm.terminal.remote</artifactId>
+  <artifactId>org.eclipse.tm.terminal.connector.remote</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

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$

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$

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;
 

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;

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;

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.connector.remote.IRemoteTerminalConstants;
-import org.eclipse.tm.terminal.remote.IRemoteTerminalConstants;
+import org.eclipse.tm.terminal.connector.remote.IRemoteTerminalParser;
-import org.eclipse.tm.terminal.remote.IRemoteTerminalParser;
+import org.eclipse.tm.terminal.connector.remote.internal.messages.Messages;
 
 @SuppressWarnings("restriction")
 public class RemoteConnectionManager extends Job {

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 {

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 {

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;

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;
 

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.connector.remote.IRemoteTerminalConstants;
-import org.eclipse.tm.terminal.remote.IRemoteTerminalConstants;
+import org.eclipse.tm.terminal.connector.remote.internal.Activator;
 
 public class RemoteTerminalPreferenceInitializer extends AbstractPreferenceInitializer {
 

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.terminal.connector.remote.IRemoteTerminalConstants;
-import org.eclipse.tm.internal.terminal.remote.messages.Messages;
+import org.eclipse.tm.terminal.connector.remote.internal.Activator;
-import org.eclipse.tm.terminal.remote.IRemoteTerminalConstants;
+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;

pom.xml

@@ -27,14 +27,15 @@
         <!-- Terminal Connector features and plug-ins -->
         <module>plugins/org.eclipse.tm.terminal.connector.local</module>
         <module>plugins/org.eclipse.tm.terminal.connector.process</module>
+        <module>plugins/org.eclipse.tm.terminal.connector.remote</module>
         <module>plugins/org.eclipse.tm.terminal.connector.serial</module>
         <module>plugins/org.eclipse.tm.terminal.connector.ssh</module>
         <module>plugins/org.eclipse.tm.terminal.connector.telnet</module>
         
-        <module>plugins/org.eclipse.tm.terminal.remote</module>
-        
         <module>features/org.eclipse.tm.terminal.connector.local.feature</module>
         <module>features/org.eclipse.tm.terminal.connector.local.sdk.feature</module>
+        <module>features/org.eclipse.tm.terminal.connector.remote.feature</module>
+        <module>features/org.eclipse.tm.terminal.connector.remote.sdk.feature</module>
         <module>features/org.eclipse.tm.terminal.connector.serial.feature</module>
         <module>features/org.eclipse.tm.terminal.connector.serial.sdk.feature</module>
         <module>features/org.eclipse.tm.terminal.connector.ssh.feature</module>
@@ -42,9 +43,6 @@
         <module>features/org.eclipse.tm.terminal.connector.telnet.feature</module>
         <module>features/org.eclipse.tm.terminal.connector.telnet.sdk.feature</module>
 
-        <module>features/org.eclipse.tm.terminal.remote.feature</module>
-        <module>features/org.eclipse.tm.terminal.remote.sdk.feature</module>
-
         <!-- Terminals View features and plug-ins -->
         <module>plugins/org.eclipse.tm.terminal.view.core</module>
         <module>plugins/org.eclipse.tm.terminal.view.ui</module>

repos/org.eclipse.tm.terminal.repo/category.xml

@@ -33,10 +33,10 @@
    <feature url="features/org.eclipse.tm.terminal.connector.telnet.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.telnet.sdk.feature" version="0.0.0">
       <category name="tm_main"/>
    </feature>
-   <feature url="features/org.eclipse.tm.terminal.remote.feature_0.0.0.jar" id="org.eclipse.tm.terminal.remote.feature" version="0.0.0">
+   <feature url="features/org.eclipse.tm.terminal.connector.remote.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.remote.feature" version="0.0.0">
       <category name="tm_main"/>
    </feature>
-   <feature url="features/org.eclipse.tm.terminal.remote.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.remote.sdk.feature" version="0.0.0">
+   <feature url="features/org.eclipse.tm.terminal.connector.remote.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.remote.sdk.feature" version="0.0.0">
       <category name="tm_main"/>
    </feature>