From 65d50f97c94d5c63c7a970f5961e4baf10c3a67f Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 17 Dec 2015 12:10:58 +0300
Subject: [PATCH] don't specify ITNReporter as errorHandler explicitly, it is
 automatically used for exception from plugins which vendor is JetBrains

---
 images/src/META-INF/ImagesPlugin.xml                           | 1 -
 platform/structuralsearch/source/META-INF/structuralsearch.xml | 1 -
 plugins/ByteCodeViewer/src/META-INF/plugin.xml                 | 1 -
 plugins/IntelliLang/src/META-INF/plugin.xml                    | 1 -
 plugins/ShortcutPromoter/resources/META-INF/plugin.xml         | 1 -
 plugins/ant/src/META-INF/plugin.xml                            | 1 -
 plugins/commander/src/META-INF/plugin.xml                      | 1 -
 plugins/copyright/src/META-INF/plugin.xml                      | 1 -
 plugins/coverage/src/META-INF/plugin.xml                       | 1 -
 plugins/cvs/cvs-plugin/src/META-INF/plugin.xml                 | 1 -
 plugins/devkit/resources/META-INF/plugin.xml                   | 1 -
 plugins/eclipse/resources/META-INF/plugin.xml                  | 1 -
 plugins/editorconfig/src/META-INF/plugin.xml                   | 1 -
 plugins/git4idea/src/META-INF/plugin.xml                       | 1 -
 plugins/github/src/META-INF/plugin.xml                         | 1 -
 plugins/gradle/src/META-INF/plugin.xml                         | 1 -
 plugins/groovy/src/META-INF/plugin.xml                         | 1 -
 plugins/hg4idea/src/META-INF/plugin.xml                        | 1 -
 plugins/java-decompiler/plugin/src/META-INF/plugin.xml         | 1 -
 plugins/java-i18n/src/META-INF/plugin.xml                      | 1 -
 plugins/javaFX/src/META-INF/common-javaFX-plugin.xml           | 1 -
 plugins/junit/src/META-INF/plugin.xml                          | 1 -
 plugins/maven/src/main/resources/META-INF/plugin.xml           | 1 -
 plugins/properties/src/META-INF/plugin.xml                     | 1 -
 plugins/settings-repository/resources/META-INF/plugin.xml      | 1 -
 plugins/svn4idea/src/META-INF/plugin.xml                       | 1 -
 plugins/tasks/tasks-core/src/META-INF/plugin.xml               | 1 -
 plugins/terminal/resources/META-INF/plugin.xml                 | 3 ---
 plugins/testng/src/META-INF/plugin.xml                         | 1 -
 plugins/ui-designer/src/META-INF/plugin.xml                    | 1 -
 plugins/xpath/xpath-view/src/META-INF/plugin.xml               | 1 -
 plugins/xslt-debugger/src/META-INF/plugin.xml                  | 1 -
 python/IntelliLang-python/resources/META-INF/plugin.xml        | 3 ---
 python/edu/course-creator-python/resources/META-INF/plugin.xml | 1 -
 .../educational/course-creator/resources/META-INF/plugin.xml   | 1 -
 .../interactive-learning/resources/META-INF/plugin.xml         | 1 -
 python/ipnb/resources/META-INF/plugin.xml                      | 3 ---
 python/python-rest/resources/META-INF/plugin.xml               | 3 ---
 python/rest/resources/META-INF/plugin.xml                      | 3 ---
 python/src/META-INF/python-core.xml                            | 1 -
 spellchecker/src/META-INF/SpellCheckerPlugin.xml               | 2 --
 xml/relaxng/src/META-INF/relaxng-plugin.xml                    | 1 -
 42 files changed, 53 deletions(-)

diff --git a/images/src/META-INF/ImagesPlugin.xml b/images/src/META-INF/ImagesPlugin.xml
index 83ead95b51e3..dbcf2506bf9d 100644
--- a/images/src/META-INF/ImagesPlugin.xml
+++ b/images/src/META-INF/ImagesPlugin.xml
@@ -3,7 +3,6 @@
   <vendor>JetBrains</vendor>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <search.topHitProvider implementation="org.intellij.images.options.impl.ImagesOptionsTopHitProvider"/>
     <applicationConfigurable groupId="editor" instance="org.intellij.images.options.impl.OptionsConfigurabe" id="Images" displayName="Images"/>
     <fileEditorProvider implementation="org.intellij.images.editor.impl.ImageFileEditorProvider"/>
