diff --git a/terminal/org.eclipse.tm.terminal.local-feature/build.properties b/terminal/org.eclipse.tm.terminal.local-feature/build.properties
index b722ad42340..15a8814960e 100644
--- a/terminal/org.eclipse.tm.terminal.local-feature/build.properties
+++ b/terminal/org.eclipse.tm.terminal.local-feature/build.properties
@@ -1,5 +1,5 @@
 ####################################################################################################
-# Copyright (c) 2008 Mirko Raner and others.
+# Copyright (c) 2008, 2010 Mirko Raner 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
@@ -7,9 +7,13 @@
 #
 # Contributors:
 # Mirko Raner - initial implementation for Eclipse Bug 196337
+# Martin Oberhuber (Wind River) - Import to Eclipse DSDP
 ####################################################################################################
 
 bin.includes = feature.xml,\
                feature.properties,\
                epl-v10.html,\
-               license.html
+               license.html,\
+               eclipse_update_120.jpg
+generate.plugin@org.eclipse.tm.terminal.local.source=org.eclipse.tm.terminal.local
+               
\ No newline at end of file
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/eclipse_update_120.jpg b/terminal/org.eclipse.tm.terminal.local-feature/eclipse_update_120.jpg
new file mode 100644
index 00000000000..bfdf708ad61
Binary files /dev/null and b/terminal/org.eclipse.tm.terminal.local-feature/eclipse_update_120.jpg differ
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/feature.properties b/terminal/org.eclipse.tm.terminal.local-feature/feature.properties
index e289100d181..4e7a98ffdce 100644
--- a/terminal/org.eclipse.tm.terminal.local-feature/feature.properties
+++ b/terminal/org.eclipse.tm.terminal.local-feature/feature.properties
@@ -1,5 +1,5 @@
 ####################################################################################################
-# Copyright (c) 2008 Mirko Raner and others.
+# Copyright (c) 2008, 2010 Mirko Raner 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
@@ -7,17 +7,42 @@
 #
 # Contributors:
 # Mirko Raner - initial implementation for Eclipse Bug 196337
+# Martin Oberhuber (Wind River) - Import to Eclipse DSDP
 ####################################################################################################
+# 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 Local Connector
-description=A local connector implementation for the Terminal.
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org - DSDP
+
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management Updates
+
+# "description" property - description of the feature
+description=A Terminal connector for local shells and external tools.\n\
+Requires CDT Core 7.0 or later. Includes Source.
+
+# "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2008 Mirko Raner and others.\n\
+Copyright (c) 2008, 2010 Mirko Raner 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\
 March 17, 2005\n\
@@ -115,3 +140,4 @@ regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n\
 \n\
 Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/feature.xml b/terminal/org.eclipse.tm.terminal.local-feature/feature.xml
index 3f4a937aa82..5df1fc52799 100644
--- a/terminal/org.eclipse.tm.terminal.local-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.local-feature/feature.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-# Copyright (c) 2008 Mirko Raner 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:
-# Mirko Raner - initial implementation for Eclipse Bug 196337
--->
+     Copyright (c) 2008, 2010 Mirko Raner 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:
+     Mirko Raner - initial implementation for Eclipse Bug 196337
+     Martin Oberhuber (Wind River) - Import to Eclipse DSDP
+ -->
 <feature id="org.eclipse.tm.terminal.local"
  label="%featureName"
  version="1.0.0.qualifier"
- provider-name="Mirko Raner">
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg">
 
  <description>
   %description
@@ -26,9 +28,20 @@
   %license
  </license>
 
+   <url>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+   </url>
+
+   <includes
+         id="org.eclipse.tm.terminal"
+         version="0.0.0"/>
+
  <requires>
+ <!--
   <import plugin="org.eclipse.tm.terminal" version="2.0.0" match="compatible"/>
-  <import plugin="org.eclipse.cdt.core" version="5.0.0" match="compatible"/>
+ -->
+  <import plugin="org.eclipse.cdt.core" version="7.0.0" match="compatible"/>
   <import plugin="org.eclipse.core.runtime"/>
   <import plugin="org.eclipse.debug.core"/>
   <import plugin="org.eclipse.debug.ui"/>
@@ -44,4 +57,18 @@
   unpack="false"
  />
 
+ <plugin
+  id="org.eclipse.tm.terminal.local.source"
+  download-size="0"
+  install-size="0"
+  version="0.0.0"
+  unpack="false"/>
+
+  <plugin
+         id="org.eclipse.tm.terminal.source"
+         download-size="103"
+         install-size="107"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/terminal/org.eclipse.tm.terminal.local/.cvsignore b/terminal/org.eclipse.tm.terminal.local/.cvsignore
new file mode 100644
index 00000000000..ba077a4031a
--- /dev/null
+++ b/terminal/org.eclipse.tm.terminal.local/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/terminal/org.eclipse.tm.terminal.local/.project b/terminal/org.eclipse.tm.terminal.local/.project
index 64ecfb91f82..cc0395aa2f2 100644
--- a/terminal/org.eclipse.tm.terminal.local/.project
+++ b/terminal/org.eclipse.tm.terminal.local/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/terminal/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs b/terminal/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs
index d75669d46ce..33f45eb1a3c 100644
--- a/terminal/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs
+++ b/terminal/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs
@@ -9,12 +9,12 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=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=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
+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=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
@@ -48,7 +48,7 @@ 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=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.potentialNullReference=warning
diff --git a/terminal/org.eclipse.tm.terminal.local/about.html b/terminal/org.eclipse.tm.terminal.local/about.html
index b2a8401691f..0df08787c7b 100644
--- a/terminal/org.eclipse.tm.terminal.local/about.html
+++ b/terminal/org.eclipse.tm.terminal.local/about.html
@@ -1,37 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--
-# Copyright (c) 2008 Mirko Raner 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:
-# Mirko Raner - initial implementation for Eclipse Bug 196337
--->
-<HTML>
- <HEAD>
-  <TITLE>About</TITLE>
-  <META HTTP-EQUIV=Content-Type CONTENT="text/html; charset=ISO-8859-1">
- </HEAD>
- <BODY LANG="EN-US">
-  <H2>About This Content</H2>
-  <P>
-  August 4, 2008
-  <P>	
-  <H3>License</H3>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>March 1, 2010</p>	
+<h3>License</h3>
 
