Merge pull request #261 from Microsoft/users/ermeckle/gdpr_compliance

Remove telemetry data that conflicts with GDPR requirements

build/build-1-config.xml

@@ -29,8 +29,8 @@
 		number.version.minor 	("0")
 		number.version.service 	("2")
 		number.version.build	("1234XYZ")
-		string.version.1-2-3	("14.123.1")
-		string.version.1-2-3-4  ("14.123.1.1234XYZ")
+		string.version.1-2-3	("14.134.0")
+		string.version.1-2-3-4  ("14.134.0.1234XYZ")
 	-->
 	<target name="read_version_config">
 

build/category.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.microsoft.tfs.client.eclipse.feature_14.123.1.qualifier.jar" id="com.microsoft.tfs.client.eclipse.feature" version="14.123.1.qualifier">
+   <feature url="features/com.microsoft.tfs.client.eclipse.feature_14.134.0.qualifier.jar" id="com.microsoft.tfs.client.eclipse.feature" version="14.134.0.qualifier">
       <category name="com.microsoft.tfs.client.eclipse.category"/>
    </feature>
-   <feature url="features/com.microsoft.tfs.client.eclipse.nl1.feature_14.123.1.qualifier.jar" id="com.microsoft.tfs.client.eclipse.nl1.feature" version="14.123.1.qualifier">
+   <feature url="features/com.microsoft.tfs.client.eclipse.nl1.feature_14.134.0.qualifier.jar" id="com.microsoft.tfs.client.eclipse.nl1.feature" version="14.134.0.qualifier">
       <category name="com.microsoft.tfs.client.eclipse.category"/>
    </feature>
-   <feature url="features/com.microsoft.tfs.client.eclipse.nlz.feature_14.123.1.qualifier.jar" id="com.microsoft.tfs.client.eclipse.nlz.feature" version="14.123.1.qualifier">
+   <feature url="features/com.microsoft.tfs.client.eclipse.nlz.feature_14.134.0.qualifier.jar" id="com.microsoft.tfs.client.eclipse.nlz.feature" version="14.134.0.qualifier">
       <category name="com.microsoft.tfs.client.eclipse.language-packs.category"/>
    </feature>
-   <feature url="features/com.microsoft.tfs.pt.alertsubscription.feature_14.123.1.qualifier.jar" id="com.microsoft.tfs.pt.alertsubscription.feature" version="14.123.1.qualifier">
+   <feature url="features/com.microsoft.tfs.pt.alertsubscription.feature_14.134.0.qualifier.jar" id="com.microsoft.tfs.pt.alertsubscription.feature" version="14.134.0.qualifier">
       <category name="com.microsoft.tfs.pt.category"/>
    </feature>
-   <feature url="features/com.microsoft.tfs.pt.findinsce.feature_14.123.1.qualifier.jar" id="com.microsoft.tfs.pt.findinsce.feature" version="14.123.1.qualifier">
+   <feature url="features/com.microsoft.tfs.pt.findinsce.feature_14.134.0.qualifier.jar" id="com.microsoft.tfs.pt.findinsce.feature" version="14.134.0.qualifier">
       <category name="com.microsoft.tfs.pt.category"/>
    </feature>
-   <feature url="features/com.microsoft.tfs.pt.testrunner.feature_14.123.1.qualifier.jar" id="com.microsoft.tfs.pt.testrunner.feature" version="14.123.1.qualifier">
+   <feature url="features/com.microsoft.tfs.pt.testrunner.feature_14.134.0.qualifier.jar" id="com.microsoft.tfs.pt.testrunner.feature" version="14.134.0.qualifier">
       <category name="com.microsoft.tfs.pt.category"/>
    </feature>
-   <feature url="features/com.microsoft.tfs.pt.wit.templates.feature_14.123.1.qualifier.jar" id="com.microsoft.tfs.pt.wit.templates.feature" version="14.123.1.qualifier">
+   <feature url="features/com.microsoft.tfs.pt.wit.templates.feature_14.134.0.qualifier.jar" id="com.microsoft.tfs.pt.wit.templates.feature" version="14.134.0.qualifier">
       <category name="com.microsoft.tfs.pt.category"/>
    </feature>
    <category-def name="com.microsoft.tfs.client.eclipse.category" label="Team Explorer Everywhere">

build/product_version.properties

@@ -1,7 +1,7 @@
-# This comment contains the full version number (14.123.1) so this file gets
+# This comment contains the full version number (14.134.0) so this file gets
 # picked up when doing workspace searches for the version number string.
 
 number.version.major=14