diff --git a/platform/structuralsearch/source/META-INF/structuralsearch.xml b/platform/structuralsearch/source/META-INF/structuralsearch.xml
index 96611ee2e9dc..3ef98f6a2c54 100644
--- a/platform/structuralsearch/source/META-INF/structuralsearch.xml
+++ b/platform/structuralsearch/source/META-INF/structuralsearch.xml
@@ -8,7 +8,6 @@
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <localInspection shortName="SSBasedInspection" bundle="messages.SSRBundle" key="SSRInspection.display.name" groupName="General"
                      enabledByDefault="false" level="WARNING"
                      implementationClass="com.intellij.structuralsearch.inspection.highlightTemplate.SSBasedInspection"/>
diff --git a/plugins/ByteCodeViewer/src/META-INF/plugin.xml b/plugins/ByteCodeViewer/src/META-INF/plugin.xml
index 11b22ae2d3de..e1799b7b8323 100644
--- a/plugins/ByteCodeViewer/src/META-INF/plugin.xml
+++ b/plugins/ByteCodeViewer/src/META-INF/plugin.xml
@@ -12,7 +12,6 @@
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <projectService serviceInterface="com.intellij.byteCodeViewer.ByteCodeViewerManager"
                     serviceImplementation="com.intellij.byteCodeViewer.ByteCodeViewerManager"/>
   </extensions>
diff --git a/plugins/IntelliLang/src/META-INF/plugin.xml b/plugins/IntelliLang/src/META-INF/plugin.xml
index 7c756c2a5f47..51515dbf5a86 100644
--- a/plugins/IntelliLang/src/META-INF/plugin.xml
+++ b/plugins/IntelliLang/src/META-INF/plugin.xml
@@ -27,7 +27,6 @@
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter" />
     <intentionAction>
       <className>org.intellij.plugins.intelliLang.inject.InjectLanguageAction</className>
       <category>Language Injection</category>
diff --git a/plugins/ShortcutPromoter/resources/META-INF/plugin.xml b/plugins/ShortcutPromoter/resources/META-INF/plugin.xml
index a9a1188b3c77..0ea57fcaabed 100644
--- a/plugins/ShortcutPromoter/resources/META-INF/plugin.xml
+++ b/plugins/ShortcutPromoter/resources/META-INF/plugin.xml
@@ -15,7 +15,6 @@
     <extensionPoint qualifiedName="com.intellij.shortcutPromoter" beanClass="com.intellij.promoter.ShortcutPromoterEP"/>
   </extensionPoints>
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <shortcutPromoter actionId="Debug" skip="3" repeat="2"/>
   </extensions>
 </idea-plugin>
diff --git a/plugins/ant/src/META-INF/plugin.xml b/plugins/ant/src/META-INF/plugin.xml
index 0fc677c00e5a..def130955ae0 100644
--- a/plugins/ant/src/META-INF/plugin.xml
+++ b/plugins/ant/src/META-INF/plugin.xml
@@ -19,7 +19,6 @@
     <projectService serviceInterface="com.intellij.lang.ant.config.AntConfiguration" serviceImplementation="com.intellij.lang.ant.config.impl.AntConfigurationImpl"/>
     <projectService serviceInterface="com.intellij.lang.ant.config.impl.AntWorkspaceConfiguration" serviceImplementation="com.intellij.lang.ant.config.impl.AntWorkspaceConfiguration"/>
 
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <renameHandler implementation="com.intellij.lang.ant.refactoring.AntRenameHandler"/>
     <stepsBeforeRunProvider implementation="com.intellij.lang.ant.config.impl.AntBeforeRunTaskProvider"/>
     <antBuildGen implementation="com.intellij.lang.ant.config.impl.artifacts.AntArtifactBuildExtension"/>
diff --git a/plugins/commander/src/META-INF/plugin.xml b/plugins/commander/src/META-INF/plugin.xml
index df08a75aa3ac..c0cf9bec72e7 100644
--- a/plugins/commander/src/META-INF/plugin.xml
+++ b/plugins/commander/src/META-INF/plugin.xml
@@ -8,7 +8,6 @@
   <resource-bundle>com.intellij.ide.commander.CommanderBundle</resource-bundle>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <selectInTarget implementation="com.intellij.ide.commander.CommanderSelectInTarget"/>
     <toolWindow id="Commander" anchor="right" icon="AllIcons.Toolwindows.ToolWindowCommander"
                 factoryClass="com.intellij.ide.commander.CommanderToolWindowFactory"/>
