diff --git a/features/org.eclipse.tm.terminal.telnet.sdk.feature/.project b/features/org.eclipse.tm.terminal.connector.local.feature/.project similarity index 84% rename from features/org.eclipse.tm.terminal.telnet.sdk.feature/.project rename to features/org.eclipse.tm.terminal.connector.local.feature/.project index 7c3cd363468..2b177926011 100644 --- a/features/org.eclipse.tm.terminal.telnet.sdk.feature/.project +++ b/features/org.eclipse.tm.terminal.connector.local.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.telnet.sdk.feature + org.eclipse.tm.terminal.connector.local.feature diff --git a/features/org.eclipse.tm.terminal.telnet.feature/build.properties b/features/org.eclipse.tm.terminal.connector.local.feature/build.properties similarity index 100% rename from features/org.eclipse.tm.terminal.telnet.feature/build.properties rename to features/org.eclipse.tm.terminal.connector.local.feature/build.properties diff --git a/features/org.eclipse.tm.terminal.connector.local.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.local.feature/feature.properties new file mode 100644 index 00000000000..5a75241ccaf --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.local.feature/feature.properties @@ -0,0 +1,36 @@ +############################################################################### +# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber (Wind River) - initial API and implementation +############################################################################### +# 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 Telnet 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=A Telnet connector implementation for the Terminal. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2003, 2015 Wind River Systems, Inc. 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.connector.local.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml new file mode 100644 index 00000000000..c5a855c1e41 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml @@ -0,0 +1,63 @@ + + + + + + %description + + + + %copyright + + + + %license + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/features/org.eclipse.tm.terminal.view.feature/p2.inf b/features/org.eclipse.tm.terminal.connector.local.feature/p2.inf similarity index 86% rename from features/org.eclipse.tm.terminal.view.feature/p2.inf rename to features/org.eclipse.tm.terminal.connector.local.feature/p2.inf index 86a0e388bbc..ea454dd75ec 100644 --- a/features/org.eclipse.tm.terminal.view.feature/p2.inf +++ b/features/org.eclipse.tm.terminal.connector.local.feature/p2.inf @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014 Wind River Systems, Inc. and others. All rights reserved. +# Copyright (c) 2014, 2015 Wind River Systems, Inc. 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 @@ -12,7 +12,7 @@ # exist in CDT 8.3 and we can also work on top of CDT 8.3. # The real dependencies are all properly managed via p2.inf in the -# org.eclipse.tcf.te.ui.terminals.process/META-INF/p2.inf file. +# org.eclipse.tm.terminal.connector.process/META-INF/p2.inf file. # The only benefit of requesting the feature here is that it allow pulling in # additional fragments that we are not aware of in the bundle's p2.inf. diff --git a/features/org.eclipse.tm.terminal.view.serial.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.local.feature/pom.xml similarity index 93% rename from features/org.eclipse.tm.terminal.view.serial.sdk.feature/pom.xml rename to features/org.eclipse.tm.terminal.connector.local.feature/pom.xml index 37b9b57f90f..48329669262 100644 --- a/features/org.eclipse.tm.terminal.view.serial.sdk.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.connector.local.feature/pom.xml @@ -12,7 +12,7 @@ 4.0.0.qualifier - org.eclipse.tm.terminal.view.serial.sdk.feature + org.eclipse.tm.terminal.connector.local.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.connector.local.sdk.feature/.project b/features/org.eclipse.tm.terminal.connector.local.sdk.feature/.project new file mode 100644 index 00000000000..e85d50ff010 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.local.sdk.feature/.project @@ -0,0 +1,17 @@ + + + org.eclipse.tm.terminal.connector.local.sdk.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/features/org.eclipse.tm.terminal.telnet.sdk.feature/build.properties b/features/org.eclipse.tm.terminal.connector.local.sdk.feature/build.properties similarity index 100% rename from features/org.eclipse.tm.terminal.telnet.sdk.feature/build.properties rename to features/org.eclipse.tm.terminal.connector.local.sdk.feature/build.properties diff --git a/features/org.eclipse.tm.terminal.connector.local.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.local.sdk.feature/feature.properties new file mode 100644 index 00000000000..fb6c12b2ebd --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.local.sdk.feature/feature.properties @@ -0,0 +1,36 @@ +############################################################################### +# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber (Wind River) - initial API and implementation +############################################################################### +# 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 Telnet 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=A Telnet connector implementation for the Terminal. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2003, 2015 Wind River Systems, Inc. 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.connector.local.sdk.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.local.sdk.feature/feature.xml new file mode 100644 index 00000000000..450f45945c3 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.local.sdk.feature/feature.xml @@ -0,0 +1,58 @@ + + + + + + %description + + + + %copyright + + + + %license + + + + + + + + + + + + + + + + + diff --git a/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml new file mode 100644 index 00000000000..313460bf867 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml + + + 4.0.0.qualifier + org.eclipse.tm.terminal.connector.local.sdk.feature + eclipse-feature + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho-version} + + default + + + + + + diff --git a/features/org.eclipse.tm.terminal.connector.serial.feature/.project b/features/org.eclipse.tm.terminal.connector.serial.feature/.project new file mode 100644 index 00000000000..cf695db1244 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.serial.feature/.project @@ -0,0 +1,17 @@ + + + org.eclipse.tm.terminal.connector.serial.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/features/org.eclipse.tm.terminal.view.serial.feature/build.properties b/features/org.eclipse.tm.terminal.connector.serial.feature/build.properties similarity index 100% rename from features/org.eclipse.tm.terminal.view.serial.feature/build.properties rename to features/org.eclipse.tm.terminal.connector.serial.feature/build.properties diff --git a/features/org.eclipse.tm.terminal.view.serial.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.serial.feature/feature.properties similarity index 91% rename from features/org.eclipse.tm.terminal.view.serial.feature/feature.properties rename to features/org.eclipse.tm.terminal.connector.serial.feature/feature.properties index b4c68e5d0ae..d37b6db1fba 100644 --- a/features/org.eclipse.tm.terminal.view.serial.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.connector.serial.feature/feature.properties @@ -18,10 +18,10 @@ featureName=TM Terminal Serial Connector Extensions # "providerName" property - name of the company that provides the feature -providerName=Eclipse TM Project +providerName=Eclipse.org - Target Management -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=TM Terminal 4.0 Updates +# "updateSiteName" property - label for the update site +updateSiteName=TM Terminal 4.0 Updates # "description" property - description of the feature description=A serial line connector for the Terminal using RXTX API diff --git a/features/org.eclipse.tm.terminal.view.serial.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.serial.feature/feature.xml similarity index 74% rename from features/org.eclipse.tm.terminal.view.serial.feature/feature.xml rename to features/org.eclipse.tm.terminal.connector.serial.feature/feature.xml index 901ef31ac52..4773775e059 100644 --- a/features/org.eclipse.tm.terminal.view.serial.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.connector.serial.feature/feature.xml @@ -11,7 +11,7 @@ Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license --> - + - - + + 4.0.0.qualifier - org.eclipse.tm.terminal.telnet.feature + org.eclipse.tm.terminal.connector.serial.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.connector.serial.sdk.feature/.project b/features/org.eclipse.tm.terminal.connector.serial.sdk.feature/.project new file mode 100644 index 00000000000..2015b76a0ba --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.serial.sdk.feature/.project @@ -0,0 +1,17 @@ + + + org.eclipse.tm.terminal.connector.serial.sdk.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/features/org.eclipse.tm.terminal.view.serial.sdk.feature/build.properties b/features/org.eclipse.tm.terminal.connector.serial.sdk.feature/build.properties similarity index 100% rename from features/org.eclipse.tm.terminal.view.serial.sdk.feature/build.properties rename to features/org.eclipse.tm.terminal.connector.serial.sdk.feature/build.properties diff --git a/features/org.eclipse.tm.terminal.view.serial.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.serial.sdk.feature/feature.properties similarity index 91% rename from features/org.eclipse.tm.terminal.view.serial.sdk.feature/feature.properties rename to features/org.eclipse.tm.terminal.connector.serial.sdk.feature/feature.properties index e7d8cb2121a..64e244a6d41 100644 --- a/features/org.eclipse.tm.terminal.view.serial.sdk.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.connector.serial.sdk.feature/feature.properties @@ -18,10 +18,10 @@ featureName=TM Terminal Serial Connector Extensions, SDK # "providerName" property - name of the company that provides the feature -providerName=Eclipse TM Project +providerName=Eclipse.org - Target Management -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=TM Terminal 4.0 Updates +# "updateSiteName" property - label for the update site +updateSiteName=TM Terminal 4.0 Updates # "description" property - description of the feature description=A serial line connector for the Terminal using RXTX API diff --git a/features/org.eclipse.tm.terminal.view.serial.sdk.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.serial.sdk.feature/feature.xml similarity index 74% rename from features/org.eclipse.tm.terminal.view.serial.sdk.feature/feature.xml rename to features/org.eclipse.tm.terminal.connector.serial.sdk.feature/feature.xml index ceaec36c635..5743b6311e1 100644 --- a/features/org.eclipse.tm.terminal.view.serial.sdk.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.connector.serial.sdk.feature/feature.xml @@ -11,7 +11,7 @@ Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license --> - + - + + + 4.0.0 + + + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml + + + 4.0.0.qualifier + org.eclipse.tm.terminal.connector.serial.sdk.feature + eclipse-feature + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho-version} + + default + + + + + + diff --git a/features/org.eclipse.tm.terminal.telnet.feature/.project b/features/org.eclipse.tm.terminal.connector.ssh.feature/.project similarity index 85% rename from features/org.eclipse.tm.terminal.telnet.feature/.project rename to features/org.eclipse.tm.terminal.connector.ssh.feature/.project index 4d78b79db3c..c96f85db4dd 100644 --- a/features/org.eclipse.tm.terminal.telnet.feature/.project +++ b/features/org.eclipse.tm.terminal.connector.ssh.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.telnet.feature + org.eclipse.tm.terminal.connector.ssh.feature diff --git a/features/org.eclipse.tm.terminal.ssh.feature/build.properties b/features/org.eclipse.tm.terminal.connector.ssh.feature/build.properties similarity index 100% rename from features/org.eclipse.tm.terminal.ssh.feature/build.properties rename to features/org.eclipse.tm.terminal.connector.ssh.feature/build.properties diff --git a/features/org.eclipse.tm.terminal.connector.ssh.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.ssh.feature/feature.properties new file mode 100644 index 00000000000..d60ae03b044 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.ssh.feature/feature.properties @@ -0,0 +1,36 @@ +############################################################################### +# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber (Wind River) - initial API and implementation +############################################################################### +# 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 SSH 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 SSH connector implementation for the Terminal. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2000, 2015 Wind River Systems, Inc. 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.ssh.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.ssh.feature/feature.xml similarity index 72% rename from features/org.eclipse.tm.terminal.ssh.feature/feature.xml rename to features/org.eclipse.tm.terminal.connector.ssh.feature/feature.xml index 62d03196a60..2cb5e43a7bd 100644 --- a/features/org.eclipse.tm.terminal.ssh.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.connector.ssh.feature/feature.xml @@ -11,7 +11,7 @@ Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license --> - - + @@ -41,14 +40,14 @@ - - + + diff --git a/features/org.eclipse.tm.terminal.telnet.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml similarity index 92% rename from features/org.eclipse.tm.terminal.telnet.sdk.feature/pom.xml rename to features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml index 2139e4760c5..7df265ce5b8 100644 --- a/features/org.eclipse.tm.terminal.telnet.sdk.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml @@ -12,7 +12,7 @@ 4.0.0.qualifier - org.eclipse.tm.terminal.telnet.sdk.feature + org.eclipse.tm.terminal.connector.ssh.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/.project b/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/.project new file mode 100644 index 00000000000..3a7e0685dd4 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/.project @@ -0,0 +1,17 @@ + + + org.eclipse.tm.terminal.connector.ssh.sdk.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/features/org.eclipse.tm.terminal.ssh.sdk.feature/build.properties b/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/build.properties similarity index 100% rename from features/org.eclipse.tm.terminal.ssh.sdk.feature/build.properties rename to features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/build.properties diff --git a/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/feature.properties new file mode 100644 index 00000000000..f4ba02af787 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/feature.properties @@ -0,0 +1,36 @@ +############################################################################### +# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber (Wind River) - initial API and implementation +############################################################################### +# 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 SSH 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 SSH connector implementation for the Terminal. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2000, 2015 Wind River Systems, Inc. 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.ssh.sdk.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/feature.xml similarity index 65% rename from features/org.eclipse.tm.terminal.ssh.sdk.feature/feature.xml rename to features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/feature.xml index 9057e585ef6..03aa7939d27 100644 --- a/features/org.eclipse.tm.terminal.ssh.sdk.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/feature.xml @@ -1,6 +1,6 @@ - - + - + diff --git a/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml new file mode 100644 index 00000000000..9e350e035d8 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml + + + 4.0.0.qualifier + org.eclipse.tm.terminal.connector.ssh.sdk.feature + eclipse-feature + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho-version} + + default + + + + + + diff --git a/features/org.eclipse.tm.terminal.connector.telnet.feature/.project b/features/org.eclipse.tm.terminal.connector.telnet.feature/.project new file mode 100644 index 00000000000..97df9e70ce7 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.telnet.feature/.project @@ -0,0 +1,17 @@ + + + org.eclipse.tm.terminal.connector.telnet.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/features/org.eclipse.tm.terminal.connector.telnet.feature/build.properties b/features/org.eclipse.tm.terminal.connector.telnet.feature/build.properties new file mode 100644 index 00000000000..400f7fd68ee --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.telnet.feature/build.properties @@ -0,0 +1,13 @@ +################################################################################ +# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 +# +# Contributors: +# Michael Scharf (Wind River) - initial API and implementation +# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license +################################################################################ +bin.includes = feature.xml,\ + feature.properties diff --git a/features/org.eclipse.tm.terminal.connector.telnet.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.telnet.feature/feature.properties new file mode 100644 index 00000000000..5a75241ccaf --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.telnet.feature/feature.properties @@ -0,0 +1,36 @@ +############################################################################### +# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber (Wind River) - initial API and implementation +############################################################################### +# 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 Telnet 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=A Telnet connector implementation for the Terminal. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2003, 2015 Wind River Systems, Inc. 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.connector.telnet.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.telnet.feature/feature.xml new file mode 100644 index 00000000000..26557e905d1 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.telnet.feature/feature.xml @@ -0,0 +1,51 @@ + + + + + + %description + + + + %copyright + + + + %license + + + + + + + + + + + + + + + + diff --git a/features/org.eclipse.tm.terminal.ssh.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml similarity index 92% rename from features/org.eclipse.tm.terminal.ssh.feature/pom.xml rename to features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml index 260bab28648..c8f7acb9c03 100644 --- a/features/org.eclipse.tm.terminal.ssh.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml @@ -12,7 +12,7 @@ 4.0.0.qualifier - org.eclipse.tm.terminal.ssh.feature + org.eclipse.tm.terminal.connector.telnet.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/.project b/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/.project new file mode 100644 index 00000000000..7abe52415a8 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/.project @@ -0,0 +1,17 @@ + + + org.eclipse.tm.terminal.connector.telnet.sdk.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/build.properties b/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/build.properties new file mode 100644 index 00000000000..400f7fd68ee --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/build.properties @@ -0,0 +1,13 @@ +################################################################################ +# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 +# +# Contributors: +# Michael Scharf (Wind River) - initial API and implementation +# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license +################################################################################ +bin.includes = feature.xml,\ + feature.properties diff --git a/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/feature.properties new file mode 100644 index 00000000000..fb6c12b2ebd --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/feature.properties @@ -0,0 +1,36 @@ +############################################################################### +# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber (Wind River) - initial API and implementation +############################################################################### +# 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 Telnet 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=A Telnet connector implementation for the Terminal. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2003, 2015 Wind River Systems, Inc. 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.telnet.sdk.feature/feature.xml b/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/feature.xml similarity index 64% rename from features/org.eclipse.tm.terminal.telnet.sdk.feature/feature.xml rename to features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/feature.xml index 37148d190eb..92015698be8 100644 --- a/features/org.eclipse.tm.terminal.telnet.sdk.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/feature.xml @@ -1,6 +1,6 @@ - - + - + diff --git a/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml new file mode 100644 index 00000000000..77396b43f29 --- /dev/null +++ b/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml + + + 4.0.0.qualifier + org.eclipse.tm.terminal.connector.telnet.sdk.feature + eclipse-feature + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho-version} + + default + + + + + + diff --git a/features/org.eclipse.tm.terminal.ssh.feature/.project b/features/org.eclipse.tm.terminal.control.feature/.project similarity index 86% rename from features/org.eclipse.tm.terminal.ssh.feature/.project rename to features/org.eclipse.tm.terminal.control.feature/.project index e3330c4a45b..2002b5a3f20 100644 --- a/features/org.eclipse.tm.terminal.ssh.feature/.project +++ b/features/org.eclipse.tm.terminal.control.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.ssh.feature + org.eclipse.tm.terminal.control.feature diff --git a/features/org.eclipse.tm.terminal.control.feature/build.properties b/features/org.eclipse.tm.terminal.control.feature/build.properties new file mode 100644 index 00000000000..f398bf802a8 --- /dev/null +++ b/features/org.eclipse.tm.terminal.control.feature/build.properties @@ -0,0 +1,13 @@ +################################################################################ +# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 +# +# Contributors: +# Michael Scharf (Wind River) - initial API and implementation +# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license +################################################################################ +bin.includes = feature.xml,\ + feature.properties diff --git a/features/org.eclipse.tm.terminal.telnet.feature/feature.properties b/features/org.eclipse.tm.terminal.control.feature/feature.properties similarity index 97% rename from features/org.eclipse.tm.terminal.telnet.feature/feature.properties rename to features/org.eclipse.tm.terminal.control.feature/feature.properties index 68ee0271eaf..97b7b5e5031 100644 --- a/features/org.eclipse.tm.terminal.telnet.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.control.feature/feature.properties @@ -15,16 +15,17 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Target Management Terminal Telnet Connector +featureName=TM Terminal Control # "providerName" property - name of the company that provides the feature -providerName=Eclipse TM Project +providerName=Eclipse.org - Target Management -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management 3.7 Updates +# "updateSiteName" property - label for the update site +updateSiteName=TM Terminal 4.0 Updates # "description" property - description of the feature -description=A Telnet connector implementation for the Terminal. +description=An ANSI (vt102) compatible Terminal widget \ +with RCP-only dependencies. # "copyright" property - text of the "Feature Update Copyright" copyright=\ diff --git a/features/org.eclipse.tm.terminal.telnet.feature/feature.xml b/features/org.eclipse.tm.terminal.control.feature/feature.xml similarity index 63% rename from features/org.eclipse.tm.terminal.telnet.feature/feature.xml rename to features/org.eclipse.tm.terminal.control.feature/feature.xml index 9602035210b..5d21f9b4e27 100644 --- a/features/org.eclipse.tm.terminal.telnet.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.control.feature/feature.xml @@ -1,6 +1,6 @@ @@ -32,21 +33,18 @@ - - + - - - + diff --git a/features/org.eclipse.tm.terminal.ssh.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.control.feature/pom.xml similarity index 93% rename from features/org.eclipse.tm.terminal.ssh.sdk.feature/pom.xml rename to features/org.eclipse.tm.terminal.control.feature/pom.xml index 97e8aae55c8..0d8253cd8b1 100644 --- a/features/org.eclipse.tm.terminal.ssh.sdk.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.control.feature/pom.xml @@ -12,7 +12,7 @@ 4.0.0.qualifier - org.eclipse.tm.terminal.ssh.sdk.feature + org.eclipse.tm.terminal.control.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.ssh.sdk.feature/.project b/features/org.eclipse.tm.terminal.control.sdk.feature/.project similarity index 85% rename from features/org.eclipse.tm.terminal.ssh.sdk.feature/.project rename to features/org.eclipse.tm.terminal.control.sdk.feature/.project index 5559076f138..09a6bce3e20 100644 --- a/features/org.eclipse.tm.terminal.ssh.sdk.feature/.project +++ b/features/org.eclipse.tm.terminal.control.sdk.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.ssh.sdk.feature + org.eclipse.tm.terminal.control.sdk.feature diff --git a/features/org.eclipse.tm.terminal.control.sdk.feature/build.properties b/features/org.eclipse.tm.terminal.control.sdk.feature/build.properties new file mode 100644 index 00000000000..f398bf802a8 --- /dev/null +++ b/features/org.eclipse.tm.terminal.control.sdk.feature/build.properties @@ -0,0 +1,13 @@ +################################################################################ +# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 +# +# Contributors: +# Michael Scharf (Wind River) - initial API and implementation +# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license +################################################################################ +bin.includes = feature.xml,\ + feature.properties diff --git a/features/org.eclipse.tm.terminal.telnet.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.control.sdk.feature/feature.properties similarity index 97% rename from features/org.eclipse.tm.terminal.telnet.sdk.feature/feature.properties rename to features/org.eclipse.tm.terminal.control.sdk.feature/feature.properties index 054f79a897a..77c220ce021 100644 --- a/features/org.eclipse.tm.terminal.telnet.sdk.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.control.sdk.feature/feature.properties @@ -15,16 +15,17 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Target Management Terminal Telnet Connector, SDK +featureName=TM Terminal Control, SDK # "providerName" property - name of the company that provides the feature -providerName=Eclipse TM Project +providerName=Eclipse.org - Target Management -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management 3.7 Updates +# "updateSiteName" property - label for the update site +updateSiteName=TM Terminal 4.0 Updates # "description" property - description of the feature -description=A Telnet connector implementation for the Terminal. +description=An ANSI (vt102) compatible Terminal widget \ +with RCP-only dependencies. # "copyright" property - text of the "Feature Update Copyright" copyright=\ diff --git a/features/org.eclipse.tm.terminal.control.sdk.feature/feature.xml b/features/org.eclipse.tm.terminal.control.sdk.feature/feature.xml new file mode 100644 index 00000000000..d18a54ff542 --- /dev/null +++ b/features/org.eclipse.tm.terminal.control.sdk.feature/feature.xml @@ -0,0 +1,49 @@ + + + + + + %description + + + + %copyright + + + + %license + + + + + + + + + + + diff --git a/features/org.eclipse.tm.terminal.view.serial.feature/pom.xml b/features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml similarity index 93% rename from features/org.eclipse.tm.terminal.view.serial.feature/pom.xml rename to features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml index 538fad29831..a3380348fe8 100644 --- a/features/org.eclipse.tm.terminal.view.serial.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml @@ -12,7 +12,7 @@ 4.0.0.qualifier - org.eclipse.tm.terminal.view.serial.feature + org.eclipse.tm.terminal.control.sdk.feature eclipse-feature diff --git a/features/org.eclipse.tm.terminal.feature/.project b/features/org.eclipse.tm.terminal.feature/.project index c72dafff564..a456794a2fa 100644 --- a/features/org.eclipse.tm.terminal.feature/.project +++ b/features/org.eclipse.tm.terminal.feature/.project @@ -14,4 +14,15 @@ org.eclipse.pde.FeatureNature + + + 1311579318584 + + 10 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-target + + + diff --git a/features/org.eclipse.tm.terminal.feature/build.properties b/features/org.eclipse.tm.terminal.feature/build.properties index f398bf802a8..c8eb6010921 100644 --- a/features/org.eclipse.tm.terminal.feature/build.properties +++ b/features/org.eclipse.tm.terminal.feature/build.properties @@ -1,13 +1,13 @@ -################################################################################ -# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 -# -# Contributors: -# Michael Scharf (Wind River) - initial API and implementation -# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license -################################################################################ +############################################################################### +# Copyright (c) 2012, 2014 Wind River Systems, Inc. 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 +# +# Contributors: +# Wind River Systems - initial API and implementation +############################################################################### bin.includes = feature.xml,\ - feature.properties + feature.properties,\ + p2.inf +src.includes = feature.properties diff --git a/features/org.eclipse.tm.terminal.feature/feature.properties b/features/org.eclipse.tm.terminal.feature/feature.properties index 48eaef3ee38..4a88bf60c93 100644 --- a/features/org.eclipse.tm.terminal.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.feature/feature.properties @@ -1,13 +1,12 @@ -############################################################################### -# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 -# +################################################################################## +# Copyright (c) 2015 Wind River Systems, Inc. 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 +# # Contributors: -# Martin Oberhuber (Wind River) - initial API and implementation -############################################################################### +# Wind River Systems - initial API and implementation +################################################################################## # feature.properties # contains externalized strings for feature.xml # "%foo" in feature.xml corresponds to the key "foo" in this file @@ -15,155 +14,25 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Target Management Terminal Widget +featureName=TM Terminal # "providerName" property - name of the company that provides the feature -providerName=Eclipse TM Project +providerName=Eclipse.org - Target Management -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management 3.7 Updates +# "updateSiteName" property - label for the update site +updateSiteName=TM Terminal 4.0 Updates # "description" property - description of the feature -description=An ANSI (vt102) compatible Terminal widget \ -with RCP-only dependencies. +description=An integrated Eclipse View for the local command prompt (console) or \ + remote hosts (SSH, Telnet, Serial). Works on Windows, Linux, Mac and Solaris. \ + Requires Eclipse 3.8.2 or newer and a Java 6 or newer JRE. # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2003, 2015 Wind River Systems, Inc. and others.\n\ +Copyright (c) 2011 - 2015 Wind River Systems, Inc. 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.feature/feature.xml b/features/org.eclipse.tm.terminal.feature/feature.xml index 5cd4c78fbc2..3eea85380eb 100644 --- a/features/org.eclipse.tm.terminal.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.feature/feature.xml @@ -1,22 +1,10 @@ - @@ -33,19 +21,16 @@ - + - - + + + + + + - - diff --git a/features/org.eclipse.tm.terminal.feature/pom.xml b/features/org.eclipse.tm.terminal.feature/pom.xml index a2f63b903fb..82edd61bd87 100644 --- a/features/org.eclipse.tm.terminal.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.feature/pom.xml @@ -1,32 +1,21 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.0.0-SNAPSHOT - ../../admin/pom-build.xml - + + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml + - 4.0.0.qualifier - org.eclipse.tm.terminal.feature - eclipse-feature - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - + 4.0.0.qualifier + org.eclipse.tm.terminal.feature + eclipse-feature + + + true + diff --git a/features/org.eclipse.tm.terminal.remote.feature/feature.properties b/features/org.eclipse.tm.terminal.remote.feature/feature.properties index ddc31e1b159..22329c5c36d 100644 --- a/features/org.eclipse.tm.terminal.remote.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.remote.feature/feature.properties @@ -12,13 +12,13 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Target Management Terminal Remote Connector +featureName=TM Terminal Remote Connector Extensions # "providerName" property - name of the company that provides the feature -providerName=Eclipse TM Project +providerName=Eclipse.org - Target Management -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management 3.7 Updates +# "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. diff --git a/features/org.eclipse.tm.terminal.remote.feature/feature.xml b/features/org.eclipse.tm.terminal.remote.feature/feature.xml index 293170ca182..487dbbed29e 100644 --- a/features/org.eclipse.tm.terminal.remote.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.remote.feature/feature.xml @@ -30,21 +30,20 @@ - - + - + - + - - + - + + + org.eclipse.pde.ds.core.builder + + + org.eclipse.pde.FeatureNature + + + 1311579318584 + + 10 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-target + + + diff --git a/features/org.eclipse.tm.terminal.sdk.feature/build.properties b/features/org.eclipse.tm.terminal.sdk.feature/build.properties index f398bf802a8..d9e56c50b07 100644 --- a/features/org.eclipse.tm.terminal.sdk.feature/build.properties +++ b/features/org.eclipse.tm.terminal.sdk.feature/build.properties @@ -1,13 +1,12 @@ -################################################################################ -# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 -# -# Contributors: -# Michael Scharf (Wind River) - initial API and implementation -# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license -################################################################################ +############################################################################### +# Copyright (c) 2012, 2014 Wind River Systems, Inc. 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 +# +# Contributors: +# Wind River Systems - initial API and implementation +############################################################################### bin.includes = feature.xml,\ feature.properties +src.includes = feature.properties diff --git a/features/org.eclipse.tm.terminal.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.sdk.feature/feature.properties index 21350113ad1..7b8d6be0183 100644 --- a/features/org.eclipse.tm.terminal.sdk.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.sdk.feature/feature.properties @@ -1,13 +1,12 @@ -############################################################################### -# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 -# +################################################################################## +# Copyright (c) 2015 Wind River Systems, Inc. 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 +# # Contributors: -# Martin Oberhuber (Wind River) - initial API and implementation -############################################################################### +# Wind River Systems - initial API and implementation +################################################################################## # feature.properties # contains externalized strings for feature.xml # "%foo" in feature.xml corresponds to the key "foo" in this file @@ -15,155 +14,25 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Target Management Terminal Widget, SDK +featureName=TM Terminal, SDK # "providerName" property - name of the company that provides the feature -providerName=Eclipse TM Project +providerName=Eclipse.org - Target Management -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management 3.7 Updates +# "updateSiteName" property - label for the update site +updateSiteName=TM Terminal 4.0 Updates # "description" property - description of the feature -description=An ANSI (vt102) compatible Terminal widget \ -with RCP-only dependencies. +description=An integrated Eclipse View for the local command prompt (console) or \ + remote hosts via (SSH, Telnet, Serial). Works on Windows, Linux, Mac and Solaris. \ + Requires Eclipse 3.8.2 or newer and a Java 6 or newer JRE. # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2003, 2015 Wind River Systems, Inc. and others.\n\ +Copyright (c) 2011 - 2015 Wind River Systems, Inc. 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.sdk.feature/feature.xml b/features/org.eclipse.tm.terminal.sdk.feature/feature.xml index 5e61723d557..349e216b282 100644 --- a/features/org.eclipse.tm.terminal.sdk.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.sdk.feature/feature.xml @@ -1,16 +1,4 @@ - - + - + - + + + + + + + + diff --git a/features/org.eclipse.tm.terminal.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.sdk.feature/pom.xml index f648d7ecaa3..8e98438cdd2 100644 --- a/features/org.eclipse.tm.terminal.sdk.feature/pom.xml +++ b/features/org.eclipse.tm.terminal.sdk.feature/pom.xml @@ -1,32 +1,21 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.0.0-SNAPSHOT - ../../admin/pom-build.xml - + + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml + - 4.0.0.qualifier - org.eclipse.tm.terminal.sdk.feature - eclipse-feature - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - + 4.0.0.qualifier + org.eclipse.tm.terminal.sdk.feature + eclipse-feature + + + true + diff --git a/features/org.eclipse.tm.terminal.ssh.feature/feature.properties b/features/org.eclipse.tm.terminal.ssh.feature/feature.properties deleted file mode 100644 index d541fa42cfb..00000000000 --- a/features/org.eclipse.tm.terminal.ssh.feature/feature.properties +++ /dev/null @@ -1,168 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber (Wind River) - initial API and implementation -############################################################################### -# 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=Target Management Terminal SSH Connector - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse TM Project - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management 3.7 Updates - -# "description" property - description of the feature -description=An SSH connector implementation for the Terminal. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2015 Wind River Systems, Inc. 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.ssh.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.ssh.sdk.feature/feature.properties deleted file mode 100644 index e2791a5bd63..00000000000 --- a/features/org.eclipse.tm.terminal.ssh.sdk.feature/feature.properties +++ /dev/null @@ -1,168 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber (Wind River) - initial API and implementation -############################################################################### -# 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=Target Management Terminal SSH Connector, SDK - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse TM Project - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management 3.7 Updates - -# "description" property - description of the feature -description=An SSH connector implementation for the Terminal. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2000, 2015 Wind River Systems, Inc. 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.view.feature/feature.properties b/features/org.eclipse.tm.terminal.view.feature/feature.properties index cf94c04841a..51c94ab8f5c 100644 --- a/features/org.eclipse.tm.terminal.view.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.view.feature/feature.properties @@ -14,13 +14,13 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Terminals View +featureName=TM Terminal View # "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - Target Explorer +providerName=Eclipse.org - Target Management # "updateSiteName" property - label for the update site -updateSiteName=Eclipse Update Site +updateSiteName=TM Terminal 4.0 Updates # "description" property - description of the feature description=An integrated Eclipse View for the local command prompt (console) or \ diff --git a/features/org.eclipse.tm.terminal.view.feature/feature.xml b/features/org.eclipse.tm.terminal.view.feature/feature.xml index 10a5d241585..dd204cdbf8a 100644 --- a/features/org.eclipse.tm.terminal.view.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.view.feature/feature.xml @@ -21,23 +21,15 @@ - + + - - - - - - - - - - - - - - - - - diff --git a/features/org.eclipse.tm.terminal.view.rse.feature/feature.properties b/features/org.eclipse.tm.terminal.view.rse.feature/feature.properties index 87c3fe99805..db6bbc0ea6c 100644 --- a/features/org.eclipse.tm.terminal.view.rse.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.view.rse.feature/feature.properties @@ -14,13 +14,13 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Remote System Explorer Terminals View add-in +featureName=TM Terminal View Remote System Explorer add-in # "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - Target Explorer +providerName=Eclipse.org - Target Management # "updateSiteName" property - label for the update site -updateSiteName=Eclipse Update Site +updateSiteName=TM Terminal 4.0 Updates # "description" property - description of the feature description=Integrates the Terminals view into the Remote System Explorer. \ diff --git a/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml b/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml index a36aae3d978..aa7b43777e0 100644 --- a/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml @@ -21,7 +21,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.properties index 23361eb9e6e..9411bc138d6 100644 --- a/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.properties @@ -1,5 +1,5 @@ ################################################################################## -# Copyright (c) 2014 Wind River Systems, Inc. and others. All rights reserved. +# Copyright (c) 2014, 2015 Wind River Systems, Inc. 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 @@ -14,13 +14,13 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Remote System Explorer Terminals View add-in, SDK +featureName=TM Terminal View Remote System Explorer add-in, SDK # "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - Target Explorer +providerName=Eclipse.org - Target Management # "updateSiteName" property - label for the update site -updateSiteName=Eclipse Update Site +updateSiteName=TM Terminal 4.0 Updates # "description" property - description of the feature description=Integrates the Terminals view into the Remote System Explorer. \ diff --git a/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.xml b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.xml index d4859dc775a..54ddd504fb6 100644 --- a/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/feature.xml @@ -20,7 +20,7 @@ - + diff --git a/features/org.eclipse.tm.terminal.view.sdk.feature/feature.properties b/features/org.eclipse.tm.terminal.view.sdk.feature/feature.properties index b47482d1b2d..521bd1a1bff 100644 --- a/features/org.eclipse.tm.terminal.view.sdk.feature/feature.properties +++ b/features/org.eclipse.tm.terminal.view.sdk.feature/feature.properties @@ -1,5 +1,5 @@ ################################################################################## -# Copyright (c) 2011, 2014 Wind River Systems, Inc. and others. All rights reserved. +# Copyright (c) 2011 - 2015 Wind River Systems, Inc. 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 @@ -14,13 +14,13 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Terminals View, SDK +featureName=TM Terminal View, SDK # "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - Target Explorer +providerName=Eclipse.org - Target Management # "updateSiteName" property - label for the update site -updateSiteName=Eclipse Update Site +updateSiteName=TM Terminal 4.0 Updates # "description" property - description of the feature description=An integrated Eclipse View for the local command prompt (console) or \ diff --git a/features/org.eclipse.tm.terminal.view.sdk.feature/feature.xml b/features/org.eclipse.tm.terminal.view.sdk.feature/feature.xml index 42e78d06c90..4d406a1939e 100644 --- a/features/org.eclipse.tm.terminal.view.sdk.feature/feature.xml +++ b/features/org.eclipse.tm.terminal.view.sdk.feature/feature.xml @@ -20,17 +20,13 @@ - + - - - - - - - - - - - - diff --git a/features/org.eclipse.tm.terminal.view.serial.feature/.project b/features/org.eclipse.tm.terminal.view.serial.feature/.project deleted file mode 100644 index a59b4d2ea4d..00000000000 --- a/features/org.eclipse.tm.terminal.view.serial.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.tm.terminal.view.serial.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/features/org.eclipse.tm.terminal.view.serial.sdk.feature/.project b/features/org.eclipse.tm.terminal.view.serial.sdk.feature/.project deleted file mode 100644 index 322a638c887..00000000000 --- a/features/org.eclipse.tm.terminal.view.serial.sdk.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.tm.terminal.view.serial.sdk.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/plugins/org.eclipse.tm.terminal.ssh/.classpath b/plugins/org.eclipse.tm.terminal.connector.local/.classpath similarity index 100% rename from plugins/org.eclipse.tm.terminal.ssh/.classpath rename to plugins/org.eclipse.tm.terminal.connector.local/.classpath diff --git a/plugins/org.eclipse.tm.terminal.ssh/.gitignore b/plugins/org.eclipse.tm.terminal.connector.local/.gitignore similarity index 100% rename from plugins/org.eclipse.tm.terminal.ssh/.gitignore rename to plugins/org.eclipse.tm.terminal.connector.local/.gitignore diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/.options b/plugins/org.eclipse.tm.terminal.connector.local/.options similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.local/.options rename to plugins/org.eclipse.tm.terminal.connector.local/.options diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/.project b/plugins/org.eclipse.tm.terminal.connector.local/.project similarity index 94% rename from plugins/org.eclipse.tm.terminal.view.ui.local/.project rename to plugins/org.eclipse.tm.terminal.connector.local/.project index 2e1b844261f..9a13c2acf9c 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/.project +++ b/plugins/org.eclipse.tm.terminal.connector.local/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.view.ui.local + org.eclipse.tm.terminal.connector.local diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.connector.local/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.local/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.connector.local/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.connector.local/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.local/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.connector.local/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.tm.terminal.connector.local/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.local/.settings/org.eclipse.pde.prefs rename to plugins/org.eclipse.tm.terminal.connector.local/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF similarity index 52% rename from plugins/org.eclipse.tm.terminal.view.ui.local/META-INF/MANIFEST.MF rename to plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF index b3c6735717d..a8fa633b0d4 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui.local;singleton:=true +Bundle-SymbolicName: org.eclipse.tm.terminal.connector.local;singleton:=true Bundle-Version: 4.0.0.qualifier -Bundle-Activator: org.eclipse.tm.terminal.view.ui.local.activator.UIPlugin +Bundle-Activator: org.eclipse.tm.terminal.connector.local.activator.UIPlugin Bundle-Vendor: %providerName Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6";resolution:=optional, @@ -14,17 +14,17 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6";resolution:=optional, org.eclipse.debug.ui;bundle-version="3.8.1";resolution:=optional, org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0", - org.eclipse.tm.terminal.view.ui.process;bundle-version="4.0.0", - org.eclipse.tm.terminal;bundle-version="4.0.0", + org.eclipse.tm.terminal.connector.process;bundle-version="4.0.0", + org.eclipse.tm.terminal.control;bundle-version="4.0.0", org.eclipse.ui;bundle-version="3.8.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.tm.terminal.view.ui.local.activator;x-internal:=true, - org.eclipse.tm.terminal.view.ui.local.controls, - org.eclipse.tm.terminal.view.ui.local.help, - org.eclipse.tm.terminal.view.ui.local.launcher, - org.eclipse.tm.terminal.view.ui.local.nls;x-internal:=true, - org.eclipse.tm.terminal.view.ui.local.showin, - org.eclipse.tm.terminal.view.ui.local.showin.interfaces, - org.eclipse.tm.terminal.view.ui.local.showin.preferences +Export-Package: org.eclipse.tm.terminal.connector.local.activator;x-internal:=true, + org.eclipse.tm.terminal.connector.local.controls, + org.eclipse.tm.terminal.connector.local.help, + org.eclipse.tm.terminal.connector.local.launcher, + org.eclipse.tm.terminal.connector.local.nls;x-internal:=true, + org.eclipse.tm.terminal.connector.local.showin, + org.eclipse.tm.terminal.connector.local.showin.interfaces, + org.eclipse.tm.terminal.connector.local.showin.preferences diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/META-INF/p2.inf b/plugins/org.eclipse.tm.terminal.connector.local/META-INF/p2.inf similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.local/META-INF/p2.inf rename to plugins/org.eclipse.tm.terminal.connector.local/META-INF/p2.inf diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/about.html b/plugins/org.eclipse.tm.terminal.connector.local/about.html similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.local/about.html rename to plugins/org.eclipse.tm.terminal.connector.local/about.html diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/build.properties b/plugins/org.eclipse.tm.terminal.connector.local/build.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.local/build.properties rename to plugins/org.eclipse.tm.terminal.connector.local/build.properties diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/contexts.xml b/plugins/org.eclipse.tm.terminal.connector.local/contexts.xml similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.local/contexts.xml rename to plugins/org.eclipse.tm.terminal.connector.local/contexts.xml diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/icons/eview16/terminal_view.gif b/plugins/org.eclipse.tm.terminal.connector.local/icons/eview16/terminal_view.gif similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.local/icons/eview16/terminal_view.gif rename to plugins/org.eclipse.tm.terminal.connector.local/icons/eview16/terminal_view.gif diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/plugin.properties b/plugins/org.eclipse.tm.terminal.connector.local/plugin.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.local/plugin.properties rename to plugins/org.eclipse.tm.terminal.connector.local/plugin.properties diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/plugin.xml b/plugins/org.eclipse.tm.terminal.connector.local/plugin.xml similarity index 69% rename from plugins/org.eclipse.tm.terminal.view.ui.local/plugin.xml rename to plugins/org.eclipse.tm.terminal.connector.local/plugin.xml index 41b308b9c99..a72a8ad90e6 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.connector.local/plugin.xml @@ -4,19 +4,19 @@ - + @@ -26,8 +26,8 @@ @@ -45,8 +45,8 @@ + class="org.eclipse.tm.terminal.connector.local.showin.DynamicContributionItems" + id="org.eclipse.tm.terminal.connector.local.LocalLauncherDynamicContributionItems"> @@ -67,16 +67,16 @@ @@ -84,7 +84,7 @@ @@ -93,8 +93,8 @@ + class="org.eclipse.tm.terminal.connector.local.launcher.LocalLauncherHandler" + commandId="org.eclipse.tm.terminal.connector.local.command.launch"> @@ -102,8 +102,8 @@ @@ -111,13 +111,13 @@ + class="org.eclipse.tm.terminal.connector.local.showin.preferences.PreferencesInitializer"> - + diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/pom.xml b/plugins/org.eclipse.tm.terminal.connector.local/pom.xml similarity index 90% rename from plugins/org.eclipse.tm.terminal.view.ui.process/pom.xml rename to plugins/org.eclipse.tm.terminal.connector.local/pom.xml index 0cd2c346929..a706af15479 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.process/pom.xml +++ b/plugins/org.eclipse.tm.terminal.connector.local/pom.xml @@ -12,6 +12,6 @@ 4.0.0.qualifier - org.eclipse.tm.terminal.view.ui.process + org.eclipse.tm.terminal.connector.local eclipse-plugin diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/activator/UIPlugin.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java index 9d02abc7189..37dd7e100a5 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/activator/UIPlugin.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.activator; +package org.eclipse.tm.terminal.connector.local.activator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/controls/LocalWizardConfigurationPanel.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/LocalWizardConfigurationPanel.java similarity index 99% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/controls/LocalWizardConfigurationPanel.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/LocalWizardConfigurationPanel.java index 6270248694d..9a61019eded 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/controls/LocalWizardConfigurationPanel.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/LocalWizardConfigurationPanel.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.controls; +package org.eclipse.tm.terminal.connector.local.controls; import java.util.Map; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/help/IContextHelpIds.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/help/IContextHelpIds.java similarity index 88% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/help/IContextHelpIds.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/help/IContextHelpIds.java index 8f3c4b92431..f4f748f9e14 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/help/IContextHelpIds.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/help/IContextHelpIds.java @@ -7,9 +7,9 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.help; +package org.eclipse.tm.terminal.connector.local.help; -import org.eclipse.tm.terminal.view.ui.local.activator.UIPlugin; +import org.eclipse.tm.terminal.connector.local.activator.UIPlugin; /** diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherDelegate.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalLauncherDelegate.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherDelegate.java index 2220e60d4d0..676b257efec 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalLauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherDelegate.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.launcher; +package org.eclipse.tm.terminal.connector.local.launcher; import java.io.File; import java.net.InetAddress; @@ -35,6 +35,10 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension; +import org.eclipse.tm.terminal.connector.local.activator.UIPlugin; +import org.eclipse.tm.terminal.connector.local.controls.LocalWizardConfigurationPanel; +import org.eclipse.tm.terminal.connector.local.showin.interfaces.IPreferenceKeys; +import org.eclipse.tm.terminal.connector.process.ProcessSettings; import org.eclipse.tm.terminal.view.core.TerminalServiceFactory; import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; @@ -45,10 +49,6 @@ import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; -import org.eclipse.tm.terminal.view.ui.local.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.local.controls.LocalWizardConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IPreferenceKeys; -import org.eclipse.tm.terminal.view.ui.process.ProcessSettings; import org.eclipse.ui.ISelectionService; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.WorkbenchEncoding; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalLauncherHandler.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalLauncherHandler.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java index a0230185921..24ca4d41b94 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalLauncherHandler.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.launcher; +package org.eclipse.tm.terminal.connector.local.launcher; import java.util.HashMap; import java.util.Map; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalMementoHandler.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalMementoHandler.java similarity index 96% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalMementoHandler.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalMementoHandler.java index 819bd05e119..e25fecf61f5 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/launcher/LocalMementoHandler.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalMementoHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.launcher; +package org.eclipse.tm.terminal.connector.local.launcher; import java.util.Map; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/nls/Messages.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/nls/Messages.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/nls/Messages.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/nls/Messages.java index 2082b8ec5d5..e3f612825a3 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/nls/Messages.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/nls/Messages.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.nls; +package org.eclipse.tm.terminal.connector.local.nls; import org.eclipse.osgi.util.NLS; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/nls/Messages.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/nls/Messages.properties rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/nls/Messages.properties diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/DynamicContributionItems.java similarity index 97% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/DynamicContributionItems.java index 9679602c553..abef87a0454 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/DynamicContributionItems.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin; +package org.eclipse.tm.terminal.connector.local.showin; import java.util.ArrayList; import java.util.HashMap; @@ -22,10 +22,10 @@ import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.graphics.ImageData; +import org.eclipse.tm.terminal.connector.local.showin.interfaces.IExternalExecutablesProperties; import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; -import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IExternalExecutablesProperties; import org.eclipse.ui.ISelectionService; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.CompoundContributionItem; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/ExternalExecutablesDialog.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/ExternalExecutablesDialog.java index 75896f2968c..89f5e972245 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/ExternalExecutablesDialog.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin; +package org.eclipse.tm.terminal.connector.local.showin; import java.io.File; import java.util.HashMap; @@ -34,9 +34,9 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.tm.terminal.view.ui.local.help.IContextHelpIds; -import org.eclipse.tm.terminal.view.ui.local.nls.Messages; -import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IExternalExecutablesProperties; +import org.eclipse.tm.terminal.connector.local.help.IContextHelpIds; +import org.eclipse.tm.terminal.connector.local.nls.Messages; +import org.eclipse.tm.terminal.connector.local.showin.interfaces.IExternalExecutablesProperties; import org.eclipse.ui.PlatformUI; import org.osgi.framework.Bundle; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesInitializer.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/ExternalExecutablesInitializer.java similarity index 94% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesInitializer.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/ExternalExecutablesInitializer.java index 758f522398a..fd67cbf2b9f 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesInitializer.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/ExternalExecutablesInitializer.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin; +package org.eclipse.tm.terminal.connector.local.showin; import java.io.File; import java.util.ArrayList; @@ -17,7 +17,7 @@ import java.util.Map; import java.util.StringTokenizer; import org.eclipse.core.runtime.Platform; -import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IExternalExecutablesProperties; +import org.eclipse.tm.terminal.connector.local.showin.interfaces.IExternalExecutablesProperties; import org.eclipse.ui.IStartup; /** diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesManager.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/ExternalExecutablesManager.java similarity index 97% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesManager.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/ExternalExecutablesManager.java index 5df1edf7d7c..f9ee18b71f5 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesManager.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/ExternalExecutablesManager.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin; +package org.eclipse.tm.terminal.connector.local.showin; import java.io.File; import java.io.FileReader; @@ -26,7 +26,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Platform; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.ImageLoader; -import org.eclipse.tm.terminal.view.ui.local.activator.UIPlugin; +import org.eclipse.tm.terminal.connector.local.activator.UIPlugin; /** * External executables manager implementation. diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/interfaces/IExternalExecutablesProperties.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/interfaces/IExternalExecutablesProperties.java similarity index 95% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/interfaces/IExternalExecutablesProperties.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/interfaces/IExternalExecutablesProperties.java index 30c91514b4d..239ebf7b1bd 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/interfaces/IExternalExecutablesProperties.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/interfaces/IExternalExecutablesProperties.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin.interfaces; +package org.eclipse.tm.terminal.connector.local.showin.interfaces; /** * External executables data property names. diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/interfaces/IPreferenceKeys.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/interfaces/IPreferenceKeys.java similarity index 96% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/interfaces/IPreferenceKeys.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/interfaces/IPreferenceKeys.java index ba508ef04a6..790e044fb26 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/interfaces/IPreferenceKeys.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/interfaces/IPreferenceKeys.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin.interfaces; +package org.eclipse.tm.terminal.connector.local.showin.interfaces; /** * Terminals plug-in preference key definitions. diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/preferences/PreferencePage.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/preferences/PreferencePage.java similarity index 97% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/preferences/PreferencePage.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/preferences/PreferencePage.java index 0ec6d83c0bc..875206565ec 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/preferences/PreferencePage.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/preferences/PreferencePage.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin.preferences; +package org.eclipse.tm.terminal.connector.local.showin.preferences; import java.io.File; import java.net.URI; @@ -62,13 +62,13 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; +import org.eclipse.tm.terminal.connector.local.activator.UIPlugin; +import org.eclipse.tm.terminal.connector.local.nls.Messages; +import org.eclipse.tm.terminal.connector.local.showin.ExternalExecutablesDialog; +import org.eclipse.tm.terminal.connector.local.showin.ExternalExecutablesManager; +import org.eclipse.tm.terminal.connector.local.showin.interfaces.IExternalExecutablesProperties; +import org.eclipse.tm.terminal.connector.local.showin.interfaces.IPreferenceKeys; import org.eclipse.tm.terminal.view.ui.controls.NoteCompositeHelper; -import org.eclipse.tm.terminal.view.ui.local.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.local.nls.Messages; -import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesDialog; -import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesManager; -import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IExternalExecutablesProperties; -import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IPreferenceKeys; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.osgi.framework.Bundle; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/preferences/PreferencesInitializer.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/preferences/PreferencesInitializer.java similarity index 86% rename from plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/preferences/PreferencesInitializer.java rename to plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/preferences/PreferencesInitializer.java index 2922ee644b8..13871129d87 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/src/org/eclipse/tm/terminal/view/ui/local/showin/preferences/PreferencesInitializer.java +++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/preferences/PreferencesInitializer.java @@ -7,12 +7,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin.preferences; +package org.eclipse.tm.terminal.connector.local.showin.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; +import org.eclipse.tm.terminal.connector.local.activator.UIPlugin; +import org.eclipse.tm.terminal.connector.local.showin.interfaces.IPreferenceKeys; import org.eclipse.tm.terminal.view.core.preferences.ScopedEclipsePreferences; -import org.eclipse.tm.terminal.view.ui.local.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.local.showin.interfaces.IPreferenceKeys; /** * Terminals default preferences initializer. diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/.classpath b/plugins/org.eclipse.tm.terminal.connector.process/.classpath similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.local/.classpath rename to plugins/org.eclipse.tm.terminal.connector.process/.classpath diff --git a/plugins/org.eclipse.tm.terminal.telnet/.gitignore b/plugins/org.eclipse.tm.terminal.connector.process/.gitignore similarity index 100% rename from plugins/org.eclipse.tm.terminal.telnet/.gitignore rename to plugins/org.eclipse.tm.terminal.connector.process/.gitignore diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/.options b/plugins/org.eclipse.tm.terminal.connector.process/.options similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.process/.options rename to plugins/org.eclipse.tm.terminal.connector.process/.options diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/.project b/plugins/org.eclipse.tm.terminal.connector.process/.project similarity index 94% rename from plugins/org.eclipse.tm.terminal.view.ui.process/.project rename to plugins/org.eclipse.tm.terminal.connector.process/.project index 388cdcc2270..f609200e524 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.process/.project +++ b/plugins/org.eclipse.tm.terminal.connector.process/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.view.ui.process + org.eclipse.tm.terminal.connector.process diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.connector.process/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.process/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.connector.process/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.connector.process/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.process/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.connector.process/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.tm.terminal.connector.process/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.process/.settings/org.eclipse.pde.prefs rename to plugins/org.eclipse.tm.terminal.connector.process/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF similarity index 62% rename from plugins/org.eclipse.tm.terminal.view.ui.process/META-INF/MANIFEST.MF rename to plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF index 8f22aa287e4..1aad9d7017b 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.process/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui.process;singleton:=true +Bundle-SymbolicName: org.eclipse.tm.terminal.connector.process;singleton:=true Bundle-Version: 4.0.0.qualifier -Bundle-Activator: org.eclipse.tm.terminal.view.ui.process.activator.UIPlugin +Bundle-Activator: org.eclipse.tm.terminal.connector.process.activator.UIPlugin Bundle-Vendor: %providerName Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native, org.eclipse.cdt.utils.spawner;mandatory:=native @@ -13,12 +13,12 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6";resolution:=optional, org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0", - org.eclipse.tm.terminal;bundle-version="4.0.0", + org.eclipse.tm.terminal.control;bundle-version="4.0.0", org.eclipse.ui;bundle-version="3.8.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.tm.terminal.view.ui.process, - org.eclipse.tm.terminal.view.ui.process.activator;x-internal:=true, - org.eclipse.tm.terminal.view.ui.process.help, - org.eclipse.tm.terminal.view.ui.process.nls;x-internal:=true +Export-Package: org.eclipse.tm.terminal.connector.process, + org.eclipse.tm.terminal.connector.process.activator;x-internal:=true, + org.eclipse.tm.terminal.connector.process.help, + org.eclipse.tm.terminal.connector.process.nls;x-internal:=true diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/META-INF/p2.inf b/plugins/org.eclipse.tm.terminal.connector.process/META-INF/p2.inf similarity index 95% rename from plugins/org.eclipse.tm.terminal.view.ui.process/META-INF/p2.inf rename to plugins/org.eclipse.tm.terminal.connector.process/META-INF/p2.inf index 9bd5194fa74..a3282a7a665 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.process/META-INF/p2.inf +++ b/plugins/org.eclipse.tm.terminal.connector.process/META-INF/p2.inf @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014 Wind River Systems, Inc. and others. All rights reserved. +# Copyright (c) 2014, 2015 Wind River Systems, Inc. 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 @@ -10,7 +10,7 @@ # Most of the dependencies exposed here are actually covered in the feature.xml # This file ensures that the current bundle has all it needs, even if installed -# without the enclosing org.eclipse.tcf.te.terminals.feature . +# without the enclosing org.eclipse.tm.terminal.view.feature . # See also https://bugs.eclipse.org/bugs/show_bug.cgi?id=435150 . # 1. Make the optional cdt.core dependency non-greedy: Use (or update to proper diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/about.html b/plugins/org.eclipse.tm.terminal.connector.process/about.html similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.process/about.html rename to plugins/org.eclipse.tm.terminal.connector.process/about.html diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/build.properties b/plugins/org.eclipse.tm.terminal.connector.process/build.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.process/build.properties rename to plugins/org.eclipse.tm.terminal.connector.process/build.properties diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/plugin.properties b/plugins/org.eclipse.tm.terminal.connector.process/plugin.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.process/plugin.properties rename to plugins/org.eclipse.tm.terminal.connector.process/plugin.properties diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/plugin.xml b/plugins/org.eclipse.tm.terminal.connector.process/plugin.xml similarity index 56% rename from plugins/org.eclipse.tm.terminal.view.ui.process/plugin.xml rename to plugins/org.eclipse.tm.terminal.connector.process/plugin.xml index 58e91247124..411cc847c69 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.process/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.connector.process/plugin.xml @@ -3,20 +3,20 @@ - + diff --git a/plugins/org.eclipse.tm.terminal.connector.process/pom.xml b/plugins/org.eclipse.tm.terminal.connector.process/pom.xml new file mode 100644 index 00000000000..02df2e1e872 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.connector.process/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + + org.eclipse.tm.terminal + org.eclipse.tm.terminal.maven-build + 4.0.0-SNAPSHOT + ../../admin/pom-build.xml + + + 4.0.0.qualifier + org.eclipse.tm.terminal.connector.process + eclipse-plugin + diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessConnector.java b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessConnector.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessConnector.java rename to plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessConnector.java index 26e3675eeef..641e9bd6d2c 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessConnector.java +++ b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessConnector.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.process; +package org.eclipse.tm.terminal.connector.process; import java.io.File; import java.io.IOException; @@ -29,10 +29,10 @@ 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.TerminalState; +import org.eclipse.tm.terminal.connector.process.nls.Messages; import org.eclipse.tm.terminal.view.core.interfaces.constants.ILineSeparatorConstants; import org.eclipse.tm.terminal.view.core.utils.Env; import org.eclipse.tm.terminal.view.ui.manager.ConsoleManager; -import org.eclipse.tm.terminal.view.ui.process.nls.Messages; import org.eclipse.tm.terminal.view.ui.streams.AbstractStreamsConnector; /** diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessLauncherDelegate.java similarity index 99% rename from plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessLauncherDelegate.java rename to plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessLauncherDelegate.java index 60726066f8d..287deb49d03 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessLauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessLauncherDelegate.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.process; +package org.eclipse.tm.terminal.connector.process; import java.util.Map; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessMonitor.java b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessMonitor.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessMonitor.java rename to plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessMonitor.java index c94ff6b7eeb..98ae8d0cc1c 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessMonitor.java +++ b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessMonitor.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.process; +package org.eclipse.tm.terminal.connector.process; import org.eclipse.core.runtime.Assert; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessSettings.java b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettings.java similarity index 99% rename from plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessSettings.java rename to plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettings.java index 20b0593c332..6fe4a6aaace 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessSettings.java +++ b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettings.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.process; +package org.eclipse.tm.terminal.connector.process; import org.eclipse.cdt.utils.pty.PTY; import org.eclipse.core.runtime.Assert; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessSettingsPage.java b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettingsPage.java similarity index 99% rename from plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessSettingsPage.java rename to plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettingsPage.java index 2465b2d9bf4..d615370b5cc 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/ProcessSettingsPage.java +++ b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettingsPage.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.process; +package org.eclipse.tm.terminal.connector.process; import org.eclipse.cdt.utils.pty.PTY; import org.eclipse.core.runtime.Assert; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/activator/UIPlugin.java rename to plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java index 9bd8acf5346..03ac3ebdb64 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/activator/UIPlugin.java +++ b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.process.activator; +package org.eclipse.tm.terminal.connector.process.activator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/help/IContextHelpIds.java b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/help/IContextHelpIds.java similarity index 88% rename from plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/help/IContextHelpIds.java rename to plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/help/IContextHelpIds.java index 9514c022044..1b0deb428c0 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/help/IContextHelpIds.java +++ b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/help/IContextHelpIds.java @@ -7,9 +7,9 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.process.help; +package org.eclipse.tm.terminal.connector.process.help; -import org.eclipse.tm.terminal.view.ui.process.activator.UIPlugin; +import org.eclipse.tm.terminal.connector.process.activator.UIPlugin; /** diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/nls/Messages.java b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.java similarity index 95% rename from plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/nls/Messages.java rename to plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.java index 1b9b2702a65..8249cf380cc 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/nls/Messages.java +++ b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.process.nls; +package org.eclipse.tm.terminal.connector.process.nls; import org.eclipse.osgi.util.NLS; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.process/src/org/eclipse/tm/terminal/view/ui/process/nls/Messages.properties rename to plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.properties diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/.classpath b/plugins/org.eclipse.tm.terminal.connector.serial/.classpath similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.process/.classpath rename to plugins/org.eclipse.tm.terminal.connector.serial/.classpath diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/.gitignore b/plugins/org.eclipse.tm.terminal.connector.serial/.gitignore similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.local/.gitignore rename to plugins/org.eclipse.tm.terminal.connector.serial/.gitignore diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/.options b/plugins/org.eclipse.tm.terminal.connector.serial/.options similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/.options rename to plugins/org.eclipse.tm.terminal.connector.serial/.options diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/.project b/plugins/org.eclipse.tm.terminal.connector.serial/.project similarity index 91% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/.project rename to plugins/org.eclipse.tm.terminal.connector.serial/.project index 2d7948ad029..c64fbf0aa95 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/.project +++ b/plugins/org.eclipse.tm.terminal.connector.serial/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.view.ui.serial + org.eclipse.tm.terminal.connector.serial diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.connector.serial/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.connector.serial/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.connector.serial/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.connector.serial/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.tm.terminal.connector.serial/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/.settings/org.eclipse.pde.prefs rename to plugins/org.eclipse.tm.terminal.connector.serial/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connector.serial/META-INF/MANIFEST.MF similarity index 51% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/META-INF/MANIFEST.MF rename to plugins/org.eclipse.tm.terminal.connector.serial/META-INF/MANIFEST.MF index 59b00cfa6e3..d69bd7f0565 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.connector.serial/META-INF/MANIFEST.MF @@ -1,24 +1,24 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui.serial;singleton:=true +Bundle-SymbolicName: org.eclipse.tm.terminal.connector.serial;singleton:=true Bundle-Version: 4.0.0.qualifier -Bundle-Activator: org.eclipse.tm.terminal.view.ui.serial.activator.UIPlugin +Bundle-Activator: org.eclipse.tm.terminal.connector.serial.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.equinox.security;bundle-version="1.1.100", org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0", - org.eclipse.tm.terminal;bundle-version="4.0.0", + org.eclipse.tm.terminal.control;bundle-version="4.0.0", org.eclipse.ui;bundle-version="3.8.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.tm.terminal.view.ui.serial.activator;x-internal:=true, - org.eclipse.tm.terminal.view.ui.serial.connector, - org.eclipse.tm.terminal.view.ui.serial.controls, - org.eclipse.tm.terminal.view.ui.serial.interfaces, - org.eclipse.tm.terminal.view.ui.serial.launcher, - org.eclipse.tm.terminal.view.ui.serial.nls;x-internal:=true +Export-Package: org.eclipse.tm.terminal.connector.serial.activator;x-internal:=true, + org.eclipse.tm.terminal.connector.serial.connector, + org.eclipse.tm.terminal.connector.serial.controls, + org.eclipse.tm.terminal.connector.serial.interfaces, + org.eclipse.tm.terminal.connector.serial.launcher, + org.eclipse.tm.terminal.connector.serial.nls;x-internal:=true Import-Package: gnu.io;resolution:=optional diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/about.html b/plugins/org.eclipse.tm.terminal.connector.serial/about.html similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/about.html rename to plugins/org.eclipse.tm.terminal.connector.serial/about.html diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/build.properties b/plugins/org.eclipse.tm.terminal.connector.serial/build.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/build.properties rename to plugins/org.eclipse.tm.terminal.connector.serial/build.properties diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.properties b/plugins/org.eclipse.tm.terminal.connector.serial/plugin.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.properties rename to plugins/org.eclipse.tm.terminal.connector.serial/plugin.properties diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.xml b/plugins/org.eclipse.tm.terminal.connector.serial/plugin.xml similarity index 69% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.xml rename to plugins/org.eclipse.tm.terminal.connector.serial/plugin.xml index 90f70da6a40..b61259bb8be 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.connector.serial/plugin.xml @@ -3,18 +3,18 @@ - + + id="org.eclipse.tm.terminal.connector.serial.SerialConnector" + class="org.eclipse.tm.terminal.connector.serial.connector.SerialConnector"/> diff --git a/plugins/org.eclipse.tm.terminal.ssh/pom.xml b/plugins/org.eclipse.tm.terminal.connector.serial/pom.xml similarity index 89% rename from plugins/org.eclipse.tm.terminal.ssh/pom.xml rename to plugins/org.eclipse.tm.terminal.connector.serial/pom.xml index b30c8877d25..e12f8d31ff2 100644 --- a/plugins/org.eclipse.tm.terminal.ssh/pom.xml +++ b/plugins/org.eclipse.tm.terminal.connector.serial/pom.xml @@ -12,6 +12,6 @@ 4.0.0.qualifier - org.eclipse.tm.terminal.ssh + org.eclipse.tm.terminal.connector.serial eclipse-plugin diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/activator/UIPlugin.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/activator/UIPlugin.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/activator/UIPlugin.java index 6fe86258e9e..f38a5a244e5 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/activator/UIPlugin.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/activator/UIPlugin.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.activator; +package org.eclipse.tm.terminal.connector.serial.activator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/ISerialSettings.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/ISerialSettings.java similarity index 94% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/ISerialSettings.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/ISerialSettings.java index 01430ecb6b7..598678551d9 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/ISerialSettings.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/ISerialSettings.java @@ -9,7 +9,7 @@ * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.connector; +package org.eclipse.tm.terminal.connector.serial.connector; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialConnectWorker.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialConnectWorker.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialConnectWorker.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialConnectWorker.java index 8db73c78de3..d6671351f7a 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialConnectWorker.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialConnectWorker.java @@ -19,7 +19,7 @@ * Martin Oberhuber (Wind River) - [221184] Redesign Serial Terminal Ownership Handling * Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.connector; +package org.eclipse.tm.terminal.connector.serial.connector; import gnu.io.CommPortIdentifier; import gnu.io.NoSuchPortException; @@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.MessageBox; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.Logger; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.terminal.view.ui.serial.nls.Messages; +import org.eclipse.tm.terminal.connector.serial.nls.Messages; @SuppressWarnings("restriction") public class SerialConnectWorker extends Thread { diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialConnector.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialConnector.java similarity index 97% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialConnector.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialConnector.java index de65beb6551..068c34e080b 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialConnector.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialConnector.java @@ -17,7 +17,7 @@ * Martin Oberhuber (Wind River) - [208029] COM port not released after quick disconnect/reconnect * Martin Oberhuber (Wind River) - [225853][api] Provide more default functionality in TerminalConnectorImpl *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.connector; +package org.eclipse.tm.terminal.connector.serial.connector; import gnu.io.CommPortIdentifier; import gnu.io.SerialPort; @@ -35,8 +35,8 @@ import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.Logger; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; -import org.eclipse.tm.terminal.view.ui.serial.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.serial.nls.Messages; +import org.eclipse.tm.terminal.connector.serial.activator.UIPlugin; +import org.eclipse.tm.terminal.connector.serial.nls.Messages; @SuppressWarnings("restriction") public class SerialConnector extends TerminalConnectorImpl { diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialPortHandler.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialPortHandler.java similarity index 96% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialPortHandler.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialPortHandler.java index 23539d6217e..aac82d1638e 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialPortHandler.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialPortHandler.java @@ -16,7 +16,7 @@ * Martin Oberhuber (Wind River) - [168197] Replace JFace MessagDialog by SWT MessageBox * Martin Oberhuber (Wind River) - [221184] Redesign Serial Terminal Ownership Handling *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.connector; +package org.eclipse.tm.terminal.connector.serial.connector; import gnu.io.CommPortOwnershipListener; import gnu.io.SerialPortEvent; @@ -28,7 +28,7 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Display; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.terminal.view.ui.serial.nls.Messages; +import org.eclipse.tm.terminal.connector.serial.nls.Messages; /** * UNDER CONSTRUCTION diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialProperties.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialProperties.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialProperties.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialProperties.java index 7d4b89b90b6..4519c99531b 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialProperties.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialProperties.java @@ -14,7 +14,7 @@ * Michael Scharf (Wind River) - extracted from TerminalProperties * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.connector; +package org.eclipse.tm.terminal.connector.serial.connector; import gnu.io.CommPortIdentifier; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialSettings.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialSettings.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialSettings.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialSettings.java index a51881704b3..7044eff00d0 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialSettings.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialSettings.java @@ -14,7 +14,7 @@ * Michael Scharf (Wind River) - extracted from TerminalSettings * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.connector; +package org.eclipse.tm.terminal.connector.serial.connector; import gnu.io.SerialPort; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialSettingsPage.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialSettingsPage.java similarity index 96% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialSettingsPage.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialSettingsPage.java index d0e865d04fd..84bb36a657b 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/connector/SerialSettingsPage.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/connector/SerialSettingsPage.java @@ -15,7 +15,7 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Martin Oberhuber (Wind River) - [206917] Add validation for Terminal Settings *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.connector; +package org.eclipse.tm.terminal.connector.serial.connector; import org.eclipse.swt.widgets.Composite; import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialConfigurationPanel.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/controls/SerialConfigurationPanel.java similarity index 96% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialConfigurationPanel.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/controls/SerialConfigurationPanel.java index 27419b7fb56..b1f6b6647e8 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialConfigurationPanel.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/controls/SerialConfigurationPanel.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.controls; +package org.eclipse.tm.terminal.connector.serial.controls; import java.util.Map; @@ -65,7 +65,7 @@ public class SerialConfigurationPanel extends AbstractExtendedConfigurationPanel @Override public void extractData(Map data) { // set the terminal connector id for serial - data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.terminal.connectors.serial"); //$NON-NLS-1$ + data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.terminal.connector.serial.SerialConnector"); //$NON-NLS-1$ serialSettingsPage.extractData(data); data.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding()); diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialLinePanel.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/controls/SerialLinePanel.java similarity index 99% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialLinePanel.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/controls/SerialLinePanel.java index d71df6c6e7f..fe760cbf05b 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialLinePanel.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/controls/SerialLinePanel.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.controls; +package org.eclipse.tm.terminal.connector.serial.controls; import gnu.io.CommPortIdentifier; @@ -38,12 +38,12 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.tm.terminal.connector.serial.activator.UIPlugin; +import org.eclipse.tm.terminal.connector.serial.interfaces.ITraceIds; +import org.eclipse.tm.terminal.connector.serial.nls.Messages; import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; import org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.serial.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.serial.interfaces.ITraceIds; -import org.eclipse.tm.terminal.view.ui.serial.nls.Messages; import org.eclipse.ui.PlatformUI; /** diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialPortAddressDialog.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/controls/SerialPortAddressDialog.java similarity index 99% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialPortAddressDialog.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/controls/SerialPortAddressDialog.java index c067e531e43..52ff59085f2 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/controls/SerialPortAddressDialog.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/controls/SerialPortAddressDialog.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.controls; +package org.eclipse.tm.terminal.connector.serial.controls; import java.util.List; import java.util.regex.Matcher; @@ -33,8 +33,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.terminal.view.ui.serial.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.serial.nls.Messages; +import org.eclipse.tm.terminal.connector.serial.activator.UIPlugin; +import org.eclipse.tm.terminal.connector.serial.nls.Messages; import org.eclipse.ui.PlatformUI; /** diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/interfaces/ITraceIds.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/interfaces/ITraceIds.java similarity index 92% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/interfaces/ITraceIds.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/interfaces/ITraceIds.java index 74efd38ce79..acfd6da2a50 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/interfaces/ITraceIds.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/interfaces/ITraceIds.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.interfaces; +package org.eclipse.tm.terminal.connector.serial.interfaces; /** * Trace slot identifiers. diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/interfaces/IWireTypeSerial.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/interfaces/IWireTypeSerial.java similarity index 95% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/interfaces/IWireTypeSerial.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/interfaces/IWireTypeSerial.java index 5c60c77e265..c8d0485d000 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/interfaces/IWireTypeSerial.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/interfaces/IWireTypeSerial.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.interfaces; +package org.eclipse.tm.terminal.connector.serial.interfaces; /** * The properties specific to the wire type "serial". diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/launcher/SerialLauncherDelegate.java similarity index 94% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialLauncherDelegate.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/launcher/SerialLauncherDelegate.java index 8e22c713e1a..74cc12dd0d1 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialLauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/launcher/SerialLauncherDelegate.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.launcher; +package org.eclipse.tm.terminal.connector.serial.launcher; import java.text.DateFormat; import java.util.Date; @@ -18,6 +18,9 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension; +import org.eclipse.tm.terminal.connector.serial.connector.SerialSettings; +import org.eclipse.tm.terminal.connector.serial.controls.SerialConfigurationPanel; +import org.eclipse.tm.terminal.connector.serial.nls.Messages; import org.eclipse.tm.terminal.view.core.TerminalServiceFactory; import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; @@ -26,9 +29,6 @@ import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; -import org.eclipse.tm.terminal.view.ui.serial.connector.SerialSettings; -import org.eclipse.tm.terminal.view.ui.serial.controls.SerialConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.serial.nls.Messages; /** * Serial launcher delegate implementation. @@ -113,7 +113,7 @@ public class SerialLauncherDelegate extends AbstractLauncherDelegate { // Check for the terminal connector id String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); - if (connectorId == null) connectorId = "org.eclipse.tm.terminal.connectors.serial"; //$NON-NLS-1$ + if (connectorId == null) connectorId = "org.eclipse.tm.terminal.connector.serial.SerialConnector"; //$NON-NLS-1$ String port = (String)properties.get(ITerminalsConnectorConstants.PROP_SERIAL_DEVICE); String baud = (String)properties.get(ITerminalsConnectorConstants.PROP_SERIAL_BAUD_RATE); diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialMementoHandler.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/launcher/SerialMementoHandler.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialMementoHandler.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/launcher/SerialMementoHandler.java index 747611311dd..5af0ef86f45 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/launcher/SerialMementoHandler.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/launcher/SerialMementoHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.launcher; +package org.eclipse.tm.terminal.connector.serial.launcher; import java.util.Map; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/nls/Messages.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.java rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/nls/Messages.java index 7891d1cf2ac..e1dbac41e31 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.java +++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/nls/Messages.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.serial.nls; +package org.eclipse.tm.terminal.connector.serial.nls; import org.eclipse.osgi.util.NLS; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/nls/Messages.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/src/org/eclipse/tm/terminal/view/ui/serial/nls/Messages.properties rename to plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/nls/Messages.properties diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/.classpath b/plugins/org.eclipse.tm.terminal.connector.ssh/.classpath similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/.classpath rename to plugins/org.eclipse.tm.terminal.connector.ssh/.classpath diff --git a/plugins/org.eclipse.tm.terminal.view.ui.process/.gitignore b/plugins/org.eclipse.tm.terminal.connector.ssh/.gitignore similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.process/.gitignore rename to plugins/org.eclipse.tm.terminal.connector.ssh/.gitignore diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/.options b/plugins/org.eclipse.tm.terminal.connector.ssh/.options similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/.options rename to plugins/org.eclipse.tm.terminal.connector.ssh/.options diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/.project b/plugins/org.eclipse.tm.terminal.connector.ssh/.project similarity index 94% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/.project rename to plugins/org.eclipse.tm.terminal.connector.ssh/.project index 569a6aff988..55858db534c 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.ssh/.project +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.view.ui.ssh + org.eclipse.tm.terminal.connector.ssh diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.connector.ssh/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.connector.ssh/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.connector.ssh/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.connector.ssh/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.tm.terminal.connector.ssh/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/.settings/org.eclipse.pde.prefs rename to plugins/org.eclipse.tm.terminal.connector.ssh/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..8f65748a019 --- /dev/null +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF @@ -0,0 +1,24 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.tm.terminal.connector.ssh;singleton:=true +Bundle-Version: 4.0.0.qualifier +Bundle-Activator: org.eclipse.tm.terminal.connector.ssh.activator.UIPlugin +Bundle-Vendor: %providerName +Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", + org.eclipse.core.runtime;bundle-version="3.8.0", + org.eclipse.equinox.security;bundle-version="1.1.100", + org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", + org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0", + org.eclipse.tm.terminal.control;bundle-version="4.0.0", + org.eclipse.ui;bundle-version="3.8.0", + com.jcraft.jsch;bundle-version="[0.1.31,1.0.0)", + org.eclipse.jsch.core;bundle-version="[1.0.0,2.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy +Bundle-Localization: plugin +Export-Package: org.eclipse.tm.terminal.connector.ssh.activator;x-internal:=true, + org.eclipse.tm.terminal.connector.ssh.connector, + org.eclipse.tm.terminal.connector.ssh.controls, + org.eclipse.tm.terminal.connector.ssh.launcher, + org.eclipse.tm.terminal.connector.ssh.nls;x-internal:=true diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/about.html b/plugins/org.eclipse.tm.terminal.connector.ssh/about.html similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/about.html rename to plugins/org.eclipse.tm.terminal.connector.ssh/about.html diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/build.properties b/plugins/org.eclipse.tm.terminal.connector.ssh/build.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/build.properties rename to plugins/org.eclipse.tm.terminal.connector.ssh/build.properties diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/plugin.properties b/plugins/org.eclipse.tm.terminal.connector.ssh/plugin.properties similarity index 89% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/plugin.properties rename to plugins/org.eclipse.tm.terminal.connector.ssh/plugin.properties index 60c9aebeb40..ce0b1ebb7b0 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.ssh/plugin.properties +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/plugin.properties @@ -11,9 +11,9 @@ pluginName = Terminals SSH Extensions providerName = Eclipse.org - Target Explorer -# ----- Terminal Connector Types ----- +# ----- Terminal Connector ----- -SshConnectorType.label=SSH Connector Type +SshConnector.label=SSH # ----- Terminal Launcher Delegates ----- diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/plugin.xml b/plugins/org.eclipse.tm.terminal.connector.ssh/plugin.xml similarity index 61% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/plugin.xml rename to plugins/org.eclipse.tm.terminal.connector.ssh/plugin.xml index 9ace7597f0f..b4a1cd66977 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.ssh/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/plugin.xml @@ -2,11 +2,19 @@ + + + + + diff --git a/plugins/org.eclipse.tm.terminal.view.ui.local/pom.xml b/plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml similarity index 90% rename from plugins/org.eclipse.tm.terminal.view.ui.local/pom.xml rename to plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml index 7f7dc4fa7fc..a7444a926ce 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.local/pom.xml +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml @@ -12,6 +12,6 @@ 4.0.0.qualifier - org.eclipse.tm.terminal.view.ui.local + org.eclipse.tm.terminal.connector.ssh eclipse-plugin diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/activator/UIPlugin.java similarity index 71% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/activator/UIPlugin.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/activator/UIPlugin.java index c43b2634015..f5030c35888 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/activator/UIPlugin.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/activator/UIPlugin.java @@ -7,14 +7,17 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.ssh.activator; +package org.eclipse.tm.terminal.connector.ssh.activator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; +import org.eclipse.jsch.core.IJSchService; import org.eclipse.swt.graphics.Image; +import org.eclipse.tm.terminal.connector.ssh.connector.SshConnection; import org.eclipse.tm.terminal.view.core.tracing.TraceHandler; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; +import org.osgi.util.tracker.ServiceTracker; /** * The activator class controls the plug-in life cycle @@ -25,6 +28,9 @@ public class UIPlugin extends AbstractUIPlugin { // The trace handler instance private static volatile TraceHandler traceHandler; + // ServiceTracker for IJschService + private ServiceTracker tracker; + /** * The constructor */ @@ -62,13 +68,21 @@ public class UIPlugin extends AbstractUIPlugin { return traceHandler; } + //--------------------------------------------------------------------------- + // + //--------------------------------------------------------------------------- + /* (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ - @Override + @SuppressWarnings("unchecked") + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; + + tracker = new ServiceTracker(getBundle().getBundleContext(), IJSchService.class.getName(), null); + tracker.open(); } /* (non-Javadoc) @@ -76,10 +90,28 @@ public class UIPlugin extends AbstractUIPlugin { */ @Override public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); + try { + SshConnection.shutdown(); + tracker.close(); + } finally { + plugin = null; + super.stop(context); + } } + /** + * Returns an instance of IJSchService from the OSGi Registry. + * @return An instance of IJSchService, or null if no + * IJschService service is available. + */ + public IJSchService getJSchService() { + return (IJSchService)tracker.getService(); + } + + //--------------------------------------------------------------------------- + // + //--------------------------------------------------------------------------- + /* (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry) */ diff --git a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshConstants.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshConstants.java similarity index 95% rename from plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshConstants.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshConstants.java index 9ceb3314f6b..0b79c8f239d 100644 --- a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshConstants.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshConstants.java @@ -10,7 +10,7 @@ * Martin Oberhuber (Wind River) - extracted from various team.cvs plugins * Martin Oberhuber (Wind River) - [175686] Adapted to new IJSchService API *******************************************************************************/ -package org.eclipse.tm.internal.terminal.ssh; +package org.eclipse.tm.terminal.connector.ssh.connector; /** diff --git a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshSettings.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshSettings.java similarity index 97% rename from plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshSettings.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshSettings.java index 28284ec2a19..b4bad8313d8 100644 --- a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshSettings.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshSettings.java @@ -10,7 +10,7 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Johnson Ma (Wind River) - [218880] Add UI setting for ssh keepalives *******************************************************************************/ -package org.eclipse.tm.internal.terminal.ssh; +package org.eclipse.tm.terminal.connector.ssh.connector; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; diff --git a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/KeyboardInteractiveDialog.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/KeyboardInteractiveDialog.java similarity index 64% rename from plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/KeyboardInteractiveDialog.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/KeyboardInteractiveDialog.java index 760ef83afc3..faba423eeab 100644 --- a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/KeyboardInteractiveDialog.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/KeyboardInteractiveDialog.java @@ -10,7 +10,7 @@ * IBM Corporation - ongoing maintenance * Martin Oberhuber (Wind River) - copied and adapted from team.cvs.ui *******************************************************************************/ -package org.eclipse.tm.internal.terminal.ssh; +package org.eclipse.tm.terminal.connector.ssh.connector; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; @@ -69,37 +69,40 @@ public class KeyboardInteractiveDialog extends TrayDialog { this.instruction=instruction; this.prompt=prompt; this.echo=echo; - this.message=NLS.bind(SshMessages.KeyboardInteractiveDialog_message, new String[] { destination+(name!=null && name.length()>0 ? ": "+name : "") }); //NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-2$ + this.message=NLS.bind(SshMessages.KeyboardInteractiveDialog_message, new String[] { destination+(name!=null && name.length()>0 ? ": "+name : "") }); //NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-2$ } /** * @see Window#configureShell */ - protected void configureShell(Shell newShell) { + @Override +protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(message); } - /** - * @see Window#create + /** + * @see Window#create */ - public void create() { + @Override +public void create() { super.create(); if(texts.length>0){ texts[0].setFocus(); } } - /** - * @see Dialog#createDialogArea + /** + * @see Dialog#createDialogArea */ - protected Control createDialogArea(Composite parent) { + @Override +protected Control createDialogArea(Composite parent) { Composite main=new Composite(parent, SWT.NONE); GridLayout layout=new GridLayout(); layout.numColumns=3; main.setLayout(layout); main.setLayoutData(new GridData(GridData.FILL_BOTH)); - + // set F1 help PlatformUI.getWorkbench().getHelpSystem().setHelp(main, ISshConstants.HELP_KEYBOARD_INTERACTIVE_DIALOG); - + if (message!=null) { Label messageLabel=new Label(main, SWT.WRAP); messageLabel.setText(message); @@ -109,7 +112,7 @@ public class KeyboardInteractiveDialog extends TrayDialog { } if(domain!=null){ Label label = new Label(main, SWT.WRAP); - label.setText(NLS.bind(SshMessages.KeyboardInteractiveDialog_labelConnection, new String[] { domain })); + label.setText(NLS.bind(SshMessages.KeyboardInteractiveDialog_labelConnection, new String[] { domain })); GridData data=new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan=3; label.setLayoutData(data); @@ -124,10 +127,10 @@ public class KeyboardInteractiveDialog extends TrayDialog { createPasswordFields(main); return main; } - /** - * Creates the widgets that represent the entry area. - * - * @param parent the parent of the widgets + /** + * Creates the widgets that represent the entry area. + * + * @param parent the parent of the widgets */ protected void createPasswordFields(Composite parent) { texts=new Text[prompt.length]; @@ -146,39 +149,41 @@ public class KeyboardInteractiveDialog extends TrayDialog { } } - /** - * Returns the entered values, or null - * if the user cancelled. - * + /** + * Returns the entered values, or null + * if the user cancelled. + * * @return the entered values */ public String[] getResult() { return result; } - /** - * Notifies that the ok button of this dialog has been pressed. - *