-  Mirko Raner makes available all content in this plug-in (&quot;Content&quot;).
-  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of
-  the Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at
-  <A HREF="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-  For purposes of the EPL, &quot;Program&quot; will mean the Content.
-  <P>
-  If you did not receive this Content directly from Mirko Raner, the Content is
-  being redistributed by another party (&quot;Redistributor&quot;) and different terms and
-  conditions may apply to your use of any object code in the Content.  Check the Redistributor's
-  license that was provided with the Content.  If no such license exists, contact the Redistributor.
-  Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source
-  code in the Content.
- </BODY>
-</HTML>
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/terminal/org.eclipse.tm.terminal.local/about.ini b/terminal/org.eclipse.tm.terminal.local/about.ini
index 2d185b182ff..fbbb9f83db9 100644
--- a/terminal/org.eclipse.tm.terminal.local/about.ini
+++ b/terminal/org.eclipse.tm.terminal.local/about.ini
@@ -1,13 +1,27 @@
-####################################################################################################
-# Copyright (c) 2008 Mirko Raner 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:
-# Mirko Raner - initial implementation for Eclipse Bug 196337
-####################################################################################################
+# 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.
 
-featureImage=icons/terminal-local.png
-aboutText=%feature.information
+# 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=dsdp32.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/terminal/org.eclipse.tm.terminal.local/about.properties b/terminal/org.eclipse.tm.terminal.local/about.properties
index 5e2a9b09682..b8ac1b5f16e 100644
--- a/terminal/org.eclipse.tm.terminal.local/about.properties
+++ b/terminal/org.eclipse.tm.terminal.local/about.properties
@@ -1,5 +1,5 @@
 ####################################################################################################
-# Copyright (c) 2008 Mirko Raner and others.
+# Copyright (c) 2008, 2010 Mirko Raner 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
@@ -7,11 +7,13 @@
 #
 # Contributors:
 # Mirko Raner - initial implementation for Eclipse Bug 196337
+# Martin Oberhuber (Wind River) - Import to Eclipse DSDP
 ####################################################################################################
 
-feature.information=Target Management Terminal Local Connector\n\
+blurb=Target Management Terminal Local Connector\n\
 \n\
 Version: {featureVersion}\n\
+Build id: {0}\n\
 \n\
-(c) Copyright Mirko Raner and others, 2008.  All rights reserved.\n\
+(c) Copyright Mirko Raner and others 2008, 2010.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/terminal/org.eclipse.tm.terminal.local/build.properties b/terminal/org.eclipse.tm.terminal.local/build.properties
index 15b26046ff5..3986492a143 100644
--- a/terminal/org.eclipse.tm.terminal.local/build.properties
+++ b/terminal/org.eclipse.tm.terminal.local/build.properties
@@ -6,6 +6,7 @@ bin.includes = plugin.xml,\
                about.ini,\
                about.mappings,\
                about.properties,\
+               dsdp32.png,\
                icons/,\
                META-INF/,\
                .
diff --git a/terminal/org.eclipse.tm.terminal.local/dsdp32.png b/terminal/org.eclipse.tm.terminal.local/dsdp32.png
new file mode 100644
index 00000000000..3077b1220dd
Binary files /dev/null and b/terminal/org.eclipse.tm.terminal.local/dsdp32.png differ
diff --git a/terminal/org.eclipse.tm.terminal.local/icons/terminal-local.png b/terminal/org.eclipse.tm.terminal.local/icons/terminal-local.png
deleted file mode 100644
index f04a52044ac..00000000000
Binary files a/terminal/org.eclipse.tm.terminal.local/icons/terminal-local.png and /dev/null differ
diff --git a/terminal/org.eclipse.tm.terminal.local/plugin.properties b/terminal/org.eclipse.tm.terminal.local/plugin.properties
index 477118979e2..889471161e7 100644
--- a/terminal/org.eclipse.tm.terminal.local/plugin.properties
+++ b/terminal/org.eclipse.tm.terminal.local/plugin.properties
@@ -1,5 +1,5 @@
 ####################################################################################################
-# Copyright (c) 2008 Mirko Raner and others.
+# Copyright (c) 2008, 2010 Mirko Raner 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
@@ -7,10 +7,14 @@
 #
 # Contributors:
 # Mirko Raner - initial implementation for Eclipse Bug 196337
+# Martin Oberhuber (Wind River) - Import to Eclipse DSDP
 ####################################################################################################
 
+# NLS_MESSAGEFORMAT_NONE
+
 pluginName=Local Terminal Connector
-providerName=Mirko Raner
+providerName=Eclipse.org - DSDP
+
 terminalLaunch=Terminal
 terminalLaunchDescription=Run a program in a terminal
 localConnection=Local program