diff --git a/plugins/copyright/src/META-INF/plugin.xml b/plugins/copyright/src/META-INF/plugin.xml
index 4cf092c41e8d..87b49a360163 100644
--- a/plugins/copyright/src/META-INF/plugin.xml
+++ b/plugins/copyright/src/META-INF/plugin.xml
@@ -14,7 +14,6 @@
 
     <extensions defaultExtensionNs="com.intellij">
       <projectConfigurable groupId="editor" groupWeight="110" dynamic="true" displayName="Copyright" id="copyright" instance="com.maddyhome.idea.copyright.ui.CopyrightProjectConfigurable"/>
-      <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
       <checkinHandlerFactory implementation="com.maddyhome.idea.copyright.actions.UpdateCopyrightCheckinHandlerFactory"/>
       <applicationService serviceInterface="com.maddyhome.idea.copyright.util.FileTypeUtil"
                           serviceImplementation="com.maddyhome.idea.copyright.util.FileTypeUtil"/>
diff --git a/plugins/coverage/src/META-INF/plugin.xml b/plugins/coverage/src/META-INF/plugin.xml
index 64ae4a93d9c1..3b0b3ac8f3cd 100644
--- a/plugins/coverage/src/META-INF/plugin.xml
+++ b/plugins/coverage/src/META-INF/plugin.xml
@@ -25,7 +25,6 @@
     <coverageEngine implementation="com.intellij.coverage.JavaCoverageEngine" order = "last"/>
     <projectViewNodeDecorator implementation="com.intellij.coverage.CoverageProjectViewClassNodeDecorator"/>
 
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <projectService serviceInterface="com.intellij.coverage.JavaCoverageAnnotator"
                     serviceImplementation="com.intellij.coverage.JavaCoverageAnnotator"/>
     <programRunner implementation="com.intellij.coverage.DefaultJavaCoverageRunner"/>
diff --git a/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml b/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
index f5abd5ad6561..e6d2cfc6902a 100644
--- a/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
+++ b/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
@@ -21,7 +21,6 @@
   <depends>com.intellij.modules.vcs</depends>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <checkoutProvider implementation="com.intellij.cvsSupport2.checkout.CvsCheckoutProvider"/>
 
     <applicationService serviceInterface="com.intellij.openapi.cvsIntegration.CvsServices"
diff --git a/plugins/devkit/resources/META-INF/plugin.xml b/plugins/devkit/resources/META-INF/plugin.xml
index 41233431a8b6..cd94c697cb8a 100644
--- a/plugins/devkit/resources/META-INF/plugin.xml
+++ b/plugins/devkit/resources/META-INF/plugin.xml
@@ -16,7 +16,6 @@
   <resource-bundle>org.jetbrains.idea.devkit.DevKitBundle</resource-bundle>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
 
     <runLineMarkerContributor language="JAVA" implementationClass="org.jetbrains.idea.devkit.testAssistant.TestDataLineMarkerProvider"/>
     <fileEditorProvider implementation="org.jetbrains.idea.devkit.testAssistant.TestDataGroupEditorProvider"/>
diff --git a/plugins/eclipse/resources/META-INF/plugin.xml b/plugins/eclipse/resources/META-INF/plugin.xml
index a1a60cd1af8a..bd6e50f5e5d1 100644
--- a/plugins/eclipse/resources/META-INF/plugin.xml
+++ b/plugins/eclipse/resources/META-INF/plugin.xml
@@ -23,7 +23,6 @@
     <projectImportProvider implementation="org.jetbrains.idea.eclipse.importWizard.EclipseProjectImportProvider"/>
     <projectOpenProcessor id="EclipseProjectOpenProcessor" implementation="org.jetbrains.idea.eclipse.importWizard.EclipseProjectOpenProcessor"/>
     <projectImportBuilder implementation="org.jetbrains.idea.eclipse.importWizard.EclipseImportBuilder"/>
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <fileTypeFactory implementation="org.jetbrains.idea.eclipse.config.EclipseFileTypeFactory"/>
     <syntaxHighlighter key="Eclipse" implementationClass="com.intellij.ide.highlighter.XmlFileHighlighter"/>
     <schemeImporter 