-number.version.minor=123
-number.version.service=1
+number.version.minor=134
+number.version.service=0
 # number.version.build gets defined at build time.

source/com.microsoft.tfs.checkinpolicies.build/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.checkinpolicies.build; singleton:=true
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Activator: com.microsoft.tfs.checkinpolicies.build.TFSBuildCheckinPolicyPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin

source/com.microsoft.tfs.checkinpolicies.checkforcomments/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.checkinpolicies.checkforcomments; singleton:=true
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Export-Package: com.microsoft.tfs.checkinpolicies.checkforcomments

source/com.microsoft.tfs.checkinpolicies.forbiddenpatterns/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.checkinpolicies.forbiddenpatterns; singleton:=true
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Export-Package: com.microsoft.tfs.checkinpolicies.forbiddenpatterns,

source/com.microsoft.tfs.checkinpolicies.workitempolicy/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.checkinpolicies.workitempolicy; singleton:=true
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,

source/com.microsoft.tfs.checkinpolicies.workitemquerypolicy/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.checkinpolicies.workitemquerypolicy; singleton:=true
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Export-Package: com.microsoft.tfs.checkinpolicies.workitemquerypolicy,

source/com.microsoft.tfs.checkinpolicies/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.checkinpolicies; singleton:=true
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Activator: com.microsoft.tfs.checkinpolicies.TFSCheckinPoliciesPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin

source/com.microsoft.tfs.client.clc.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="com.microsoft.tfs.client.clc.feature"
       label="%Feature-Name"
-      version="14.123.1.qualifier"
+      version="14.134.0.qualifier"
       provider-name="%Feature-Vendor">
 
    <description>

source/com.microsoft.tfs.client.clc/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.client.clc
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Require-Bundle: com.microsoft.tfs.console,

source/com.microsoft.tfs.client.common.pid/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.client.common.pid
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

source/com.microsoft.tfs.client.common.ui.teambuild.egit/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.client.common.ui.teambuild.egit;singleton:=true
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

source/com.microsoft.tfs.client.common.ui.teambuild/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.client.common.ui.teambuild; singleton:=true
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Activator: com.microsoft.tfs.client.common.ui.teambuild.TFSTeamBuildPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin

source/com.microsoft.tfs.client.common.ui.vcexplorer/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.client.common.ui.vcexplorer; singleton:=true
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Activator: com.microsoft.tfs.client.common.ui.vcexplorer.TFSVersionControlExplorerPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin

source/com.microsoft.tfs.client.common.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.client.common.ui; singleton:=true
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Activator: com.microsoft.tfs.client.common.ui.TFSCommonUIClientPlugin
 Bundle-Vendor: %Bundle-Vendor
 Eclipse-LazyStart: true

source/com.microsoft.tfs.client.common.ui/src/com/microsoft/tfs/client/common/ui/feedback/FeedbackAction.java