- * The default implementation of this framework method sets - * this dialog's return code to Window.OK - * and closes the dialog. Subclasses may override. - *

+ /** + * Notifies that the ok button of this dialog has been pressed. + *

+ * The default implementation of this framework method sets + * this dialog's return code to Window.OK + * and closes the dialog. Subclasses may override. + *

*/ - protected void okPressed() { + @Override +protected void okPressed() { result=new String[prompt.length]; for(int i=0; i - * The default implementation of this framework method sets - * this dialog's return code to Window.CANCEL - * and closes the dialog. Subclasses may override. - *

+ /** + * Notifies that the cancel button of this dialog has been pressed. + *

+ * The default implementation of this framework method sets + * this dialog's return code to Window.CANCEL + * and closes the dialog. Subclasses may override. + *

*/ - protected void cancelPressed() { + @Override +protected void cancelPressed() { result=null; super.cancelPressed(); } diff --git a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnection.java similarity index 92% rename from plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnection.java index 8bf6f2879d7..d8620eeb309 100644 --- a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnection.java @@ -22,7 +22,7 @@ * Andrei Sobolev (Xored) - [250456] Ssh banner message causes IllegalArgumentException popup * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.internal.terminal.ssh; +package org.eclipse.tm.terminal.connector.ssh.connector; import java.io.IOException; import java.io.InputStream; @@ -40,6 +40,7 @@ import org.eclipse.swt.widgets.MessageBox; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.Logger; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.tm.terminal.connector.ssh.activator.UIPlugin; import com.jcraft.jsch.ChannelShell; import com.jcraft.jsch.JSchException; @@ -47,7 +48,7 @@ import com.jcraft.jsch.Session; import com.jcraft.jsch.UIKeyboardInteractive; import com.jcraft.jsch.UserInfo; -class SshConnection extends Thread { +public class SshConnection extends Thread { private static int fgNo; private final ITerminalControl fControl; private final SshConnector fConn; @@ -72,7 +73,7 @@ class SshConnection extends Thread { * host key checking or in order to add specific ciphers). */ protected Session createSession(String username, String password, String hostname, int port, UserInfo wrapperUI, IProgressMonitor monitor) throws JSchException { - IJSchService service = Activator.getDefault().getJSchService(); + IJSchService service = UIPlugin.getDefault().getJSchService(); if (service == null) return null; Session session = service.createSession(hostname, port, username); @@ -85,7 +86,7 @@ class SshConnection extends Thread { return session; } - static void shutdown() { + public static void shutdown() { //TODO: Store all Jsch sessions in a pool and disconnect them on shutdown } @@ -93,7 +94,8 @@ class SshConnection extends Thread { // //---------------------------------------------------------------------- - public void run() { + @Override + public void run() { boolean connectSucceeded = false; String host = ""; //$NON-NLS-1$ int port = 22; @@ -247,14 +249,17 @@ class SshConnection extends Thread { fUser = user; fPassword = password; } - public String getPassword() { + @Override + public String getPassword() { return fPassword; } - public boolean promptYesNo(final String str) { + @Override + public boolean promptYesNo(final String str) { //need to switch to UI thread for prompting final boolean[] retval = new boolean[1]; Display.getDefault().syncExec(new Runnable() { - public void run() { + @Override + public void run() { // [168197] Replace JFace MessagDialog by SWT MessageBox //retval[0] = MessageDialog.openQuestion(null, SshMessages.WARNING, str); if (isSessionConnected()) { @@ -272,7 +277,8 @@ class SshConnection extends Thread { private String promptSecret(final String message) { final String[] retval = new String[1]; getStandardDisplay().syncExec(new Runnable() { - public void run() { + @Override + public void run() { if (isSessionConnected()) { UserValidationDialog uvd = new UserValidationDialog(null, fConnectionId, fUser, message); uvd.setUsernameMutable(false); @@ -288,14 +294,17 @@ class SshConnection extends Thread { }); return retval[0]; } - public String getPassphrase() { + @Override + public String getPassphrase() { return fPassphrase; } - public boolean promptPassphrase(String message) { + @Override + public boolean promptPassphrase(String message) { fPassphrase = promptSecret(message); return (fPassphrase!=null); } - public boolean promptPassword(final String message) { + @Override + public boolean promptPassword(final String message) { String _password = promptSecret(message); if (_password!=null) { fPassword=_password; @@ -303,9 +312,11 @@ class SshConnection extends Thread { } return false; } - public void showMessage(final String message) { + @Override + public void showMessage(final String message) { Display.getDefault().syncExec(new Runnable() { - public void run() { + @Override + public void run() { // [168197] Replace JFace MessagDialog by SWT MessageBox // MessageDialog.openInformation(null, SshMessages.INFO, message); if (isSessionConnected()) { @@ -317,7 +328,8 @@ class SshConnection extends Thread { } }); } - public String[] promptKeyboardInteractive(final String destination, + @Override + public String[] promptKeyboardInteractive(final String destination, final String name, final String instruction, final String[] prompt, final boolean[] echo) { @@ -333,7 +345,8 @@ class SshConnection extends Thread { } final String[][] finResult = new String[1][]; getStandardDisplay().syncExec(new Runnable() { - public void run() { + @Override + public void run() { if (isSessionConnected()) { KeyboardInteractiveDialog dialog = new KeyboardInteractiveDialog(null, fConnectionId, destination, name, instruction, prompt, echo); dialog.open(); diff --git a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnector.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnector.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnector.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnector.java index eefbba23de5..f8c5b2454eb 100644 --- a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnector.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnector.java @@ -11,7 +11,7 @@ * Martin Oberhuber (Wind River) - [225792] Rename SshConnector.getTelnetSettings() to getSshSettings() * Martin Oberhuber (Wind River) - [225853][api] Provide more default functionality in TerminalConnectorImpl *******************************************************************************/ -package org.eclipse.tm.internal.terminal.ssh; +package org.eclipse.tm.terminal.connector.ssh.connector; import java.io.InputStream; import java.io.OutputStream; diff --git a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshMessages.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshMessages.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshMessages.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshMessages.java index 73a0092dff9..bc0ab805818 100644 --- a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshMessages.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshMessages.java @@ -11,7 +11,7 @@ * Johnson Ma (Wind River) - [218880] Add UI setting for ssh keepalives * Martin Oberhuber (Wind River) - [206919] Improve SSH Terminal Error Reporting (Adopting code from org.eclipse.team.cvs.core) *******************************************************************************/ -package org.eclipse.tm.internal.terminal.ssh; +package org.eclipse.tm.terminal.connector.ssh.connector; import java.lang.reflect.Field; diff --git a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshMessages.properties b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshMessages.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshMessages.properties rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshMessages.properties diff --git a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettings.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettings.java index 9f7d40fee30..a8b66ea6ed9 100644 --- a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettings.java @@ -12,7 +12,7 @@ * Johnson Ma (Wind River) - [218880] Add UI setting for ssh keepalives * Bryan Hunt - [313991] cannot programatically pass password to SshConnector *******************************************************************************/ -package org.eclipse.tm.internal.terminal.ssh; +package org.eclipse.tm.terminal.connector.ssh.connector; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; diff --git a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettingsPage.java similarity index 94% rename from plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettingsPage.java index 625e96e271f..511216b6c56 100644 --- a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettingsPage.java @@ -11,7 +11,7 @@ * Johnson Ma (Wind River) - [218880] Add UI setting for ssh keepalives * Martin Oberhuber (Wind River) - [206917] Add validation for Terminal Settings *******************************************************************************/ -package org.eclipse.tm.internal.terminal.ssh; +package org.eclipse.tm.terminal.connector.ssh.connector; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.fieldassist.FieldDecorationRegistry; @@ -37,7 +37,8 @@ public class SshSettingsPage extends AbstractSettingsPage { public SshSettingsPage(SshSettings settings) { fTerminalSettings=settings; } - public void saveSettings() { + @Override + public void saveSettings() { fTerminalSettings.setHost(fHostText.getText()); fTerminalSettings.setUser(fUser.getText()); fTerminalSettings.setPassword(fPassword.getText()); @@ -46,7 +47,8 @@ public class SshSettingsPage extends AbstractSettingsPage { fTerminalSettings.setKeepalive(fKeepalive.getText()); } - public void loadSettings() { + @Override + public void loadSettings() { if(fTerminalSettings!=null) { fHostText.setText(get(fTerminalSettings.getHost(),""));//$NON-NLS-1$ fTimeout.setText(get(fTerminalSettings.getTimeoutString(),"0"));//$NON-NLS-1$ @@ -61,7 +63,8 @@ public class SshSettingsPage extends AbstractSettingsPage { return def; return value; } - public boolean validateSettings() { + @Override + public boolean validateSettings() { String message = null; int messageType = IMessageProvider.NONE; boolean valid = true; @@ -127,7 +130,8 @@ public class SshSettingsPage extends AbstractSettingsPage { setMessage(message, messageType); return valid; } - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); GridLayout gridLayout = new GridLayout(2, false); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); @@ -156,7 +160,8 @@ public class SshSettingsPage extends AbstractSettingsPage { final Text text= new Text(composite, SWT.BORDER | textOptions); text.setLayoutData(gridData); text.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { + @Override + public void modifyText(ModifyEvent e) { fireListeners(text); } }); diff --git a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/UserValidationDialog.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/UserValidationDialog.java similarity index 91% rename from plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/UserValidationDialog.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/UserValidationDialog.java index 993e772b550..90a7e0b2fca 100644 --- a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/UserValidationDialog.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/UserValidationDialog.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation * Martin Oberhuber (Wind River) - copied from org.eclipse.team.cvs.ui *******************************************************************************/ -package org.eclipse.tm.internal.terminal.ssh; +package org.eclipse.tm.terminal.connector.ssh.connector; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; @@ -44,7 +44,7 @@ public class UserValidationDialog extends TrayDialog { protected String password = null; protected boolean allowCaching = false; protected Image keyLockImage; - + // whether or not the username can be changed protected boolean isUsernameMutable = true; protected String username = null; @@ -52,7 +52,7 @@ public class UserValidationDialog extends TrayDialog { /** * Creates a new UserValidationDialog. - * + * * @param parentShell the parent shell * @param location the location * @param defaultName the default user name @@ -68,20 +68,22 @@ public class UserValidationDialog extends TrayDialog { /** * @see Window#configureShell */ - protected void configureShell(Shell newShell) { + @Override + protected void configureShell(Shell newShell) { super.configureShell(newShell); - newShell.setText(SshMessages.UserValidationDialog_required); + newShell.setText(SshMessages.UserValidationDialog_required); // set F1 help - PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, ISshConstants.HELP_USER_VALIDATION_DIALOG); + PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, ISshConstants.HELP_USER_VALIDATION_DIALOG); } /** * @see Window#create */ - public void create() { + @Override + public void create() { super.create(); // add some default values usernameField.setText(defaultUsername); - + if (isUsernameMutable) { // give focus to username field usernameField.selectAll(); @@ -95,14 +97,15 @@ public class UserValidationDialog extends TrayDialog { /** * @see Dialog#createDialogArea */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { Composite top = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(); layout.numColumns = 2; - + top.setLayout(layout); top.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - + Composite imageComposite = new Composite(top, SWT.NONE); layout = new GridLayout(); imageComposite.setLayout(layout); @@ -113,13 +116,13 @@ public class UserValidationDialog extends TrayDialog { layout.numColumns = 3; main.setLayout(layout); main.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - + Label imageLabel = new Label(imageComposite, SWT.NONE); //keyLockImage = TeamImages.getImageDescriptor(ITeamUIImages.IMG_KEY_LOCK).createImage(); //imageLabel.setImage(keyLockImage); GridData data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL); imageLabel.setLayoutData(data); - + if (message != null) { Label messageLabel = new Label(main, SWT.WRAP); messageLabel.setText(message); @@ -130,14 +133,14 @@ public class UserValidationDialog extends TrayDialog { } if (domain != null) { Label d = new Label(main, SWT.WRAP); - d.setText(SshMessages.UserValidationDialog_5); + d.setText(SshMessages.UserValidationDialog_5); data = new GridData(); d.setLayoutData(data); Label label = new Label(main, SWT.WRAP); if (isUsernameMutable) { - label.setText(NLS.bind(SshMessages.UserValidationDialog_labelUser, new String[] { domain })); + label.setText(NLS.bind(SshMessages.UserValidationDialog_labelUser, new String[] { domain })); } else { - label.setText(NLS.bind(SshMessages.UserValidationDialog_labelPassword, (new Object[]{defaultUsername, domain}))); + label.setText(NLS.bind(SshMessages.UserValidationDialog_labelPassword, (new Object[]{defaultUsername, domain}))); } data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL); data.horizontalSpan = 2; @@ -146,15 +149,16 @@ public class UserValidationDialog extends TrayDialog { } createUsernameFields(main); createPasswordFields(main); - + if(domain != null) { allowCachingButton = new Button(main, SWT.CHECK); - allowCachingButton.setText(SshMessages.UserValidationDialog_6); + allowCachingButton.setText(SshMessages.UserValidationDialog_6); data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL); data.horizontalSpan = 3; allowCachingButton.setLayoutData(data); allowCachingButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { allowCaching = allowCachingButton.getSelection(); } }); @@ -171,25 +175,25 @@ public class UserValidationDialog extends TrayDialog { warningLabel.setImage(getImage(DLG_IMG_MESSAGE_WARNING)); warningLabel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_BEGINNING)); Label warningText = new Label(warningComposite, SWT.WRAP); - warningText.setText(SshMessages.UserValidationDialog_7); + warningText.setText(SshMessages.UserValidationDialog_7); data = new GridData(GridData.FILL_HORIZONTAL); data.widthHint = 300; warningText.setLayoutData(data); } - + Dialog.applyDialogFont(parent); - + return main; } - + /** * Creates the three widgets that represent the password entry area. - * + * * @param parent the parent of the widgets */ protected void createPasswordFields(Composite parent) { - new Label(parent, SWT.NONE).setText(SshMessages.UserValidationDialog_password); - + new Label(parent, SWT.NONE).setText(SshMessages.UserValidationDialog_password); + passwordField = new Text(parent, SWT.BORDER | SWT.PASSWORD); GridData data = new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2; @@ -198,39 +202,39 @@ public class UserValidationDialog extends TrayDialog { } /** * Creates the three widgets that represent the user name entry area. - * + * * @param parent the parent of the widgets */ protected void createUsernameFields(Composite parent) { - new Label(parent, SWT.NONE).setText(SshMessages.UserValidationDialog_user); - + new Label(parent, SWT.NONE).setText(SshMessages.UserValidationDialog_user); + usernameField = new Text(parent, SWT.BORDER); GridData data = new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2; data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.ENTRY_FIELD_WIDTH); usernameField.setLayoutData(data); } - + /** * Returns the password entered by the user, or null * if the user cancelled. - * + * * @return the entered password */ public String getPassword() { return password; } - + /** * Returns the username entered by the user, or null * if the user cancelled. - * + * * @return the entered username */ public String getUsername() { return username; } - + /** * Returns true if the save password checkbox was selected. * @return true if the save password checkbox was selected and false @@ -239,7 +243,7 @@ public class UserValidationDialog extends TrayDialog { public boolean getAllowCaching() { return allowCaching; } - + /** * Notifies that the ok button of this dialog has been pressed. *

@@ -248,27 +252,29 @@ public class UserValidationDialog extends TrayDialog { * and closes the dialog. Subclasses may override. *

*/ - protected void okPressed() { + @Override + protected void okPressed() { password = passwordField.getText(); username = usernameField.getText(); - + super.okPressed(); } /** * Sets whether or not the username field should be mutable. * This method must be called before create(), otherwise it * will be ignored. - * + * * @param value whether the username is mutable */ public void setUsernameMutable(boolean value) { isUsernameMutable = value; } - + /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#close() */ - public boolean close() { + @Override + public boolean close() { if(keyLockImage != null) { keyLockImage.dispose(); } diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/controls/SshWizardConfigurationPanel.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/controls/SshWizardConfigurationPanel.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java index 581fa582cda..03634f5f7b7 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/controls/SshWizardConfigurationPanel.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361352] [TERMINALS][SSH] Add SSH terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.ssh.controls; +package org.eclipse.tm.terminal.connector.ssh.controls; import java.util.HashMap; import java.util.Map; @@ -29,15 +29,15 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; -import org.eclipse.tm.internal.terminal.ssh.SshConnector; -import org.eclipse.tm.internal.terminal.ssh.SshSettings; +import org.eclipse.tm.terminal.connector.ssh.connector.SshConnector; +import org.eclipse.tm.terminal.connector.ssh.connector.SshSettings; +import org.eclipse.tm.terminal.connector.ssh.nls.Messages; import org.eclipse.tm.terminal.view.core.TerminalContextPropertiesProviderFactory; import org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; import org.eclipse.tm.terminal.view.core.interfaces.constants.IContextPropertiesConstants; import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; import org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.ssh.nls.Messages; /** * SSH wizard configuration panel implementation. diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/launcher/SshLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshLauncherDelegate.java similarity index 96% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/launcher/SshLauncherDelegate.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshLauncherDelegate.java index 9d5b9687f08..f4620c62784 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/launcher/SshLauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshLauncherDelegate.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361352] [TERMINALS][SSH] Add SSH terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.ssh.launcher; +package org.eclipse.tm.terminal.connector.ssh.launcher; import java.text.DateFormat; import java.util.Date; @@ -19,7 +19,9 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension; -import org.eclipse.tm.internal.terminal.ssh.SshSettings; +import org.eclipse.tm.terminal.connector.ssh.connector.SshSettings; +import org.eclipse.tm.terminal.connector.ssh.controls.SshWizardConfigurationPanel; +import org.eclipse.tm.terminal.connector.ssh.nls.Messages; import org.eclipse.tm.terminal.view.core.TerminalServiceFactory; import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; @@ -28,8 +30,6 @@ import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; -import org.eclipse.tm.terminal.view.ui.ssh.controls.SshWizardConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.ssh.nls.Messages; /** * SSH launcher delegate implementation. diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/launcher/SshMementoHandler.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshMementoHandler.java similarity index 99% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/launcher/SshMementoHandler.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshMementoHandler.java index 61e3d273ff1..cc74c1430e7 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/launcher/SshMementoHandler.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshMementoHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.ssh.launcher; +package org.eclipse.tm.terminal.connector.ssh.launcher; import java.util.Map; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/nls/Messages.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.java similarity index 96% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/nls/Messages.java rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.java index d5cee145798..ba432d6647c 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/nls/Messages.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361352] [TERMINALS][SSH] Add SSH terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.ssh.nls; +package org.eclipse.tm.terminal.connector.ssh.nls; import org.eclipse.osgi.util.NLS; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/src/org/eclipse/tm/terminal/view/ui/ssh/nls/Messages.properties rename to plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.properties diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/.classpath b/plugins/org.eclipse.tm.terminal.connector.telnet/.classpath similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/.classpath rename to plugins/org.eclipse.tm.terminal.connector.telnet/.classpath diff --git a/plugins/org.eclipse.tm.terminal.view.ui.serial/.gitignore b/plugins/org.eclipse.tm.terminal.connector.telnet/.gitignore similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.serial/.gitignore rename to plugins/org.eclipse.tm.terminal.connector.telnet/.gitignore diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/.options b/plugins/org.eclipse.tm.terminal.connector.telnet/.options similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/.options rename to plugins/org.eclipse.tm.terminal.connector.telnet/.options diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/.project b/plugins/org.eclipse.tm.terminal.connector.telnet/.project similarity index 94% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/.project rename to plugins/org.eclipse.tm.terminal.connector.telnet/.project index 384bfc77b07..7a745829ff7 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.telnet/.project +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.view.ui.telnet + org.eclipse.tm.terminal.connector.telnet diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.connector.telnet/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.connector.telnet/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.connector.telnet/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.tm.terminal.connector.telnet/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.tm.terminal.connector.telnet/.settings/org.eclipse.pde.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/.settings/org.eclipse.pde.prefs rename to plugins/org.eclipse.tm.terminal.connector.telnet/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF similarity index 52% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/META-INF/MANIFEST.MF rename to plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF index 6e3c716c2af..3e2c47390cf 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.ssh/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF @@ -1,22 +1,22 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui.ssh;singleton:=true +Bundle-SymbolicName: org.eclipse.tm.terminal.connector.telnet;singleton:=true Bundle-Version: 4.0.0.qualifier -Bundle-Activator: org.eclipse.tm.terminal.view.ui.ssh.activator.UIPlugin +Bundle-Activator: org.eclipse.tm.terminal.connector.telnet.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.equinox.security;bundle-version="1.1.100", org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0", - org.eclipse.tm.terminal;bundle-version="4.0.0", - org.eclipse.tm.terminal.ssh;bundle-version="4.0.0", + org.eclipse.tm.terminal.control;bundle-version="4.0.0", org.eclipse.ui;bundle-version="3.8.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.tm.terminal.view.ui.ssh.activator;x-internal:=true, - org.eclipse.tm.terminal.view.ui.ssh.controls, - org.eclipse.tm.terminal.view.ui.ssh.launcher, - org.eclipse.tm.terminal.view.ui.ssh.nls;x-internal:=true +Export-Package: org.eclipse.tm.terminal.connector.telnet.activator;x-internal:=true, + org.eclipse.tm.terminal.connector.telnet.connector, + org.eclipse.tm.terminal.connector.telnet.controls, + org.eclipse.tm.terminal.connector.telnet.launcher, + org.eclipse.tm.terminal.connector.telnet.nls;x-internal:=true diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/about.html b/plugins/org.eclipse.tm.terminal.connector.telnet/about.html similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/about.html rename to plugins/org.eclipse.tm.terminal.connector.telnet/about.html diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/build.properties b/plugins/org.eclipse.tm.terminal.connector.telnet/build.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/build.properties rename to plugins/org.eclipse.tm.terminal.connector.telnet/build.properties diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/plugin.properties b/plugins/org.eclipse.tm.terminal.connector.telnet/plugin.properties similarity index 91% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/plugin.properties rename to plugins/org.eclipse.tm.terminal.connector.telnet/plugin.properties index ddd14ef4a19..28367e964d3 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.telnet/plugin.properties +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/plugin.properties @@ -11,6 +11,10 @@ pluginName = Terminals Telnet Extensions providerName = Eclipse.org - Target Explorer +# ----- Terminal Connector ----- + +TelnetConnector.label=Telnet + # ----- Terminal Launcher Delegates ----- TelnetLauncherDelegate.label=Telnet Terminal diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/plugin.xml b/plugins/org.eclipse.tm.terminal.connector.telnet/plugin.xml similarity index 56% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/plugin.xml rename to plugins/org.eclipse.tm.terminal.connector.telnet/plugin.xml index d7bd55bb02d..346d2763746 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.telnet/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/plugin.xml @@ -2,11 +2,19 @@ - + + + + + + diff --git a/plugins/org.eclipse.tm.terminal.telnet/pom.xml b/plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml similarity index 89% rename from plugins/org.eclipse.tm.terminal.telnet/pom.xml rename to plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml index dd944f7b55a..0e0ae8e55c7 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/pom.xml +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml @@ -12,6 +12,6 @@ 4.0.0.qualifier - org.eclipse.tm.terminal.telnet + org.eclipse.tm.terminal.connector.telnet eclipse-plugin diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/activator/UIPlugin.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java index 69549b85412..998c0e4f15b 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/activator/UIPlugin.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [366374] [TERMINALS][TELNET] Add Telnet terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.telnet.activator; +package org.eclipse.tm.terminal.connector.telnet.activator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; diff --git a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/ITelnetSettings.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/ITelnetSettings.java similarity index 93% rename from plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/ITelnetSettings.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/ITelnetSettings.java index 89c8e4aec55..bf5638dd50d 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/ITelnetSettings.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/ITelnetSettings.java @@ -9,7 +9,7 @@ * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.internal.terminal.telnet; +package org.eclipse.tm.terminal.connector.telnet.connector; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; diff --git a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/NetworkPortMap.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/NetworkPortMap.java similarity index 97% rename from plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/NetworkPortMap.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/NetworkPortMap.java index 367aabc7b95..a34d374f372 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/NetworkPortMap.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/NetworkPortMap.java @@ -14,7 +14,7 @@ * Michael Scharf (Wind River) - extracted from TerminalNetworkPortMap * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.internal.terminal.telnet; +package org.eclipse.tm.terminal.connector.telnet.connector; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetCodes.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetCodes.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetCodes.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetCodes.java index b40d3dfefb7..c83bb036518 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetCodes.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetCodes.java @@ -12,7 +12,7 @@ * Michael Scharf (Wind River) - split into core, view and connector plugins * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.internal.terminal.telnet; +package org.eclipse.tm.terminal.connector.telnet.connector; /** * This interface defines symbolic constants for numeric TELNET protocol command and diff --git a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnectWorker.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnectWorker.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnectWorker.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnectWorker.java index b92865e2a06..162991cc698 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnectWorker.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnectWorker.java @@ -15,7 +15,7 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Uwe Stieber (Wind River) - [287158][terminal][telnet] Connect worker is giving up to early *******************************************************************************/ -package org.eclipse.tm.internal.terminal.telnet; +package org.eclipse.tm.terminal.connector.telnet.connector; import java.net.ConnectException; import java.net.InetSocketAddress; diff --git a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnection.java similarity index 99% rename from plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnection.java index e3c2b87fe8d..9f920f9ae78 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnection.java @@ -16,7 +16,7 @@ * Uwe Stieber (Wind River) - [281329] Telnet connection not handling "SocketException: Connection reset" correct * Nils Hagge (Siemens AG) - [276023] close socket streams after connection is disconnected *******************************************************************************/ -package org.eclipse.tm.internal.terminal.telnet; +package org.eclipse.tm.terminal.connector.telnet.connector; import java.io.IOException; import java.io.InputStream; diff --git a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnector.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnector.java similarity index 98% rename from plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnector.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnector.java index 83e31d08951..ce524f0df6e 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnector.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnector.java @@ -18,7 +18,7 @@ * David Sciamma (Anyware-Tech) - [288254][telnet] local echo is always disabled * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.internal.terminal.telnet; +package org.eclipse.tm.terminal.connector.telnet.connector; import java.io.IOException; import java.io.InputStream; diff --git a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetMessages.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetMessages.java similarity index 94% rename from plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetMessages.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetMessages.java index 5e0d9a64fad..01aae433dea 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetMessages.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetMessages.java @@ -9,7 +9,7 @@ * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.internal.terminal.telnet; +package org.eclipse.tm.terminal.connector.telnet.connector; import org.eclipse.osgi.util.NLS; diff --git a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetMessages.properties b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetMessages.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetMessages.properties rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetMessages.properties diff --git a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetOption.java similarity index 99% rename from plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetOption.java index 835e2e1da87..4cbd2f9d3e5 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetOption.java @@ -16,7 +16,7 @@ * Martin Oberhuber (Wind River) - [267181] Fix telnet option negotiation loop * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.internal.terminal.telnet; +package org.eclipse.tm.terminal.connector.telnet.connector; import java.io.IOException; import java.io.OutputStream; diff --git a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetProperties.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetProperties.java similarity index 95% rename from plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetProperties.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetProperties.java index eafe5b37ffe..0e7025bab6e 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetProperties.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetProperties.java @@ -14,7 +14,7 @@ * Michael Scharf (Wind River) - extracted from TerminalProperties * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.internal.terminal.telnet; +package org.eclipse.tm.terminal.connector.telnet.connector; public class TelnetProperties { private final NetworkPortMap fNetworkPortMap; diff --git a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettings.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettings.java similarity index 97% rename from plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettings.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettings.java index a104e093f47..a80b6727ce9 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettings.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettings.java @@ -14,7 +14,7 @@ * Michael Scharf (Wind River) - extracted from TerminalSettings * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.internal.terminal.telnet; +package org.eclipse.tm.terminal.connector.telnet.connector; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; diff --git a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettingsPage.java similarity index 99% rename from plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettingsPage.java index ac286b08fa4..67d37aa2878 100644 --- a/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettingsPage.java @@ -16,7 +16,7 @@ * Martin Oberhuber (Wind River) - [206917] Add validation for Terminal Settings * Martin Oberhuber (Wind River) - [401476] Strip whitespace around Telnet Port *******************************************************************************/ -package org.eclipse.tm.internal.terminal.telnet; +package org.eclipse.tm.terminal.connector.telnet.connector; import java.util.Collections; import java.util.Iterator; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/controls/TelnetWizardConfigurationPanel.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java similarity index 96% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/controls/TelnetWizardConfigurationPanel.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java index b106182366f..d3607fc8e0f 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/controls/TelnetWizardConfigurationPanel.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [366374] [TERMINALS][TELNET] Add Telnet terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.telnet.controls; +package org.eclipse.tm.terminal.connector.telnet.controls; import java.util.HashMap; import java.util.Map; @@ -21,9 +21,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; -import org.eclipse.tm.internal.terminal.telnet.NetworkPortMap; -import org.eclipse.tm.internal.terminal.telnet.TelnetConnector; -import org.eclipse.tm.internal.terminal.telnet.TelnetSettings; +import org.eclipse.tm.terminal.connector.telnet.connector.NetworkPortMap; +import org.eclipse.tm.terminal.connector.telnet.connector.TelnetConnector; +import org.eclipse.tm.terminal.connector.telnet.connector.TelnetSettings; import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; import org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/launcher/TelnetLauncherDelegate.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java similarity index 95% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/launcher/TelnetLauncherDelegate.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java index 56bcf06e715..c01ff2541a8 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/launcher/TelnetLauncherDelegate.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [366374] [TERMINALS][TELNET] Add Telnet terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.telnet.launcher; +package org.eclipse.tm.terminal.connector.telnet.launcher; import java.text.DateFormat; import java.util.Date; @@ -19,7 +19,9 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension; -import org.eclipse.tm.internal.terminal.telnet.TelnetSettings; +import org.eclipse.tm.terminal.connector.telnet.connector.TelnetSettings; +import org.eclipse.tm.terminal.connector.telnet.controls.TelnetWizardConfigurationPanel; +import org.eclipse.tm.terminal.connector.telnet.nls.Messages; import org.eclipse.tm.terminal.view.core.TerminalServiceFactory; import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; @@ -28,8 +30,6 @@ import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; -import org.eclipse.tm.terminal.view.ui.telnet.controls.TelnetWizardConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.telnet.nls.Messages; /** * Telnet launcher delegate implementation. diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/launcher/TelnetMementoHandler.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetMementoHandler.java similarity index 97% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/launcher/TelnetMementoHandler.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetMementoHandler.java index 05d2d95e8aa..bf056492c07 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/launcher/TelnetMementoHandler.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetMementoHandler.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.telnet.launcher; +package org.eclipse.tm.terminal.connector.telnet.launcher; import java.util.Map; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/nls/Messages.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.java similarity index 95% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/nls/Messages.java rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.java index 4119e2cc99b..9d358bdddb0 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/nls/Messages.java +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.java @@ -8,7 +8,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [366374] [TERMINALS][TELNET] Add Telnet terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.telnet.nls; +package org.eclipse.tm.terminal.connector.telnet.nls; import org.eclipse.osgi.util.NLS; diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.telnet/src/org/eclipse/tm/terminal/view/ui/telnet/nls/Messages.properties rename to plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.properties diff --git a/plugins/org.eclipse.tm.terminal.telnet/.classpath b/plugins/org.eclipse.tm.terminal.control/.classpath similarity index 100% rename from plugins/org.eclipse.tm.terminal.telnet/.classpath rename to plugins/org.eclipse.tm.terminal.control/.classpath diff --git a/plugins/org.eclipse.tm.terminal.ssh/.cvsignore b/plugins/org.eclipse.tm.terminal.control/.cvsignore similarity index 100% rename from plugins/org.eclipse.tm.terminal.ssh/.cvsignore rename to plugins/org.eclipse.tm.terminal.control/.cvsignore diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/.gitignore b/plugins/org.eclipse.tm.terminal.control/.gitignore similarity index 100% rename from plugins/org.eclipse.tm.terminal.view.ui.ssh/.gitignore rename to plugins/org.eclipse.tm.terminal.control/.gitignore diff --git a/plugins/org.eclipse.tm.terminal/.options b/plugins/org.eclipse.tm.terminal.control/.options similarity index 100% rename from plugins/org.eclipse.tm.terminal/.options rename to plugins/org.eclipse.tm.terminal.control/.options diff --git a/plugins/org.eclipse.tm.terminal/.project b/plugins/org.eclipse.tm.terminal.control/.project similarity index 94% rename from plugins/org.eclipse.tm.terminal/.project rename to plugins/org.eclipse.tm.terminal.control/.project index 79c78f7826f..11e18c380e4 100644 --- a/plugins/org.eclipse.tm.terminal/.project +++ b/plugins/org.eclipse.tm.terminal.control/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal + org.eclipse.tm.terminal.control diff --git a/plugins/org.eclipse.tm.terminal/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.tm.terminal.control/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal/.settings/org.eclipse.core.resources.prefs rename to plugins/org.eclipse.tm.terminal.control/.settings/org.eclipse.core.resources.prefs diff --git a/plugins/org.eclipse.tm.terminal/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.control/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from plugins/org.eclipse.tm.terminal/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.tm.terminal.control/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.tm.terminal/HelpContexts.xml b/plugins/org.eclipse.tm.terminal.control/HelpContexts.xml similarity index 100% rename from plugins/org.eclipse.tm.terminal/HelpContexts.xml rename to plugins/org.eclipse.tm.terminal.control/HelpContexts.xml diff --git a/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF similarity index 73% rename from plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF rename to plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF index 41852053a69..5cadce5e1f4 100644 --- a/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal; singleton:=true +Bundle-SymbolicName: org.eclipse.tm.terminal.control; singleton:=true Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin Bundle-Vendor: %providerName @@ -20,16 +20,16 @@ Export-Package: org.eclipse.tm.internal.terminal.connector;x-friends:="org.eclip org.eclipse.tm.internal.terminal.model;x-friends:="org.eclipse.tm.terminal.test", org.eclipse.tm.internal.terminal.preferences, org.eclipse.tm.internal.terminal.provisional.api; - x-friends:="org.eclipse.tm.terminal.serial, - org.eclipse.tm.terminal.ssh, - org.eclipse.tm.terminal.telnet, - org.eclipse.tm.terminal.local, + x-friends:="org.eclipse.tm.terminal.connector.serial, + org.eclipse.tm.terminal.connector.ssh, + org.eclipse.tm.terminal.connector.telnet, + org.eclipse.tm.terminal.connector.local, org.eclipse.tm.terminal.test", org.eclipse.tm.internal.terminal.provisional.api.provider; - x-friends:="org.eclipse.tm.terminal.serial, - org.eclipse.tm.terminal.ssh, - org.eclipse.tm.terminal.telnet, - org.eclipse.tm.terminal.local, + x-friends:="org.eclipse.tm.terminal.connector.serial, + org.eclipse.tm.terminal.connector.ssh, + org.eclipse.tm.terminal.connector.telnet, + org.eclipse.tm.terminal.connector.local, org.eclipse.tm.terminal.test", org.eclipse.tm.internal.terminal.textcanvas;x-friends:="org.eclipse.tm.terminal.test", org.eclipse.tm.terminal.model diff --git a/plugins/org.eclipse.tm.terminal/README.txt b/plugins/org.eclipse.tm.terminal.control/README.txt similarity index 100% rename from plugins/org.eclipse.tm.terminal/README.txt rename to plugins/org.eclipse.tm.terminal.control/README.txt diff --git a/plugins/org.eclipse.tm.terminal/about.html b/plugins/org.eclipse.tm.terminal.control/about.html similarity index 100% rename from plugins/org.eclipse.tm.terminal/about.html rename to plugins/org.eclipse.tm.terminal.control/about.html diff --git a/plugins/org.eclipse.tm.terminal.ssh/about.ini b/plugins/org.eclipse.tm.terminal.control/about.ini similarity index 100% rename from plugins/org.eclipse.tm.terminal.ssh/about.ini rename to plugins/org.eclipse.tm.terminal.control/about.ini diff --git a/plugins/org.eclipse.tm.terminal/about.properties b/plugins/org.eclipse.tm.terminal.control/about.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal/about.properties rename to plugins/org.eclipse.tm.terminal.control/about.properties diff --git a/plugins/org.eclipse.tm.terminal/build.properties b/plugins/org.eclipse.tm.terminal.control/build.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal/build.properties rename to plugins/org.eclipse.tm.terminal.control/build.properties diff --git a/plugins/org.eclipse.tm.terminal/css/org.eclipse.tm.terminal.stylesheet.dark.css b/plugins/org.eclipse.tm.terminal.control/css/org.eclipse.tm.terminal.stylesheet.dark.css similarity index 100% rename from plugins/org.eclipse.tm.terminal/css/org.eclipse.tm.terminal.stylesheet.dark.css rename to plugins/org.eclipse.tm.terminal.control/css/org.eclipse.tm.terminal.stylesheet.dark.css diff --git a/plugins/org.eclipse.tm.terminal/icons/clcl16/clear_co.gif b/plugins/org.eclipse.tm.terminal.control/icons/clcl16/clear_co.gif similarity index 100% rename from plugins/org.eclipse.tm.terminal/icons/clcl16/clear_co.gif rename to plugins/org.eclipse.tm.terminal.control/icons/clcl16/clear_co.gif diff --git a/plugins/org.eclipse.tm.terminal/icons/dlcl16/clear_co.gif b/plugins/org.eclipse.tm.terminal.control/icons/dlcl16/clear_co.gif similarity index 100% rename from plugins/org.eclipse.tm.terminal/icons/dlcl16/clear_co.gif rename to plugins/org.eclipse.tm.terminal.control/icons/dlcl16/clear_co.gif diff --git a/plugins/org.eclipse.tm.terminal/icons/elcl16/clear_co.gif b/plugins/org.eclipse.tm.terminal.control/icons/elcl16/clear_co.gif similarity index 100% rename from plugins/org.eclipse.tm.terminal/icons/elcl16/clear_co.gif rename to plugins/org.eclipse.tm.terminal.control/icons/elcl16/clear_co.gif diff --git a/plugins/org.eclipse.tm.terminal/plugin.properties b/plugins/org.eclipse.tm.terminal.control/plugin.properties similarity index 90% rename from plugins/org.eclipse.tm.terminal/plugin.properties rename to plugins/org.eclipse.tm.terminal.control/plugin.properties index 2ddffdc8a5c..73649e114b5 100644 --- a/plugins/org.eclipse.tm.terminal/plugin.properties +++ b/plugins/org.eclipse.tm.terminal.control/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2003, 2014, 2014 Wind River Systems, Inc. and others. +# Copyright (c) 2003 - 2015 Wind River Systems, Inc. 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 @@ -18,10 +18,10 @@ # NLS_MESSAGEFORMAT_NONE -pluginName = Target Management Terminal Widget +pluginName = Tm Terminal Control providerName = Eclipse TM Project -terminal.context.name.edit=Terminal Widget in Focus +terminal.context.name.edit=Terminal Control in Focus terminal.context.description.edit=Show modified keyboard shortcuts in context menu terminal.context.name.terminal=Terminal Typing Connected diff --git a/plugins/org.eclipse.tm.terminal/plugin.xml b/plugins/org.eclipse.tm.terminal.control/plugin.xml similarity index 99% rename from plugins/org.eclipse.tm.terminal/plugin.xml rename to plugins/org.eclipse.tm.terminal.control/plugin.xml index b47d9152cfe..f6f5f0351ef 100644 --- a/plugins/org.eclipse.tm.terminal/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.control/plugin.xml @@ -17,7 +17,8 @@ # Martin Oberhuber (Wind River) - [434939] Fix Keybinding conflicts with JEE Luna package --> - + + 4.0.0.qualifier - org.eclipse.tm.terminal + org.eclipse.tm.terminal.control eclipse-plugin diff --git a/plugins/org.eclipse.tm.terminal/schema/terminalConnectors.exsd b/plugins/org.eclipse.tm.terminal.control/schema/connectors.exsd similarity index 92% rename from plugins/org.eclipse.tm.terminal/schema/terminalConnectors.exsd rename to plugins/org.eclipse.tm.terminal.control/schema/connectors.exsd index b503ea5442d..58681ba9028 100644 --- a/plugins/org.eclipse.tm.terminal/schema/terminalConnectors.exsd +++ b/plugins/org.eclipse.tm.terminal.control/schema/connectors.exsd @@ -1,9 +1,9 @@ - + - + @@ -95,7 +95,7 @@ - Copyright (c) 2006, 2009 Wind River Systems, Inc. and others. + Copyright (c) 2006 - 2015 Wind River Systems, Inc. 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 diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ICommandInputField.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ICommandInputField.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ICommandInputField.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ICommandInputField.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/AbstractTerminalAction.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/AbstractTerminalAction.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/AbstractTerminalAction.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/AbstractTerminalAction.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.properties b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.properties rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.properties diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ImageConsts.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ImageConsts.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ImageConsts.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ImageConsts.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionClearAll.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionClearAll.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionClearAll.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionClearAll.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCut.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCut.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCut.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCut.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionSelectAll.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionSelectAll.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionSelectAll.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionSelectAll.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalInputStream.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalInputStream.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalInputStream.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalInputStream.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/IVT100EmulatorBackend.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/IVT100EmulatorBackend.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/IVT100EmulatorBackend.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/IVT100EmulatorBackend.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/LoggingOutputStream.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/LoggingOutputStream.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/LoggingOutputStream.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/LoggingOutputStream.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100BackendTraceDecorator.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100BackendTraceDecorator.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100BackendTraceDecorator.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100BackendTraceDecorator.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/ISnapshotChanges.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/ISnapshotChanges.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/ISnapshotChanges.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/ISnapshotChanges.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextData.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextData.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextData.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextData.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModel.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModel.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModel.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModel.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModelListener.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModelListener.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModelListener.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModelListener.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PollingTextCanvasModel.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/PollingTextCanvasModel.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PollingTextCanvasModel.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/PollingTextCanvasModel.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextData.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextData.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextData.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextData.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextDataReadOnly.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextDataReadOnly.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextDataReadOnly.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextDataReadOnly.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextDataSnapshot.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextDataSnapshot.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextDataSnapshot.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextDataSnapshot.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/LineSegment.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/LineSegment.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/LineSegment.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/LineSegment.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/Style.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/Style.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/Style.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/Style.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/StyleColor.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/StyleColor.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/StyleColor.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/StyleColor.java diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/TerminalTextDataFactory.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TerminalTextDataFactory.java similarity index 100% rename from plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/TerminalTextDataFactory.java rename to plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TerminalTextDataFactory.java diff --git a/plugins/org.eclipse.tm.terminal.ssh/tm32.png b/plugins/org.eclipse.tm.terminal.control/tm32.png similarity index 100% rename from plugins/org.eclipse.tm.terminal.ssh/tm32.png rename to plugins/org.eclipse.tm.terminal.control/tm32.png diff --git a/plugins/org.eclipse.tm.terminal.remote/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.remote/META-INF/MANIFEST.MF index 03f058c1d27..57a6b9ae663 100644 --- a/plugins/org.eclipse.tm.terminal.remote/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.remote/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.tm.terminal, + org.eclipse.tm.terminal.control, org.eclipse.remote.core, org.eclipse.remote.ui, org.eclipse.core.resources, diff --git a/plugins/org.eclipse.tm.terminal.remote/plugin.xml b/plugins/org.eclipse.tm.terminal.remote/plugin.xml index c3aa141f19e..46ea8858d99 100644 --- a/plugins/org.eclipse.tm.terminal.remote/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.remote/plugin.xml @@ -10,7 +10,7 @@ + point="org.eclipse.tm.terminal.control.connectors"> diff --git a/plugins/org.eclipse.tm.terminal.ssh/.project b/plugins/org.eclipse.tm.terminal.ssh/.project deleted file mode 100644 index f5d184b60cc..00000000000 --- a/plugins/org.eclipse.tm.terminal.ssh/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.tm.terminal.ssh - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.pde.api.tools.apiAnalysisBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.pde.api.tools.apiAnalysisNature - - diff --git a/plugins/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 94637dfe13b..00000000000 --- a/plugins/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,61 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 0b831f584d6..00000000000 --- a/plugins/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Thu Dec 07 03:43:08 CET 2006 -eclipse.preferences.version=1 -internal.default.compliance=user diff --git a/plugins/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF deleted file mode 100644 index 3bfe72556f6..00000000000 --- a/plugins/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.ssh;singleton:=true -Bundle-Version: 4.0.0.qualifier -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.tm.terminal;bundle-version="3.3.0", - com.jcraft.jsch;bundle-version="[0.1.31,1.0.0)", - org.eclipse.jsch.core;bundle-version="[1.0.0,2.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.tm.internal.terminal.ssh;x-internal:=true -Bundle-Activator: org.eclipse.tm.internal.terminal.ssh.Activator -Bundle-ActivationPolicy: lazy -Eclipse-LazyStart: true diff --git a/plugins/org.eclipse.tm.terminal.ssh/about.html b/plugins/org.eclipse.tm.terminal.ssh/about.html deleted file mode 100644 index a603d19ab21..00000000000 --- a/plugins/org.eclipse.tm.terminal.ssh/about.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - -About - - -

About This Content

- -

June 5, 2007

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

- - - - \ No newline at end of file diff --git a/plugins/org.eclipse.tm.terminal.ssh/about.properties b/plugins/org.eclipse.tm.terminal.ssh/about.properties deleted file mode 100644 index fb375e542d8..00000000000 --- a/plugins/org.eclipse.tm.terminal.ssh/about.properties +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ -# about.properties -# contains externalized strings for about.ini -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# fill-ins are supplied by about.mappings -# This file should be translated. -# -# Do not translate any values surrounded by {} - -blurb=Target Management Terminal SSH Connector\n\ -\n\ -Version: {featureVersion}\n\ -\n\ -(c) Copyright Wind River Systems, Inc. and others 2000, 2015. All rights reserved.\n\ -Visit http://www.eclipse.org/tm diff --git a/plugins/org.eclipse.tm.terminal.ssh/build.properties b/plugins/org.eclipse.tm.terminal.ssh/build.properties deleted file mode 100644 index 16dffd1f71c..00000000000 --- a/plugins/org.eclipse.tm.terminal.ssh/build.properties +++ /dev/null @@ -1,22 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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 -# -# Contributors: -# Michael Scharf (Wind River) - initial API and implementation -# Martin Oberhuber (Wind River) - fixed copyright headers and beautified -############################################################################### -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - plugin.properties,\ - about.html,\ - about.ini,\ - about.properties,\ - tm32.png -src.includes = about.html diff --git a/plugins/org.eclipse.tm.terminal.ssh/plugin.properties b/plugins/org.eclipse.tm.terminal.ssh/plugin.properties deleted file mode 100644 index 26549b67b9b..00000000000 --- a/plugins/org.eclipse.tm.terminal.ssh/plugin.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber (Wind River) - initial API and implementation -############################################################################### -pluginName = Target Management Terminal SSH Connector -providerName = Eclipse TM Project -sshConnection = SSH \ No newline at end of file diff --git a/plugins/org.eclipse.tm.terminal.ssh/plugin.xml b/plugins/org.eclipse.tm.terminal.ssh/plugin.xml deleted file mode 100644 index f6f2a6f5b79..00000000000 --- a/plugins/org.eclipse.tm.terminal.ssh/plugin.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java b/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java deleted file mode 100644 index 990e40f674e..00000000000 --- a/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java +++ /dev/null @@ -1,94 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2012 Wind River Systems, Inc. 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 - * - * Contributors: - * Martin Oberhuber (Wind River) - initial API and implementation - * Martin Oberhuber (Wind River) - [175686] Adapted to new IJSchService API - * - copied code from org.eclipse.team.cvs.ssh2/CVSSSH2Plugin (Copyright IBM) - *******************************************************************************/ -package org.eclipse.tm.internal.terminal.ssh; - -import org.eclipse.core.runtime.Plugin; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jsch.core.IJSchService; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; -import org.osgi.util.tracker.ServiceTracker; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends Plugin { - - public static final String PLUGIN_ID = "org.eclipse.tm.terminal.ssh"; //$NON-NLS-1$ - private static Activator plugin; - - // ServiceTracker for IJschService - private ServiceTracker tracker; - - /** - * The constructor - */ - public Activator() { - super(); - plugin = this; - } - - //--------------------------------------------------------------------------- - // - //--------------------------------------------------------------------------- - - public void start(BundleContext context) throws Exception { - super.start(context); - tracker = new ServiceTracker(getBundle().getBundleContext(), IJSchService.class.getName(), null); - tracker.open(); - } - - public void stop(BundleContext context) throws Exception { - try { - SshConnection.shutdown(); - tracker.close(); - } finally { - plugin = null; - super.stop(context); - } - } - - /** - * Returns an instance of IJSchService from the OSGi Registry. - * @return An instance of IJSchService, or null if no - * IJschService service is available. - */ - public IJSchService getJSchService() { - return (IJSchService)tracker.getService(); - } - - //--------------------------------------------------------------------------- - // - //--------------------------------------------------------------------------- - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - - /** - * Returns an image descriptor for the image file at the given - * plug-in relative path. - * - * @param path the path - * @return the image descriptor - */ - public static ImageDescriptor getImageDescriptor(String path) { - return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path); - } - -} diff --git a/plugins/org.eclipse.tm.terminal.telnet/.cvsignore b/plugins/org.eclipse.tm.terminal.telnet/.cvsignore deleted file mode 100644 index ba077a4031a..00000000000 --- a/plugins/org.eclipse.tm.terminal.telnet/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -bin diff --git a/plugins/org.eclipse.tm.terminal.telnet/.project b/plugins/org.eclipse.tm.terminal.telnet/.project deleted file mode 100644 index 15718654262..00000000000 --- a/plugins/org.eclipse.tm.terminal.telnet/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.tm.terminal.telnet - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.pde.api.tools.apiAnalysisBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.pde.api.tools.apiAnalysisNature - - diff --git a/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 94637dfe13b..00000000000 --- a/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,61 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 9a20fca52a4..00000000000 --- a/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Jul 31 14:55:17 CEST 2006 -eclipse.preferences.version=1 -internal.default.compliance=user diff --git a/plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF deleted file mode 100644 index 719f8927128..00000000000 --- a/plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.telnet;singleton:=true -Bundle-Version: 4.0.0.qualifier -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.tm.terminal;bundle-version="3.3.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.tm.internal.terminal.telnet;x-internal:=true diff --git a/plugins/org.eclipse.tm.terminal.telnet/about.html b/plugins/org.eclipse.tm.terminal.telnet/about.html deleted file mode 100644 index a603d19ab21..00000000000 --- a/plugins/org.eclipse.tm.terminal.telnet/about.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - -About - - -

About This Content

- -

June 5, 2007

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

- - - - \ No newline at end of file diff --git a/plugins/org.eclipse.tm.terminal.telnet/about.ini b/plugins/org.eclipse.tm.terminal.telnet/about.ini deleted file mode 100644 index 3adc27ab587..00000000000 --- a/plugins/org.eclipse.tm.terminal.telnet/about.ini +++ /dev/null @@ -1,27 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%blurb - -# Property "windowImage" contains path to window icon (16x16) -# needed for primary features only - -# Property "featureImage" contains path to feature image (32x32) -featureImage=tm32.png - -# Property "aboutImage" contains path to product image (500x330 or 115x164) -# needed for primary features only - -# Property "appName" contains name of the application (not translated) -# needed for primary features only - -# Property "welcomePage" contains path to welcome page (special XML-based format) -# optional - -# Property "welcomePerspective" contains the id of the perspective in which the -# welcome page is to be opened. -# optional \ No newline at end of file diff --git a/plugins/org.eclipse.tm.terminal.telnet/about.properties b/plugins/org.eclipse.tm.terminal.telnet/about.properties deleted file mode 100644 index 952c0f4b010..00000000000 --- a/plugins/org.eclipse.tm.terminal.telnet/about.properties +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2015 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ -# about.properties -# contains externalized strings for about.ini -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# fill-ins are supplied by about.mappings -# This file should be translated. -# -# Do not translate any values surrounded by {} - -blurb=Target Management Terminal Telnet Connector\n\ -\n\ -Version: {featureVersion}\n\ -\n\ -(c) Copyright Wind River Systems, Inc. and others 2003, 2015. All rights reserved.\n\ -Visit http://www.eclipse.org/tm diff --git a/plugins/org.eclipse.tm.terminal.telnet/build.properties b/plugins/org.eclipse.tm.terminal.telnet/build.properties deleted file mode 100644 index 894a288c13b..00000000000 --- a/plugins/org.eclipse.tm.terminal.telnet/build.properties +++ /dev/null @@ -1,29 +0,0 @@ -############################################################################### -# Copyright (c) 2003, 2015 Wind River Systems, Inc. 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 -# -# Initial Contributors: -# The following Wind River employees contributed to the Terminal component -# that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, -# Helmut Haigermoser and Ted Williams. -# -# Contributors: -# Michael Scharf (Wind River) - split into core, view and connector plugins -# Martin Oberhuber (Wind River) - fixed copyright headers and beautified -############################################################################### -bin.includes = .,\ - META-INF/,\ - plugin.xml,\ - plugin.properties,\ - about.html,\ - about.ini,\ - about.properties,\ - tm32.png - -source.. = src/ -output.. = bin/ -src.includes = about.html - diff --git a/plugins/org.eclipse.tm.terminal.telnet/plugin.properties b/plugins/org.eclipse.tm.terminal.telnet/plugin.properties deleted file mode 100644 index 1bd314f533d..00000000000 --- a/plugins/org.eclipse.tm.terminal.telnet/plugin.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2003, 2012 Wind River Systems, Inc. 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 -# -# Initial Contributors: -# The following Wind River employees contributed to the Terminal component -# that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, -# Helmut Haigermoser and Ted Williams. -# -# Contributors: -# Michael Scharf (Wind River) - split into core, view and connector plugins -# Martin Oberhuber (Wind River) - fixed copyright headers and beautified -############################################################################### -pluginName = Target Management Terminal Telnet Connector -providerName = Eclipse TM Project -telnetConnection = Telnet diff --git a/plugins/org.eclipse.tm.terminal.telnet/plugin.xml b/plugins/org.eclipse.tm.terminal.telnet/plugin.xml deleted file mode 100644 index 342c1f22727..00000000000 --- a/plugins/org.eclipse.tm.terminal.telnet/plugin.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - diff --git a/plugins/org.eclipse.tm.terminal.telnet/tm32.png b/plugins/org.eclipse.tm.terminal.telnet/tm32.png deleted file mode 100644 index 3077b1220dd..00000000000 Binary files a/plugins/org.eclipse.tm.terminal.telnet/tm32.png and /dev/null differ diff --git a/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF index fe02fcee652..a52b1f97166 100644 --- a/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 4.0.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.junit, - org.eclipse.tm.terminal;bundle-version="3.3.0", + org.eclipse.tm.terminal.control;bundle-version="4.0.0", org.eclipse.core.runtime, org.eclipse.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/org.eclipse.tm.terminal.test/plugin.xml b/plugins/org.eclipse.tm.terminal.test/plugin.xml index 827cde57f29..6af31403cd9 100644 --- a/plugins/org.eclipse.tm.terminal.test/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.test/plugin.xml @@ -1,7 +1,7 @@ - + - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.0.0-SNAPSHOT - ../../admin/pom-build.xml - - - 4.0.0.qualifier - org.eclipse.tm.terminal.view.ui.serial - eclipse-plugin - diff --git a/plugins/org.eclipse.tm.terminal.view.ui.ssh/pom.xml b/plugins/org.eclipse.tm.terminal.view.ui.ssh/pom.xml deleted file mode 100644 index 2bd950bfac3..00000000000 --- a/plugins/org.eclipse.tm.terminal.view.ui.ssh/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.0.0-SNAPSHOT - ../../admin/pom-build.xml - - - 4.0.0.qualifier - org.eclipse.tm.terminal.view.ui.ssh - eclipse-plugin - diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/.classpath b/plugins/org.eclipse.tm.terminal.view.ui.telnet/.classpath deleted file mode 100644 index ad32c83a788..00000000000 --- a/plugins/org.eclipse.tm.terminal.view.ui.telnet/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/.gitignore b/plugins/org.eclipse.tm.terminal.view.ui.telnet/.gitignore deleted file mode 100644 index ae3c1726048..00000000000 --- a/plugins/org.eclipse.tm.terminal.view.ui.telnet/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.view.ui.telnet/META-INF/MANIFEST.MF deleted file mode 100644 index a59348e7df4..00000000000 --- a/plugins/org.eclipse.tm.terminal.view.ui.telnet/META-INF/MANIFEST.MF +++ /dev/null @@ -1,22 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui.telnet;singleton:=true -Bundle-Version: 4.0.0.qualifier -Bundle-Activator: org.eclipse.tm.terminal.view.ui.telnet.activator.UIPlugin -Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.core.runtime;bundle-version="3.8.0", - org.eclipse.equinox.security;bundle-version="1.1.100", - org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", - org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0", - org.eclipse.tm.terminal;bundle-version="4.0.0", - org.eclipse.tm.terminal.telnet;bundle-version="4.0.0", - org.eclipse.ui;bundle-version="3.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-ActivationPolicy: lazy -Bundle-Localization: plugin -Export-Package: org.eclipse.tm.terminal.view.ui.telnet.activator;x-internal:=true, - org.eclipse.tm.terminal.view.ui.telnet.controls, - org.eclipse.tm.terminal.view.ui.telnet.launcher, - org.eclipse.tm.terminal.view.ui.telnet.nls;x-internal:=true diff --git a/plugins/org.eclipse.tm.terminal.view.ui.telnet/pom.xml b/plugins/org.eclipse.tm.terminal.view.ui.telnet/pom.xml deleted file mode 100644 index 048ecb27aad..00000000000 --- a/plugins/org.eclipse.tm.terminal.view.ui.telnet/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.0.0-SNAPSHOT - ../../admin/pom-build.xml - - - 4.0.0.qualifier - org.eclipse.tm.terminal.view.ui.telnet - eclipse-plugin - diff --git a/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF index 0b688d3f7af..b155075de8b 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.resources;bundle-version="3.8.1";resolution:=optional, org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", - org.eclipse.tm.terminal;bundle-version="4.0.0", + org.eclipse.tm.terminal.control;bundle-version="4.0.0", org.eclipse.ui;bundle-version="3.8.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml b/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml index 211f6eebe2b..10b076c165e 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml +++ b/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml @@ -109,7 +109,7 @@ - + - - - - - - diff --git a/plugins/org.eclipse.tm.terminal/.cvsignore b/plugins/org.eclipse.tm.terminal/.cvsignore deleted file mode 100644 index ba077a4031a..00000000000 --- a/plugins/org.eclipse.tm.terminal/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -bin diff --git a/plugins/org.eclipse.tm.terminal/.gitignore b/plugins/org.eclipse.tm.terminal/.gitignore deleted file mode 100644 index ae3c1726048..00000000000 --- a/plugins/org.eclipse.tm.terminal/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ diff --git a/plugins/org.eclipse.tm.terminal/about.ini b/plugins/org.eclipse.tm.terminal/about.ini deleted file mode 100644 index 3adc27ab587..00000000000 --- a/plugins/org.eclipse.tm.terminal/about.ini +++ /dev/null @@ -1,27 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%blurb - -# Property "windowImage" contains path to window icon (16x16) -# needed for primary features only - -# Property "featureImage" contains path to feature image (32x32) -featureImage=tm32.png - -# Property "aboutImage" contains path to product image (500x330 or 115x164) -# needed for primary features only - -# Property "appName" contains name of the application (not translated) -# needed for primary features only - -# Property "welcomePage" contains path to welcome page (special XML-based format) -# optional - -# Property "welcomePerspective" contains the id of the perspective in which the -# welcome page is to be opened. -# optional \ No newline at end of file diff --git a/plugins/org.eclipse.tm.terminal/tm32.png b/plugins/org.eclipse.tm.terminal/tm32.png deleted file mode 100644 index 3077b1220dd..00000000000 Binary files a/plugins/org.eclipse.tm.terminal/tm32.png and /dev/null differ diff --git a/pom.xml b/pom.xml index b482ab6927d..903566cc093 100644 --- a/pom.xml +++ b/pom.xml @@ -18,37 +18,46 @@ TM Terminal, Maven Master - - plugins/org.eclipse.tm.terminal - plugins/org.eclipse.tm.terminal.ssh - plugins/org.eclipse.tm.terminal.telnet - plugins/org.eclipse.tm.terminal.remote - + + plugins/org.eclipse.tm.terminal.control + features/org.eclipse.tm.terminal.feature features/org.eclipse.tm.terminal.sdk.feature - features/org.eclipse.tm.terminal.ssh.feature - features/org.eclipse.tm.terminal.ssh.sdk.feature - features/org.eclipse.tm.terminal.telnet.feature - features/org.eclipse.tm.terminal.telnet.sdk.feature + + + plugins/org.eclipse.tm.terminal.connector.local + plugins/org.eclipse.tm.terminal.connector.process + 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.serial.feature + features/org.eclipse.tm.terminal.connector.serial.sdk.feature + features/org.eclipse.tm.terminal.connector.ssh.feature + features/org.eclipse.tm.terminal.connector.ssh.sdk.feature + 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 - plugins/org.eclipse.tm.terminal.view.ui.local - plugins/org.eclipse.tm.terminal.view.ui.process plugins/org.eclipse.tm.terminal.view.ui.rse - plugins/org.eclipse.tm.terminal.view.ui.serial - plugins/org.eclipse.tm.terminal.view.ui.ssh - plugins/org.eclipse.tm.terminal.view.ui.telnet features/org.eclipse.tm.terminal.view.feature features/org.eclipse.tm.terminal.view.sdk.feature features/org.eclipse.tm.terminal.view.rse.feature features/org.eclipse.tm.terminal.view.rse.sdk.feature - features/org.eclipse.tm.terminal.view.serial.feature - features/org.eclipse.tm.terminal.view.serial.sdk.feature + + + features/org.eclipse.tm.terminal.feature + features/org.eclipse.tm.terminal.sdk.feature repos/org.eclipse.tm.terminal.repo diff --git a/repos/org.eclipse.tm.terminal.repo/category.xml b/repos/org.eclipse.tm.terminal.repo/category.xml index 689aed5042c..3d19634b4c9 100644 --- a/repos/org.eclipse.tm.terminal.repo/category.xml +++ b/repos/org.eclipse.tm.terminal.repo/category.xml @@ -1,22 +1,36 @@ - - + + - + - + + + - + - + - + + + + + + + + + + + + + @@ -39,10 +53,12 @@ - + + + - +