diff --git a/plugins/editorconfig/src/META-INF/plugin.xml b/plugins/editorconfig/src/META-INF/plugin.xml
index 67bfa220dc1c..46da828af5eb 100644
--- a/plugins/editorconfig/src/META-INF/plugin.xml
+++ b/plugins/editorconfig/src/META-INF/plugin.xml
@@ -20,7 +20,6 @@
     <fileIndentOptionsProvider implementation="org.editorconfig.configmanagement.EditorConfigIndentOptionsProvider" />
     <editorNotificationProvider implementation="org.editorconfig.plugincomponents.EditorConfigNotifierProvider"/>
     <applicationService serviceInterface="org.editorconfig.plugincomponents.SettingsProviderComponent" serviceImplementation="org.editorconfig.plugincomponents.SettingsProviderComponent" />
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
   </extensions>
 
   <project-components>
diff --git a/plugins/git4idea/src/META-INF/plugin.xml b/plugins/git4idea/src/META-INF/plugin.xml
index 63f80e4d132a..1ad6bee16fcf 100644
--- a/plugins/git4idea/src/META-INF/plugin.xml
+++ b/plugins/git4idea/src/META-INF/plugin.xml
@@ -123,7 +123,6 @@
   </actions>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <search.topHitProvider implementation="git4idea.config.GitOptionsTopHitProvider"/>
     <vcs name="Git" vcsClass="git4idea.GitVcs" displayName="Git" administrativeAreaName=".git"/>
     <checkoutProvider implementation="git4idea.checkout.GitCheckoutProvider"/>
diff --git a/plugins/github/src/META-INF/plugin.xml b/plugins/github/src/META-INF/plugin.xml
index d3dfa7ab4501..a9ecc1ef27cc 100644
--- a/plugins/github/src/META-INF/plugin.xml
+++ b/plugins/github/src/META-INF/plugin.xml
@@ -19,7 +19,6 @@
   <depends optional="true" config-file="github-tracker.xml">com.intellij.tasks</depends>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <checkoutProvider implementation="org.jetbrains.plugins.github.extensions.GithubCheckoutProvider"/>
     <applicationService serviceInterface="org.jetbrains.plugins.github.util.GithubSettings"
                         serviceImplementation="org.jetbrains.plugins.github.util.GithubSettings"/>
diff --git a/plugins/gradle/src/META-INF/plugin.xml b/plugins/gradle/src/META-INF/plugin.xml
index 77042a46b92a..cb72d638bb0b 100644
--- a/plugins/gradle/src/META-INF/plugin.xml
+++ b/plugins/gradle/src/META-INF/plugin.xml
@@ -83,7 +83,6 @@
 
     <resolveScopeEnlarger implementation="org.jetbrains.plugins.gradle.config.GradleBuildClasspathResolveScopeEnlarger"/>
 
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <testActionProvider implementation="org.jetbrains.plugins.gradle.execution.test.runner.OpenGradleTestResultActionProvider"/>
     <runConfigurationProducer implementation="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer"
                               order="last"/>
diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index a037153a83c7..c6841ae73294 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -289,7 +289,6 @@
                                             implementationClass="org.jetbrains.plugins.groovy.annotator.intentions.GroovyCreateFieldFromUsageHelper"/>
     <codeInsight.typeInfo language="Groovy" implementationClass="org.jetbrains.plugins.groovy.codeInsight.hint.GroovyExpressionTypeProvider"/>
 
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <fileTypeFactory implementation="org.jetbrains.plugins.groovy.GroovyFileTypeLoader"/>
     <fileTypeFactory implementation="org.jetbrains.plugins.groovy.dgm.DGMFileTypeFactory"/>
 
diff --git a/plugins/hg4idea/src/META-INF/plugin.xml b/plugins/hg4idea/src/META-INF/plugin.xml
index d8d15401b646..92d264e5a097 100644
--- a/plugins/hg4idea/src/META-INF/plugin.xml
+++ b/plugins/hg4idea/src/META-INF/plugin.xml
@@ -27,7 +27,6 @@
     <vcsRepositoryCreator implementation="org.zmlx.hg4idea.repo.HgRepositoryCreator"/>
     <pushSupport implementation="org.zmlx.hg4idea.push.HgPushSupport"/>
     <cherryPicker implementation="org.zmlx.hg4idea.cherrypick.HgCherryPicker"/>
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <vcsPopupProvider implementation="org.zmlx.hg4idea.provider.HgQuickListProvider"/>
     <logProvider implementation="org.zmlx.hg4idea.log.HgLogProvider"/>
     <vcs.taskHandler implementation="org.zmlx.hg4idea.HgTaskHandler"/>