@@ -33,7 +33,6 @@ public void doRun(final IAction action) {
         if (dialog.open() == IDialogConstants.OK_ID) {
             final Map<String, String> properties = new HashMap<String, String>();
             properties.put(TfsTelemetryConstants.FEEDBACK_PROPERTY_COMMENT, dialog.getComment());
-            properties.put(TfsTelemetryConstants.FEEDBACK_PROPERTY_EMAIL, dialog.getEmail());
             properties.put(TfsTelemetryConstants.FEEDBACK_PROPERTY_CONTEXT, feedbackContext);
 
             final String eventName = smile ? CMD_SEND_SMILE : CMD_SEND_FROWN;

source/com.microsoft.tfs.client.common.ui/src/com/microsoft/tfs/client/common/ui/feedback/FeedbackDialog.java

@@ -9,13 +9,10 @@
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.TraverseEvent;
 import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontMetrics;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.layout.GridData;
@@ -31,16 +28,10 @@
 import com.microsoft.tfs.client.common.ui.controls.generic.compatibility.link.CompatibilityLinkControl;
 import com.microsoft.tfs.client.common.ui.controls.generic.compatibility.link.CompatibilityLinkFactory;
 import com.microsoft.tfs.client.common.ui.framework.dialog.BaseDialog;
-import com.microsoft.tfs.client.common.ui.framework.helper.FontHelper;
 import com.microsoft.tfs.client.common.ui.framework.helper.SWTUtil;
 import com.microsoft.tfs.client.common.ui.framework.layout.GridDataBuilder;
-import com.microsoft.tfs.client.common.ui.framework.validation.AbstractTextControlValidator;
 import com.microsoft.tfs.client.common.ui.framework.validation.ButtonValidatorBinding;
 import com.microsoft.tfs.core.util.URIUtils;
-import com.microsoft.tfs.util.StringUtil;
-import com.microsoft.tfs.util.email.EmailAddressParser;
-import com.microsoft.tfs.util.valid.IValidity;
-import com.microsoft.tfs.util.valid.Validity;
 
 public class FeedbackDialog extends BaseDialog {
 
@@ -55,13 +46,7 @@ public class FeedbackDialog extends BaseDialog {
     private final boolean smile;
 
     private Text commentText;
-    private Text emailText;
-    private EmailAddressValidator validator;
-    private Label emailErrorMessageLabel;
-    private Font emailErrorMessageFont;
-
     private String commentString;
-    private String emailString;
 
     public FeedbackDialog(final Shell parentShell, final boolean smile) {
         super(parentShell);
@@ -123,40 +108,6 @@ public void keyTraversed(TraverseEvent e) {
             }
         });
 
-        final Label emailLabel = SWTUtil.createLabel(dialogArea, Messages.getString("FeedbackDialog.EmailLabel"));//$NON-NLS-1$
-        GridDataBuilder.newInstance().hSpan(layout).hFill().hGrab().applyTo(emailLabel);
-
-        emailText = new Text(dialogArea, SWT.SINGLE | SWT.BORDER);
-        GridDataBuilder.newInstance().hSpan(layout).hFill().hGrab().applyTo(emailText);
-        emailText.setTextLimit(MAX_APP_INSIGHTS_PROPERTY_SIZE);
-
-        /*
-         * Create a validator for the email textbox. Make sure to hook up the
-         * text box modifier listeners (if any) after the validator so that the
-         * validator gets run before the validation of all fields.
-         */
-        validator = new EmailAddressValidator(emailText);
-
-        emailErrorMessageLabel = SWTUtil.createLabel(dialogArea, SWT.WRAP, StringUtil.EMPTY);
-        emailErrorMessageFont =
-            new Font(getShell().getDisplay(), FontHelper.italicize(emailErrorMessageLabel.getFont().getFontData()));
-        emailErrorMessageLabel.setFont(emailErrorMessageFont);
-        /*
-         * Reserve three lines for the error messages. They could be pretty
-         * wordy.
-         */
-        GridDataBuilder.newInstance().hSpan(layout).hFill().hGrab().hHint(commentTextFontHeight * 3).applyTo(
-            emailErrorMessageLabel);
-
-        emailErrorMessageLabel.addDisposeListener(new DisposeListener() {
-            @Override
-            public void widgetDisposed(final DisposeEvent e) {
-                if (emailErrorMessageFont != null) {
-                    emailErrorMessageFont.dispose();
-                }
-            }
-        });
-
         final Label thankYouLabel =
             SWTUtil.createLabel(dialogArea, SWT.WRAP, Messages.getString("FeedbackDialog.ThankYouLabel")); //$NON-NLS-1$
         GridDataBuilder.newInstance().hSpan(layout).vIndent(getVerticalSpacing()).wHint(
@@ -176,60 +127,17 @@ public void widgetSelected(final SelectionEvent e) {
         });
     }
 
-    @Override
-    protected void hookAfterButtonsCreated() {
-        new ButtonValidatorBinding(getButton(IDialogConstants.OK_ID)).bind(validator);
-    }
-
     @Override
     protected void okPressed() {
         // grab the values
         // If there are new lines or carriage returns the events do not go
         // through.
         // TODO -- move this lower in the stack?
         commentString = commentText.getText().replaceAll("\\n|\\r", " ");//$NON-NLS-1$ //$NON-NLS-2$
-        emailString = emailText.getText() == null ? StringUtil.EMPTY : emailText.getText().trim();
         super.okPressed();
     }
 
     public String getComment() {
         return commentString;
     }
-
-    public String getEmail() {
-        return emailString;
-    }
-
-    public class EmailAddressValidator extends AbstractTextControlValidator {
-
-        private final EmailAddressParser parser;
-
-        public EmailAddressValidator(final Text subject) {
-            super(subject);
-            parser = new EmailAddressParser();
-            validate();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        protected IValidity computeValidity(String text) {
-            if (emailErrorMessageLabel == null) {
-                /*
-                 * Not all controls are created yet.
-                 */
-                return Validity.VALID;
-            }
-
-            if (parser.parse(text)) {
-                emailErrorMessageLabel.setText(StringUtil.EMPTY);
-                return Validity.VALID;
-            } else {
-                final String erorMessage = parser.getErrorMessage();
-                emailErrorMessageLabel.setText(erorMessage);
-                return Validity.invalid(erorMessage);
-            }
-        }
-    }
 }

source/com.microsoft.tfs.client.common/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.client.common; singleton:=true
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Activator: com.microsoft.tfs.client.common.TFSCommonClientPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin

source/com.microsoft.tfs.client.eclipse.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="com.microsoft.tfs.client.eclipse.feature"
       label="%Feature-Name"
-      version="14.123.1.qualifier"
+      version="14.134.0.qualifier"
       provider-name="%Feature-Vendor"
       plugin="com.microsoft.tfs.client.eclipse.ui">
 

source/com.microsoft.tfs.client.eclipse.help/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.tfs.client.eclipse.help; singleton:=true
-Bundle-Version: 14.123.1.qualifier
+Bundle-Version: 14.134.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Eclipse-LazyStart: true

source/com.microsoft.tfs.client.eclipse.help/content/InstallTEE.htm

@@ -515,7 +515,7 @@ <h4 class="subHeading" xmlns=""><b>To install the plug-in from the update site a
 							the internet or the organization prefers that a specific version of the plug-in is installed by everyone then following 
 							method may more suitable.<p></p>
 						</td></tr></table><p></p></div>
-							<li>Use the link on this page to download TFSEclipsePlugin-UpdateSiteArchive-14.123.1.zip.</li>
+							<li>Use the link on this page to download TFSEclipsePlugin-UpdateSiteArchive-14.134.0.zip.</li>
 							<li>Open Eclipse.</li>
 							<li>On the <b>Help</b> menu, choose <b>Install New Software</b>. </li>
 							<li>The <b>Install</b> dialog box appears. </li>
@@ -524,7 +524,7 @@ <h4 class="subHeading" xmlns=""><b>To install the plug-in from the update site a
 							<li>For the name, enter "Local Team Explorer Everywhere update archive".</li>
 							<li>Choose the <b>Archive</b> button.</li>
 							<li>The <b>Repository archive</b> dialog box appears.</li>
-							<li>Find and select the downloaded "<b>TFSEclipsePlugin-UpdateSiteArchive-14.123.1.zip</b>" file as the File name.</li>
+							<li>Find and select the downloaded "<b>TFSEclipsePlugin-UpdateSiteArchive-14.134.0.zip</b>" file as the File name.</li>
 							<li> Choose the <b>Open</b> button.</li>
 							<li>Choose the <b>OK</b> button. </li>
 							<li>In the list of features in the Install dialog box, select the check box that corresponds to the <b>Team Explorer Everywhere Plug-in for Eclipse</b>.</li>
@@ -538,12 +538,12 @@ <h4 class="subHeading" xmlns=""><b>To install the plug-in from the update site a
 					<p xmlns="">You can perform many version control operations from the Cross-platform Command-line Client for Team Foundation Server. Before you can use this client, you must install it and configure your shell or system path to include the installation folder.</p>
 					<h4 class="subHeading" xmlns=""><b>To install the Cross-Platform Command-Line Client for Team Foundation Server</b></h4><div class="subSection" xmlns=""><ddue:steps xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5">
 						<ol>
-							<li>Use the link on this page to download TEE-CLC-14.123.1.zip.</li>
-							<li>Unzip the archive (TEE-CLC-14.123.1.zip file) that contains the client.</li>
+							<li>Use the link on this page to download TEE-CLC-14.134.0.zip.</li>
+							<li>Unzip the archive (TEE-CLC-14.134.0.zip file) that contains the client.</li>
 							<li>Configure your shell or system path to include the folder to which you unzipped the archive.</li>
 							<li>To verify that the client is working, at a command prompt, type <b>tf</b>, and then press the ENTER key.</li>
 						</ol>
-						If the client is correctly installed, output appears, starting with "Microsoft Team Explorer Everywhere Command-line Client (version 14.123.1)".<br/>
+						If the client is correctly installed, output appears, starting with "Microsoft Team Explorer Everywhere Command-line Client (version 14.134.0)".<br/>
 						<br/>
 						For information about any of the commands, you can type <b>tf help Command</b>, where <b>Command</b> is the name of the command for which you want information. For example, you could type <b>tf help checkin</b>. You can also type <b>tf command /help</b> or <b>tf command -help</b> to obtain help.<br/><br/>
 						<div class="alert" xmlns=""><table width="100%" cellspacing="0" cellpadding="0"><tr><th align="left">Note </th></tr><tr><td>