diff --git a/plugins/java-decompiler/plugin/src/META-INF/plugin.xml b/plugins/java-decompiler/plugin/src/META-INF/plugin.xml
index 593ba7b425d9..0dc94d58fd0e 100644
--- a/plugins/java-decompiler/plugin/src/META-INF/plugin.xml
+++ b/plugins/java-decompiler/plugin/src/META-INF/plugin.xml
@@ -16,7 +16,6 @@
   <resource-bundle>messages.Decompiler</resource-bundle>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
 
     <psi.classFileDecompiler implementation="org.jetbrains.java.decompiler.IdeaDecompiler" order="last"/>
   </extensions>
diff --git a/plugins/java-i18n/src/META-INF/plugin.xml b/plugins/java-i18n/src/META-INF/plugin.xml
index 19041b0c11b1..f5c57b0dd861 100644
--- a/plugins/java-i18n/src/META-INF/plugin.xml
+++ b/plugins/java-i18n/src/META-INF/plugin.xml
@@ -19,7 +19,6 @@
   </extensions>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <referenceProviderType key="Properties File Key Provider"
                            implementationClass="com.intellij.lang.properties.PropertiesReferenceProvider"/>
     <psi.referenceContributor implementation="com.intellij.psi.impl.source.resolve.reference.impl.providers.JavaReferenceContributor"/>
diff --git a/plugins/javaFX/src/META-INF/common-javaFX-plugin.xml b/plugins/javaFX/src/META-INF/common-javaFX-plugin.xml
index ff4b71ce22d0..405bcbd958aa 100644
--- a/plugins/javaFX/src/META-INF/common-javaFX-plugin.xml
+++ b/plugins/javaFX/src/META-INF/common-javaFX-plugin.xml
@@ -1,7 +1,6 @@
 <idea-plugin>
   <depends>com.intellij.modules.java</depends>
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <fileTypeFactory implementation="org.jetbrains.plugins.javaFX.fxml.JavaFxFileTypeFactory"/>
     <fileEditorProvider implementation="org.jetbrains.plugins.javaFX.sceneBuilder.SceneBuilderEditorProvider"/>
     <xml.xmlExtension implementation="org.jetbrains.plugins.javaFX.fxml.JavaFxXmlExtension"/>
diff --git a/plugins/junit/src/META-INF/plugin.xml b/plugins/junit/src/META-INF/plugin.xml
index 368745b059a9..861c5df6be3a 100644
--- a/plugins/junit/src/META-INF/plugin.xml
+++ b/plugins/junit/src/META-INF/plugin.xml
@@ -31,7 +31,6 @@
   <version>1.0</version>
   <vendor>JetBrains</vendor>
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <runConfigurationProducer implementation="com.intellij.execution.junit.AllInDirectoryConfigurationProducer"/>
     <runConfigurationProducer implementation="com.intellij.execution.junit.AllInPackageConfigurationProducer"/>
     <runConfigurationProducer implementation="com.intellij.execution.junit.PatternConfigurationProducer"/>
diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml
index e4a0a21b4c75..15e0a5ce5703 100644
--- a/plugins/maven/src/main/resources/META-INF/plugin.xml
+++ b/plugins/maven/src/main/resources/META-INF/plugin.xml
@@ -65,7 +65,6 @@
 
     <stepsBeforeRunProvider implementation="org.jetbrains.idea.maven.tasks.MavenBeforeRunTasksProvider"/>
     <externalSystemKeymapProvider implementation="org.jetbrains.idea.maven.tasks.MavenKeymapExtension"/>
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <configurationType implementation="org.jetbrains.idea.maven.execution.MavenRunConfigurationType"/>
     <configurationProducer implementation="org.jetbrains.idea.maven.execution.MavenConfigurationProducer"/>
     <orderEnumerationHandlerFactory implementation="org.jetbrains.idea.maven.execution.MavenOrderEnumeratorHandler$FactoryImpl"/>
diff --git a/plugins/properties/src/META-INF/plugin.xml b/plugins/properties/src/META-INF/plugin.xml
index de90a2dc8af9..4937e63a1006 100644
--- a/plugins/properties/src/META-INF/plugin.xml
+++ b/plugins/properties/src/META-INF/plugin.xml
@@ -14,7 +14,6 @@
 
   <extensions defaultExtensionNs="com.intellij">
     <typeIcon className="com.intellij.lang.properties.editor.ResourceBundleAsVirtualFile" icon="AllIcons.Nodes.ResourceBundle"/>
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <applicationService serviceInterface="com.intellij.lang.properties.LastSelectedPropertiesFileStore"
                         serviceImplementation="com.intellij.lang.properties.LastSelectedPropertiesFileStore"/>
     <applicationService serviceInterface="com.intellij.lang.properties.PropertiesQuickFixFactory"
diff --git a/plugins/settings-repository/resources/META-INF/plugin.xml b/plugins/settings-repository/resources/META-INF/plugin.xml
index d2f4a3187792..71733fffecd2 100644
--- a/plugins/settings-repository/resources/META-INF/plugin.xml
+++ b/plugins/settings-repository/resources/META-INF/plugin.xml
@@ -12,7 +12,6 @@
 
   <extensions defaultExtensionNs="com.intellij">
     <ApplicationLoadListener implementation="org.jetbrains.settingsRepository.IcsApplicationLoadListener"/>
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <projectService serviceInterface="org.jetbrains.settingsRepository.ProjectId"
                     serviceImplementation="org.jetbrains.settingsRepository.ProjectId"/>
     <!--<checkinHandlerFactory implementation="org.jetbrains.settingsRepository.actions.CommitToIcsAction$IcsBeforeCommitDialogHandler" order="first"/>-->
diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml
index 7dce4c30b993..03e501a7199c 100644
--- a/plugins/svn4idea/src/META-INF/plugin.xml
+++ b/plugins/svn4idea/src/META-INF/plugin.xml
@@ -117,7 +117,6 @@
 
   <extensions defaultExtensionNs="com.intellij">
     <vcsCheckinHandlerFactory implementation="org.jetbrains.idea.svn.checkin.SvnCheckinHandlerFactory"/>
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <checkoutProvider implementation="org.jetbrains.idea.svn.checkout.SvnCheckoutProvider"/>
     <vcschangedetails implementation="org.jetbrains.idea.svn.treeConflict.TreeConflictDetailsProvider"/>
     <vcschangedetails implementation="org.jetbrains.idea.svn.SvnPhantomChangeDetailsProvider"/>
diff --git a/plugins/tasks/tasks-core/src/META-INF/plugin.xml b/plugins/tasks/tasks-core/src/META-INF/plugin.xml
index 8c5b9e25be00..5d819bcc7911 100644
--- a/plugins/tasks/tasks-core/src/META-INF/plugin.xml
+++ b/plugins/tasks/tasks-core/src/META-INF/plugin.xml
@@ -102,7 +102,6 @@
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
 
     <projectConfigurable groupId="tools" instance="com.intellij.tasks.config.TaskConfigurable" id="tasks" displayName="Tasks" nonDefaultProject="true">
       <configurable instance="com.intellij.tasks.config.TaskRepositoriesConfigurable" displayName="Servers" id="tasks.servers"/>
diff --git a/plugins/terminal/resources/META-INF/plugin.xml b/plugins/terminal/resources/META-INF/plugin.xml
index 18b03fbecd1d..906e9270c9ea 100644
--- a/plugins/terminal/resources/META-INF/plugin.xml
+++ b/plugins/terminal/resources/META-INF/plugin.xml
@@ -9,7 +9,4 @@
   <resource-bundle>messages.TerminalBundle</resource-bundle>
   <xi:include href="/META-INF/terminal.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
-  </extensions>
 </idea-plugin>
diff --git a/plugins/testng/src/META-INF/plugin.xml b/plugins/testng/src/META-INF/plugin.xml
index 59dec82c3597..682af9e8f52f 100644
--- a/plugins/testng/src/META-INF/plugin.xml
+++ b/plugins/testng/src/META-INF/plugin.xml
@@ -5,7 +5,6 @@
     <vendor>Theory In Practice, JetBrains</vendor>
     <depends>com.intellij.java-i18n</depends>
     <extensions defaultExtensionNs="com.intellij">
-        <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
         <deadCode implementation="com.theoryinpractice.testng.inspection.TestNGEntryPoint"/>
         <cantBeStatic implementation="com.theoryinpractice.testng.inspection.TestNGCanBeStaticExtension" />
         <runConfigurationProducer implementation="com.theoryinpractice.testng.configuration.TestNGPatternConfigurationProducer"/>
diff --git a/plugins/ui-designer/src/META-INF/plugin.xml b/plugins/ui-designer/src/META-INF/plugin.xml
index c8e20109ad72..649a94223feb 100644
--- a/plugins/ui-designer/src/META-INF/plugin.xml
+++ b/plugins/ui-designer/src/META-INF/plugin.xml
@@ -29,7 +29,6 @@
   </extensions>
 
   <extensions defaultExtensionNs="com.intellij">
-     <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
 
     <fileTypeFactory implementation="com.intellij.uiDesigner.FormFileTypeFactory"/>
 
diff --git a/plugins/xpath/xpath-view/src/META-INF/plugin.xml b/plugins/xpath/xpath-view/src/META-INF/plugin.xml
index 84fbbebae34d..03951216939f 100644
--- a/plugins/xpath/xpath-view/src/META-INF/plugin.xml
+++ b/plugins/xpath/xpath-view/src/META-INF/plugin.xml
@@ -42,7 +42,6 @@
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter" />
 
     <colorSettingsPage implementation="org.intellij.lang.xpath.XPathColorSettingsPage" />
 
diff --git a/plugins/xslt-debugger/src/META-INF/plugin.xml b/plugins/xslt-debugger/src/META-INF/plugin.xml
index 429a1c2886bb..2affaff7fd5b 100644
--- a/plugins/xslt-debugger/src/META-INF/plugin.xml
+++ b/plugins/xslt-debugger/src/META-INF/plugin.xml
@@ -20,7 +20,6 @@
   </change-notes>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter" />
     <xdebugger.breakpointType implementation="org.intellij.plugins.xsltDebugger.XsltBreakpointType"/>
 
     <programRunner implementation="org.intellij.plugins.xsltDebugger.XsltDebuggerRunner"/>
diff --git a/python/IntelliLang-python/resources/META-INF/plugin.xml b/python/IntelliLang-python/resources/META-INF/plugin.xml
index 6b2717a6e7b1..902e05447b7b 100644
--- a/python/IntelliLang-python/resources/META-INF/plugin.xml
+++ b/python/IntelliLang-python/resources/META-INF/plugin.xml
@@ -10,7 +10,4 @@
 
   <xi:include href="/META-INF/intellilang-python-support.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
-  </extensions>
 </idea-plugin>
diff --git a/python/edu/course-creator-python/resources/META-INF/plugin.xml b/python/edu/course-creator-python/resources/META-INF/plugin.xml
index 96bd6f624ede..23336b9e0df0 100644
--- a/python/edu/course-creator-python/resources/META-INF/plugin.xml
+++ b/python/edu/course-creator-python/resources/META-INF/plugin.xml
@@ -27,7 +27,6 @@
 
   <extensions defaultExtensionNs="com.intellij">
     <directoryProjectGenerator implementation="com.jetbrains.edu.coursecreator.PyCCProjectGenerator"/>
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
   </extensions>
 
   <extensions defaultExtensionNs="Edu">
diff --git a/python/educational/course-creator/resources/META-INF/plugin.xml b/python/educational/course-creator/resources/META-INF/plugin.xml
index 4c9e2c9bb9ef..66f8b986a211 100644
--- a/python/educational/course-creator/resources/META-INF/plugin.xml
+++ b/python/educational/course-creator/resources/META-INF/plugin.xml
@@ -26,7 +26,6 @@
     <projectService serviceImplementation="com.jetbrains.edu.coursecreator.CCProjectService"/>
     <treeStructureProvider implementation="com.jetbrains.edu.coursecreator.projectView.CCTreeStructureProvider"/>
     <refactoring.elementListenerProvider implementation="com.jetbrains.edu.coursecreator.CCRefactoringElementListenerProvider"/>
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <renameHandler implementation="com.jetbrains.edu.coursecreator.CCRenameHandler"/>
     <renameInputValidator implementation="com.jetbrains.edu.coursecreator.CCRenameInputValidator"/>
     <refactoring.moveHandler implementation="com.jetbrains.edu.coursecreator.CCLessonMoveHandlerDelegate" order="first"/>
diff --git a/python/educational/interactive-learning/resources/META-INF/plugin.xml b/python/educational/interactive-learning/resources/META-INF/plugin.xml
index 35d4322c1a32..b81bebda0de9 100644
--- a/python/educational/interactive-learning/resources/META-INF/plugin.xml
+++ b/python/educational/interactive-learning/resources/META-INF/plugin.xml
@@ -87,7 +87,6 @@
     <treeStructureProvider implementation="com.jetbrains.edu.learning.projectView.StudyTreeStructureProvider"/>
     <applicationService serviceInterface="com.intellij.openapi.fileEditor.impl.EditorEmptyTextPainter"
         serviceImplementation="com.jetbrains.edu.learning.StudyInstructionPainter" overrides="true"/>
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <highlightErrorFilter implementation="com.jetbrains.edu.learning.editor.StudyHighlightErrorFilter"/>
     <projectService serviceInterface="com.jetbrains.edu.learning.StudyTaskManager"
                     serviceImplementation="com.jetbrains.edu.learning.StudyTaskManager"/>
diff --git a/python/ipnb/resources/META-INF/plugin.xml b/python/ipnb/resources/META-INF/plugin.xml
index 72a6687dfee5..bb9560c95743 100644
--- a/python/ipnb/resources/META-INF/plugin.xml
+++ b/python/ipnb/resources/META-INF/plugin.xml
@@ -10,7 +10,4 @@
 
   <xi:include href="/META-INF/ipython-notebook.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
-  </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/python/python-rest/resources/META-INF/plugin.xml b/python/python-rest/resources/META-INF/plugin.xml
index 2f9a7977ab1d..12679768df35 100644
--- a/python/python-rest/resources/META-INF/plugin.xml
+++ b/python/python-rest/resources/META-INF/plugin.xml
@@ -9,7 +9,4 @@
 
   <xi:include href="/META-INF/python-rest-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
-  </extensions>
 </idea-plugin>
diff --git a/python/rest/resources/META-INF/plugin.xml b/python/rest/resources/META-INF/plugin.xml
index b10400eea1e8..201c25ce1d06 100644
--- a/python/rest/resources/META-INF/plugin.xml
+++ b/python/rest/resources/META-INF/plugin.xml
@@ -13,7 +13,4 @@
     <li>Added inspection for title & underline length math (PY-10998)</li>
     </ul>
 ]]></change-notes>
-  <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
-  </extensions>
 </idea-plugin>
diff --git a/python/src/META-INF/python-core.xml b/python/src/META-INF/python-core.xml
index 498588e3cfee..5ba9c42250b3 100644
--- a/python/src/META-INF/python-core.xml
+++ b/python/src/META-INF/python-core.xml
@@ -15,7 +15,6 @@
     <nameSuggestionProvider implementation="com.jetbrains.python.refactoring.PyNameSuggestionProvider"/>
     <methodNavigationOffsetProvider implementation="com.jetbrains.python.codeInsight.PyMethodNavigationOffsetProvider"/>
     <copyPastePreProcessor implementation="com.jetbrains.python.editor.PythonCopyPasteProcessor"/>
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <fileTypeFactory implementation="com.jetbrains.python.PythonFileTypeFactory"/>
     <fileTypeDetector implementation="com.jetbrains.python.PyFileTypeDetector"/>
     <editorHighlighterProvider filetype="Python" implementationClass="com.jetbrains.python.PyEditorHighlighterProvider"/>
diff --git a/spellchecker/src/META-INF/SpellCheckerPlugin.xml b/spellchecker/src/META-INF/SpellCheckerPlugin.xml
index 772f8b87e3b7..d93ebad211c7 100644
--- a/spellchecker/src/META-INF/SpellCheckerPlugin.xml
+++ b/spellchecker/src/META-INF/SpellCheckerPlugin.xml
@@ -16,8 +16,6 @@
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
-
     <applicationService serviceInterface="com.intellij.openapi.editor.SpellCheckingEditorCustomizationProvider"
                         serviceImplementation="com.intellij.spellchecker.ui.SpellCheckingEditorCustomizationProviderImpl"
                         overrides="true"/>
diff --git a/xml/relaxng/src/META-INF/relaxng-plugin.xml b/xml/relaxng/src/META-INF/relaxng-plugin.xml
index 46fdd900f428..caa6a0a850a3 100644
--- a/xml/relaxng/src/META-INF/relaxng-plugin.xml
+++ b/xml/relaxng/src/META-INF/relaxng-plugin.xml
@@ -1,6 +1,5 @@
 <idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter" />
     <gotoSymbolContributor implementation="org.intellij.plugins.relaxNG.GotoSymbolContributor" />
     <xml.schemaProvider implementation="org.intellij.plugins.relaxNG.config.NoNamespaceSchemaProvider" />
     <hectorComponentProvider implementation="org.intellij.plugins.relaxNG.config.NoNamespaceConfigImpl$HectorProvider" />