[api-changes] Golden file changes in nbms-and-javadoc build #8610

  • From: hudson@localhost.localdomain
  • To:
  • Subject: [api-changes] Golden file changes in nbms-and-javadoc build #8610
  • Date: Tue, 31 Jan 2012 15:30:32 +0100

http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/8610/changes
http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/8610/artifact/nbbuild/build/generated/

diff -r -u --minimal --show-function-line='^[A-Z][A-Z]' 
--ignore-matching-lines=' [(]merged[)]$' -x kits.txt 
nbbuild/build/old-generated/generated/deps.txt 
nbbuild/build/generated/deps.txt
--- nbbuild/build/old-generated/generated/deps.txt      2012-01-31 
14:30:30.000000000 +0100
+++ nbbuild/build/generated/deps.txt    2012-01-31 15:30:14.000000000 +0100
@@ -6512,18 +6512,16 @@ MODULE org.netbeans.modules.loadgenerato
   REQUIRES org.openide.util.lookup (platform)
 MODULE org.netbeans.modules.localhistory (ide)
   REQUIRES org.netbeans.core.multiview (platform)
-  REQUIRES org.netbeans.modules.diff (ide)
   REQUIRES org.netbeans.modules.editor.mimelookup (platform)
   REQUIRES org.netbeans.modules.options.api (platform)
   REQUIRES org.netbeans.modules.projectapi (ide)
   REQUIRES org.netbeans.modules.projectuiapi (ide)
   REQUIRES org.netbeans.modules.queries (platform)
   REQUIRES org.netbeans.modules.versioning (ide)
+  REQUIRES org.netbeans.modules.versioning.ui (ide)
   REQUIRES org.netbeans.modules.versioning.util (ide)
-  REQUIRES org.netbeans.swing.outline (platform)
   REQUIRES org.openide.awt (platform)
   REQUIRES org.openide.dialogs (platform)
-  REQUIRES org.openide.explorer (platform)
   REQUIRES org.openide.filesystems (platform)
   REQUIRES org.openide.loaders (platform)
   REQUIRES org.openide.modules (platform)
@@ -8602,6 +8600,7 @@ MODULE org.netbeans.modules.refactoring.
   REQUIRES org.netbeans.modules.editor.guards (ide)
   REQUIRES org.netbeans.modules.editor.lib (ide)
   REQUIRES org.netbeans.modules.editor.mimelookup (platform)
+  REQUIRES org.netbeans.modules.parsing.api (ide)
   REQUIRES org.netbeans.modules.projectapi (ide)
   REQUIRES org.netbeans.modules.projectuiapi (ide)
   REQUIRES org.netbeans.modules.queries (platform)
@@ -9425,14 +9424,21 @@ MODULE org.netbeans.modules.versioning.s
   REQUIRES org.openide.util (platform)
   REQUIRES org.openide.util.lookup (platform)
 MODULE org.netbeans.modules.versioning.ui (ide)
+  REQUIRES org.netbeans.api.progress (platform)
+  REQUIRES org.netbeans.core.multiview (platform)
   REQUIRES org.netbeans.modules.diff (ide)
   REQUIRES org.netbeans.modules.editor.errorstripe (ide)
   REQUIRES org.netbeans.modules.editor.fold (ide)
   REQUIRES org.netbeans.modules.editor.lib (ide)
+  REQUIRES org.netbeans.modules.editor.mimelookup (platform)
   REQUIRES org.netbeans.modules.options.api (platform)
   REQUIRES org.netbeans.modules.queries (platform)
+  REQUIRES org.netbeans.modules.versioning (ide)
   REQUIRES org.netbeans.modules.versioning.core (ide)
+  REQUIRES org.netbeans.modules.versioning.util (ide)
+  REQUIRES org.netbeans.swing.outline (platform)
   REQUIRES org.openide.awt (platform)
+  REQUIRES org.openide.explorer (platform)
   REQUIRES org.openide.filesystems (platform)
   REQUIRES org.openide.loaders (platform)
   REQUIRES org.openide.nodes (platform)
diff -r -u --minimal --show-function-line='^[A-Z][A-Z]' 
--ignore-matching-lines=' [(]merged[)]$' -x kits.txt 
nbbuild/build/old-generated/generated/friend-packages.txt 
nbbuild/build/generated/friend-packages.txt
--- nbbuild/build/old-generated/generated/friend-packages.txt   2012-01-31 
14:30:30.000000000 +0100
+++ nbbuild/build/generated/friend-packages.txt 2012-01-31 15:30:16.000000000 
+0100
@@ -3001,6 +3001,9 @@ MODULE org.netbeans.modules.versioning.c
 MODULE org.netbeans.modules.versioning.system.cvss (extra)
   FRIEND org.netbeans.modules.kenai.ui (extra)
   PACKAGE org.netbeans.modules.versioning.system.cvss.api
+MODULE org.netbeans.modules.versioning.ui (ide)
+  FRIEND org.netbeans.modules.localhistory (ide)
+  PACKAGE org.netbeans.modules.versioning.ui.history
 MODULE org.netbeans.modules.versioning.util (ide)
   FRIEND org.netbeans.modules.bugtracking.bridge (ide)
   FRIEND org.netbeans.modules.clearcase (extra)
@@ -3012,6 +3015,7 @@ MODULE org.netbeans.modules.versioning.u
   FRIEND org.netbeans.modules.versioning.indexingbridge (ide)
   FRIEND org.netbeans.modules.versioning.kenai (extra)
   FRIEND org.netbeans.modules.versioning.system.cvss (extra)
+  FRIEND org.netbeans.modules.versioning.ui (ide)
   PACKAGE org.netbeans.modules.proxy
   PACKAGE org.netbeans.modules.turbo
   PACKAGE org.netbeans.modules.versioning.annotate
diff -r -u --minimal --show-function-line='^[A-Z][A-Z]' 
--ignore-matching-lines=' [(]merged[)]$' -x kits.txt 
nbbuild/build/old-generated/generated/layers.txt 
nbbuild/build/generated/layers.txt
--- nbbuild/build/old-generated/generated/layers.txt    2012-01-31 
14:30:30.000000000 +0100
+++ nbbuild/build/generated/layers.txt  2012-01-31 15:30:29.000000000 +0100
@@ -201,6 +201,9 @@
 o.n.m.j2ee.sun.appsrv81                  
Actions/Help/o-n-m-j2ee-sun-ide-InfoAction.instance ("Java EE Usage...")
 o.n.m.j2ee.sun.appsrv81                  
Actions/Help/o-n-m-j2ee-sun-ide-j2ee-runtime-actions-RunASVerifierAction.instance
 o.n.m.javahelp@                          
Actions/Help/o-n-m-javahelp-HelpAction.instance ("Help")
+o.n.m.localhistory@                      Actions/History/
+o.n.m.localhistory@                      
Actions/History/o-n-m-localhistory-ui-actions-RevertDeletedAction.instance 
("Revert &Deleted")
+o.n.m.localhistory@                      
Actions/History/o-n-m-localhistory-ui-view-ShowHistoryAction.instance 
("CTL_ShowHistory")
 o.n.m.image@                             Actions/Images/
 o.n.m.image@                             
Actions/Images/o-n-m-image-action-ExternalEditAction.instance ("Open In 
External Editor")
 org.apache.jmeter.module                 Actions/JMeter/
@@ -225,10 +228,6 @@
 o.n.m.javacard.ri.platform               
Actions/JavaCard3/CustomizeAction.instance @1001
 o.n.m.javacard.oberthur                  
Actions/JavaCard3/o-n-m-javacard-oberthur-RefreshStatusAction.instance @2001
 o.n.m.javacard.console                   
Actions/JavaCard3/o-n-m-javacard-console-ShowAPDUConsoleAction.instance @2204
-o.n.m.localhistory                       Actions/LocalHistory/ ("Local 
History")
-o.n.m.localhistory                       
Actions/LocalHistory/o-n-m-localhistory-ui-actions-RevertDeletedAction.instance
-o.n.m.localhistory                       
Actions/LocalHistory/o-n-m-localhistory-ui-revert-RevertToAction.instance
-o.n.m.localhistory                       
Actions/LocalHistory/o-n-m-localhistory-ui-view-ShowLocalHistoryAction.instance
                                          Actions/Management/
 o.n.m.jmx                                
Actions/Management/o-n-m-jmx-actions-ManagementAllAction.instance
 o.n.m.jconsole                           
Actions/Management/o-n-m-jmx-jconsole-LaunchAction.instance
@@ -2353,8 +2352,8 @@
 o.n.m.defaults                           
Editors/Keybindings/NetBeans55/Defaults/
 o.n.m.defaults                           
Editors/Keybindings/NetBeans55/Defaults/o-n-m-defaults-keybindings.xml
 o.n.m.defaults                           
Editors/Keybindings/NetBeans55/Defaults/o-n-m-editor-keybindings-mac.xml
-o.n.m.localhistory@                      Editors/MultiView/
-o.n.m.localhistory@                      
Editors/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 @1000000 ("&History")
+o.n.m.versioning.ui@                     Editors/MultiView/
+o.n.m.versioning.ui@                     
Editors/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance 
@1000000 ("&History")
                                          Editors/Popup/
 o.n.m.editor                             
Editors/Popup/o-o-actions-CutAction.shadow @2000
 o.n.m.editor                             
Editors/Popup/o-o-actions-CopyAction.shadow @3000
@@ -2422,7 +2421,7 @@
 o.n.m.websvc.rest.wadl.design@           
Editors/application/vnd.sun.wadl+xml/MultiView/
 o.n.m.websvc.rest.wadl.design@           
Editors/application/vnd.sun.wadl+xml/MultiView/o-n-m-websvc-rest-wadl-design-multiview-SourceMultiViewElement.instance
 @1000 ("Source")
 o.n.m.websvc.rest.wadl.design@           
Editors/application/vnd.sun.wadl+xml/MultiView/o-n-m-websvc-rest-wadl-design-multiview-DesignMultiViewElement.instance
 @2000 ("Design")
-o.n.m.localhistory@                      
Editors/application/vnd.sun.wadl+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/application/vnd.sun.wadl+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/application/vnd.sun.wadl+xml/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/application/vnd.sun.wadl+xml/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/application/vnd.sun.wadl+xml/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -2549,7 +2548,7 @@
 o.n.m.java.source                        
Editors/application/xml-dtd/JavaBinaryIndexer.instance (merged)
 o.n.m.xml@                               
Editors/application/xml-dtd/MultiView/
 o.n.m.xml@                               
Editors/application/xml-dtd/MultiView/o-n-m-xml-DTDDataObject-createMultiViewDTDElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/application/xml-dtd/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/application/xml-dtd/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.xml.text                           Editors/application/xml-dtd/Popup/
 o.n.m.editor                             
Editors/application/xml-dtd/Popup/o-o-actions-CutAction.shadow (merged) @2000
 o.n.m.editor                             
Editors/application/xml-dtd/Popup/o-o-actions-CopyAction.shadow (merged) @3000
@@ -2623,7 +2622,7 @@
 o.n.m.java.source                        
Editors/application/xslt+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.xsl@                               
Editors/application/xslt+xml/MultiView/
 o.n.m.xsl@                               
Editors/application/xslt+xml/MultiView/o-n-m-xsl-XSLDataObject-createMultiViewDTDElement.instance
 @1 ("Source")
-o.n.m.localhistory@                      
Editors/application/xslt+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/application/xslt+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/application/xslt+xml/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/application/xslt+xml/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/application/xslt+xml/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -2765,7 +2764,7 @@
 o.n.m.java.source                        
Editors/text/cmake/JavaBinaryIndexer.instance (merged)
 o.n.m.cnd@                               Editors/text/cmake/MultiView/
 o.n.m.cnd@                               
Editors/text/cmake/MultiView/o-n-m-cnd-loaders-CMakeIncludeDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/cmake/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/cmake/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/cmake/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/cmake/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/cmake/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance 
(merged)
@@ -2801,7 +2800,7 @@
 o.n.m.coherence@                         Editors/text/coh-pof+xml/MultiView/
 o.n.m.coherence@                         
Editors/text/coh-pof+xml/MultiView/o-n-m-coherence-editor-pof-PofConfigVisualElement.instance
 @1000 ("General")
 o.n.m.coherence@                         
Editors/text/coh-pof+xml/MultiView/o-n-m-coherence-editor-pof-PofConfigDataObject-createEditor.instance
 @2000 ("Source")
-o.n.m.localhistory@                      
Editors/text/coh-pof+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/coh-pof+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/coh-pof+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/coh-pof+xml/language.instance (merged)
 o.n.m.docbook                            Editors/text/coh-pof+xml/macros.xml 
(merged)
@@ -2931,7 +2930,7 @@
 o.n.m.html.editor                        
Editors/text/html/Keybindings/NetBeans/Defaults/o-n-m-html-editor-keybindings.xml
 o.n.m.html@                              Editors/text/html/MultiView/
 o.n.m.html@                              
Editors/text/html/MultiView/o-n-m-html-HtmlDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/html/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/html/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.html                               
Editors/text/html/PaletteFactory.instance
                                          Editors/text/html/Popup/
 o.n.m.html.editor                        Editors/text/html/Popup/goto/ @500
@@ -3097,7 +3096,7 @@
 o.n.m.javascript.editing                 
Editors/text/javascript/Keybindings/NetBeans/Defaults/o-n-m-javascript-editing-keybindings.xml
 o.n.m.javascript.editing@                Editors/text/javascript/MultiView/
 o.n.m.javascript.editing@                
Editors/text/javascript/MultiView/o-n-m-javascript-editing-JsLanguage-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/javascript/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/javascript/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
                                          Editors/text/javascript/Popup/
 o.n.m.javascript.editing@                Editors/text/javascript/Popup/goto/ 
@500
 o.n.m.javascript.editing@                
Editors/text/javascript/Popup/goto/goto-declaration @500
@@ -3238,7 +3237,7 @@
 o.n.m.java.source                        
Editors/text/plain/JavaBinaryIndexer.instance (merged)
 o.o.loaders                              Editors/text/plain/MultiView/
 o.o.loaders                              
Editors/text/plain/MultiView/default-text-editor.instance @1000 ("Source")
-o.n.m.localhistory@                      
Editors/text/plain/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/plain/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.spellchecker                       
Editors/text/plain/TokenListProvider/
 o.n.m.spellchecker                       
Editors/text/plain/TokenListProvider/o-n-m-spellchecker-plain-PlainTokenListProvider.instance
 o.n.m.editor.codetemplates               
Editors/text/plain/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
@@ -3275,7 +3274,7 @@
 o.n.m.java.source                        
Editors/text/plain+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.xml@                               Editors/text/plain+xml/MultiView/
 o.n.m.xml@                               
Editors/text/plain+xml/MultiView/o-n-m-xml-XMLDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/plain+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/plain+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/plain+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/plain+xml/language.instance (merged)
 o.n.m.docbook                            Editors/text/plain+xml/macros.xml 
(merged)
@@ -3315,7 +3314,7 @@
 o.n.m.java.source                        
Editors/text/qtresource+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.cnd@                               
Editors/text/qtresource+xml/MultiView/
 o.n.m.cnd@                               
Editors/text/qtresource+xml/MultiView/o-n-m-cnd-loaders-QtResourceDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/qtresource+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/qtresource+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/qtresource+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/qtresource+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/qtresource+xml/macros.xml (merged)
@@ -3367,7 +3366,7 @@
 o.n.m.java.source                        
Editors/text/sh/JavaBinaryIndexer.instance (merged)
 o.n.m.cnd.script@                        Editors/text/sh/MultiView/
 o.n.m.cnd.script@                        
Editors/text/sh/MultiView/o-n-m-cnd-script-loaders-ShellDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/sh/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/sh/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.cnd.spellchecker.bindings@         Editors/text/sh/TokenListProvider/
 o.n.m.cnd.spellchecker.bindings@         
Editors/text/sh/TokenListProvider/o-n-m-cnd-spellchecker-bindings-CndTokenListProvider.instance
 @1000
 o.n.m.cnd.script                         Editors/text/sh/language.instance
@@ -3490,7 +3489,7 @@
 o.n.m.java.source                        
Editors/text/tomcat5+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.tomcat5@                           Editors/text/tomcat5+xml/MultiView/
 o.n.m.tomcat5@                           
Editors/text/tomcat5+xml/MultiView/o-n-m-tomcat5-nodes-TomcatInstanceNode-createMultiViewEditorElement.instance
 @1 ("Source")
-o.n.m.localhistory@                      
Editors/text/tomcat5+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/tomcat5+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/tomcat5+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/tomcat5+xml/language.instance (merged)
 o.n.m.docbook                            Editors/text/tomcat5+xml/macros.xml 
(merged)
@@ -3536,7 +3535,7 @@
 o.n.m.java.source                        
Editors/text/x-ant+xml/JavaBinaryIndexer.instance (merged)
 org.apache.tools.ant.module@             Editors/text/x-ant+xml/MultiView/
 org.apache.tools.ant.module@             
Editors/text/x-ant+xml/MultiView/org-apache-tools-ant-module-loader-AntProjectDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-ant+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-ant+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
                                          Editors/text/x-ant+xml/Popup/
 org.apache.tools.ant.module@             
Editors/text/x-ant+xml/Popup/org-apache-tools-ant-module-nodes-RunTargetsAction.shadow
 @900
 o.n.m.xml.text                           Editors/text/x-ant+xml/Popup/format 
(merged) @1200
@@ -3594,7 +3593,7 @@
 o.n.m.java.source                        
Editors/text/x-apduscr/JavaBinaryIndexer.instance (merged)
 o.n.m.javacard.apdufile@                 Editors/text/x-apduscr/MultiView/
 o.n.m.javacard.apdufile@                 
Editors/text/x-apduscr/MultiView/o-n-m-javacard-apdufile-ApduDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-apduscr/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-apduscr/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-apduscr/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-apduscr/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-apduscr/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -3649,7 +3648,7 @@
 o.n.m.java.source                        
Editors/text/x-asm/JavaBinaryIndexer.instance (merged)
 o.n.m.cnd.asm@                           Editors/text/x-asm/MultiView/
 o.n.m.cnd.asm@                           
Editors/text/x-asm/MultiView/o-n-m-cnd-asm-core-dataobjects-AsmDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-asm/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-asm/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.cnd.debugger.common2               Editors/text/x-asm/Popup/
 o.n.m.cnd.debugger.common2               
Editors/text/x-asm/Popup/o-n-m-debugger-ui-actions-ToggleBreakpointAction.shadow
 @300
 o.n.m.cnd.debugger.common2               
Editors/text/x-asm/Popup/o-n-m-cnd-debugger-common2-debugger-actions-MemoryWindowAction.shadow
 @400
@@ -3922,7 +3921,7 @@
 o.n.m.cnd.refactoring                    
Editors/text/x-c/Keybindings/NetBeans/Defaults/refactoring-keybindings.xml
 o.n.m.cnd.source@                        Editors/text/x-c/MultiView/
 o.n.m.cnd.source@                        
Editors/text/x-c/MultiView/o-n-m-cnd-source-CDataObject-createMultiViewEditorElement.instance
 @1 ("Source")
-o.n.m.localhistory@                      
Editors/text/x-c/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-c/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
                                          Editors/text/x-c/Popup/
                                          Editors/text/x-c/Popup/goto/ @100 
(o.n.m.cnd.editor: "Navigate")
 o.n.m.cnd.completion                     
Editors/text/x-c/Popup/goto/goto-declaration @100
@@ -4241,7 +4240,7 @@
 o.n.m.cnd.refactoring                    
Editors/text/x-c++/Keybindings/NetBeans/Defaults/refactoring-keybindings.xml
 o.n.m.cnd.source@                        Editors/text/x-c++/MultiView/
 o.n.m.cnd.source@                        
Editors/text/x-c++/MultiView/o-n-m-cnd-source-CCDataObject-createMultiViewEditorElement.instance
 @1 ("Source")
-o.n.m.localhistory@                      
Editors/text/x-c++/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-c++/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
                                          Editors/text/x-c++/Popup/
                                          Editors/text/x-c++/Popup/goto/ @100 
(o.n.m.cnd.editor: "Navigate")
 o.n.m.cnd.completion                     
Editors/text/x-c++/Popup/goto/goto-declaration @100
@@ -4385,7 +4384,7 @@
 o.n.m.java.source                        
Editors/text/x-cmake/JavaBinaryIndexer.instance (merged)
 o.n.m.cnd@                               Editors/text/x-cmake/MultiView/
 o.n.m.cnd@                               
Editors/text/x-cmake/MultiView/o-n-m-cnd-loaders-CMakeDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-cmake/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-cmake/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.cnd.spellchecker.bindings@         
Editors/text/x-cmake/TokenListProvider/
 o.n.m.cnd.spellchecker.bindings@         
Editors/text/x-cmake/TokenListProvider/o-n-m-cnd-spellchecker-bindings-CndTokenListProvider.instance
 @1000
 o.n.m.editor.codetemplates               
Editors/text/x-cmake/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
@@ -4608,7 +4607,7 @@
 o.n.m.java.source                        
Editors/text/x-css/JavaBinaryIndexer.instance (merged)
 o.n.m.css.editor@                        Editors/text/x-css/MultiView/
 o.n.m.css.editor@                        
Editors/text/x-css/MultiView/o-n-m-css-editor-csl-CssLanguage-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-css/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-css/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.css.editor                         Editors/text/x-css/Popup/
 o.n.m.css.editor@                        Editors/text/x-css/Popup/goto/ @500
 o.n.m.css.editor@                        
Editors/text/x-css/Popup/goto/goto-declaration @500
@@ -4722,7 +4721,7 @@
 o.n.m.java.source                        
Editors/text/x-dd-application/JavaBinaryIndexer.instance (merged)
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-application/MultiView/
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-application/MultiView/o-n-m-j2ee-ddloaders-app-EarDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-dd-application/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-application/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-dd-application/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-dd-application/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-dd-application/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -4756,7 +4755,7 @@
 o.n.m.java.source                        
Editors/text/x-dd-client/JavaBinaryIndexer.instance (merged)
 o.n.m.j2ee.ddloaders@                    Editors/text/x-dd-client/MultiView/
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-client/MultiView/o-n-m-j2ee-ddloaders-client-ClientDataObject-createXmlMultiViewElement.instance
 @1 ("Source")
-o.n.m.localhistory@                      
Editors/text/x-dd-client/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-client/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-dd-client/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-dd-client/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-dd-client/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -4792,7 +4791,7 @@
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-ejbjar/MultiView/o-n-m-j2ee-ddloaders-multiview-EjbJarMultiViewDataObject-createXmlMultiViewElement.instance
 @1 ("Source")
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-ejbjar/MultiView/o-n-m-j2ee-ddloaders-multiview-EjbJarMultiViewDataObject-getOverview.instance
 @500 ("General")
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-ejbjar/MultiView/o-n-m-j2ee-ddloaders-multiview-EjbJarMultiViewDataObject-getCmpRelationShips.instance
 @1000 ("CMP Relationships")
-o.n.m.localhistory@                      
Editors/text/x-dd-ejbjar/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-ejbjar/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-dd-ejbjar/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-dd-ejbjar/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-dd-ejbjar/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -4826,7 +4825,7 @@
 o.n.m.java.source                        
Editors/text/x-dd-ejbjar-ee5/JavaBinaryIndexer.instance (merged)
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-ejbjar-ee5/MultiView/
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-ejbjar-ee5/MultiView/o-n-m-j2ee-ddloaders-multiview-EjbJarMultiViewDataObject-createXmlMultiViewElementEE5.instance
 @1 ("Source")
-o.n.m.localhistory@                      
Editors/text/x-dd-ejbjar-ee5/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-ejbjar-ee5/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-dd-ejbjar-ee5/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-dd-ejbjar-ee5/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-dd-ejbjar-ee5/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -4865,7 +4864,7 @@
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-glassfish-app-client+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createJmsMultiViewElement.instance
 @10 ("Messaging")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-glassfish-app-client+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createEnvMultiViewEnvironmentElement.instance
 @15 ("Environment")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-glassfish-app-client+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createXmlMultiViewElement.instance
 @20 ("XML")
-o.n.m.localhistory@                      
Editors/text/x-dd-glassfish-app-client+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-glassfish-app-client+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-dd-glassfish-app-client+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-dd-glassfish-app-client+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-dd-glassfish-app-client+xml/macros.xml (merged)
@@ -4906,7 +4905,7 @@
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-app-client+xml/MultiView/
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-app-client+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createEnvMultiViewEnvironmentElement.instance
 @15 ("Environment")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-app-client+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createXmlMultiViewElement.instance
 @20 ("XML")
-o.n.m.localhistory@                      
Editors/text/x-dd-iplanet-app-client+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-iplanet-app-client+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-dd-iplanet-app-client+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-dd-iplanet-app-client+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-dd-iplanet-app-client+xml/macros.xml (merged)
@@ -4947,7 +4946,7 @@
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-application+xml/MultiView/
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-application+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createSecurityMultiViewSecurityElement.instance
 @3 ("Security")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-application+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createXmlMultiViewElement.instance
 @20 ("XML")
-o.n.m.localhistory@                      
Editors/text/x-dd-iplanet-application+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-iplanet-application+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-dd-iplanet-application+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-dd-iplanet-application+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-dd-iplanet-application+xml/macros.xml (merged)
@@ -4987,7 +4986,7 @@
 o.n.m.java.source                        
Editors/text/x-dd-iplanet-cmp-mapping+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-cmp-mapping+xml/MultiView/
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-cmp-mapping+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createXmlMultiViewElement.instance
 @20 ("XML")
-o.n.m.localhistory@                      
Editors/text/x-dd-iplanet-cmp-mapping+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-iplanet-cmp-mapping+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-dd-iplanet-cmp-mapping+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-dd-iplanet-cmp-mapping+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-dd-iplanet-cmp-mapping+xml/macros.xml (merged)
@@ -5030,7 +5029,7 @@
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-ejb-jar+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createEjbMultiViewElement.instance
 @2 ("EJB")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-ejb-jar+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createSecurityMultiViewSecurityElement.instance
 @3 ("Security")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-ejb-jar+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createXmlMultiViewElement.instance
 @20 ("XML")
-o.n.m.localhistory@                      
Editors/text/x-dd-iplanet-ejb-jar+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-iplanet-ejb-jar+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-dd-iplanet-ejb-jar+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-dd-iplanet-ejb-jar+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-dd-iplanet-ejb-jar+xml/macros.xml (merged)
@@ -5070,7 +5069,7 @@
 o.n.m.java.source                        
Editors/text/x-dd-iplanet-resource+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-resource+xml/MultiView/
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-resource+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createXmlMultiViewElement.instance
 @20 ("XML")
-o.n.m.localhistory@                      
Editors/text/x-dd-iplanet-resource+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-iplanet-resource+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-dd-iplanet-resource+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-dd-iplanet-resource+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-dd-iplanet-resource+xml/macros.xml (merged)
@@ -5114,7 +5113,7 @@
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-web+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createSecurityMultiViewSecurityElement.instance
 @3 ("Security")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-web+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createEnvMultiViewEnvironmentElement.instance
 @15 ("Environment")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-iplanet-web+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createXmlMultiViewElement.instance
 @20 ("XML")
-o.n.m.localhistory@                      
Editors/text/x-dd-iplanet-web+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-iplanet-web+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-dd-iplanet-web+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-dd-iplanet-web+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-dd-iplanet-web+xml/macros.xml (merged)
@@ -5159,7 +5158,7 @@
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-servlet-fragment3.0/MultiView/o-n-m-j2ee-ddloaders-web-multiview-PagesMultiViewElement.instance
 @800 ("Pages")
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-servlet-fragment3.0/MultiView/o-n-m-j2ee-ddloaders-web-multiview-ReferencesMultiViewElement.instance
 @900 ("References")
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-servlet-fragment3.0/MultiView/o-n-m-j2ee-ddloaders-web-multiview-SecurityMultiViewElement.instance
 @1000 ("Security")
-o.n.m.localhistory@                      
Editors/text/x-dd-servlet-fragment3.0/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-servlet-fragment3.0/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-dd-servlet-fragment3.0/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-dd-servlet-fragment3.0/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-dd-servlet-fragment3.0/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -5199,7 +5198,7 @@
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-servlet2.4/MultiView/o-n-m-j2ee-ddloaders-web-multiview-PagesMultiViewElement.instance
 @800 ("Pages")
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-servlet2.4/MultiView/o-n-m-j2ee-ddloaders-web-multiview-ReferencesMultiViewElement.instance
 @900 ("References")
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-servlet2.4/MultiView/o-n-m-j2ee-ddloaders-web-multiview-SecurityMultiViewElement.instance
 @1000 ("Security")
-o.n.m.localhistory@                      
Editors/text/x-dd-servlet2.4/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-servlet2.4/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-dd-servlet2.4/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-dd-servlet2.4/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-dd-servlet2.4/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -5239,7 +5238,7 @@
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-servlet2.5/MultiView/o-n-m-j2ee-ddloaders-web-multiview-PagesMultiViewElement.instance
 @800 ("Pages")
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-servlet2.5/MultiView/o-n-m-j2ee-ddloaders-web-multiview-ReferencesMultiViewElement.instance
 @900 ("References")
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-servlet2.5/MultiView/o-n-m-j2ee-ddloaders-web-multiview-SecurityMultiViewElement.instance
 @1000 ("Security")
-o.n.m.localhistory@                      
Editors/text/x-dd-servlet2.5/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-servlet2.5/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-dd-servlet2.5/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-dd-servlet2.5/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-dd-servlet2.5/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -5279,7 +5278,7 @@
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-servlet3.0/MultiView/o-n-m-j2ee-ddloaders-web-multiview-PagesMultiViewElement.instance
 @800 ("Pages")
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-servlet3.0/MultiView/o-n-m-j2ee-ddloaders-web-multiview-ReferencesMultiViewElement.instance
 @900 ("References")
 o.n.m.j2ee.ddloaders@                    
Editors/text/x-dd-servlet3.0/MultiView/o-n-m-j2ee-ddloaders-web-multiview-SecurityMultiViewElement.instance
 @1000 ("Security")
-o.n.m.localhistory@                      
Editors/text/x-dd-servlet3.0/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-servlet3.0/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-dd-servlet3.0/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-dd-servlet3.0/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-dd-servlet3.0/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -5317,7 +5316,7 @@
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-app-client+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createJmsMultiViewElement.instance
 @10 ("Messaging")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-app-client+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createEnvMultiViewEnvironmentElement.instance
 @15 ("Environment")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-app-client+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createXmlMultiViewElement.instance
 @20 ("XML")
-o.n.m.localhistory@                      
Editors/text/x-dd-sun-app-client+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-sun-app-client+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-dd-sun-app-client+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-dd-sun-app-client+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-dd-sun-app-client+xml/macros.xml (merged)
@@ -5358,7 +5357,7 @@
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-application+xml/MultiView/
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-application+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createSecurityMultiViewSecurityElement.instance
 @3 ("Security")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-application+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createXmlMultiViewElement.instance
 @20 ("XML")
-o.n.m.localhistory@                      
Editors/text/x-dd-sun-application+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-sun-application+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-dd-sun-application+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-dd-sun-application+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-dd-sun-application+xml/macros.xml (merged)
@@ -5398,7 +5397,7 @@
 o.n.m.java.source                        
Editors/text/x-dd-sun-cmp-mapping+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-cmp-mapping+xml/MultiView/
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-cmp-mapping+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createXmlMultiViewElement.instance
 @20 ("XML")
-o.n.m.localhistory@                      
Editors/text/x-dd-sun-cmp-mapping+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-sun-cmp-mapping+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-dd-sun-cmp-mapping+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-dd-sun-cmp-mapping+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-dd-sun-cmp-mapping+xml/macros.xml (merged)
@@ -5443,7 +5442,7 @@
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-ejb-jar+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createServicesMultiViewElement.instance
 @5 ("Web Services")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-ejb-jar+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createJmsMultiViewElement.instance
 @10 ("Messaging")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-ejb-jar+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createXmlMultiViewElement.instance
 @20 ("XML")
-o.n.m.localhistory@                      
Editors/text/x-dd-sun-ejb-jar+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-sun-ejb-jar+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-dd-sun-ejb-jar+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-dd-sun-ejb-jar+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-dd-sun-ejb-jar+xml/macros.xml (merged)
@@ -5483,7 +5482,7 @@
 o.n.m.java.source                        
Editors/text/x-dd-sun-resource+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-resource+xml/MultiView/
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-resource+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createXmlMultiViewElement.instance
 @20 ("XML")
-o.n.m.localhistory@                      
Editors/text/x-dd-sun-resource+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-sun-resource+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-dd-sun-resource+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-dd-sun-resource+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-dd-sun-resource+xml/macros.xml (merged)
@@ -5529,7 +5528,7 @@
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-web+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createJmsMultiViewElement.instance
 @10 ("Messaging")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-web+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createEnvMultiViewEnvironmentElement.instance
 @15 ("Environment")
 o.n.m.j2ee.sun.ddui@                     
Editors/text/x-dd-sun-web+xml/MultiView/o-n-m-j2ee-sun-ddloaders-SunDescriptorDataObject-createXmlMultiViewElement.instance
 @20 ("XML")
-o.n.m.localhistory@                      
Editors/text/x-dd-sun-web+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-dd-sun-web+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-dd-sun-web+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-dd-sun-web+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-dd-sun-web+xml/macros.xml (merged)
@@ -5852,7 +5851,7 @@
 o.n.m.form.nb@                           Editors/text/x-form/MultiView/
 o.n.m.form.nb@                           
Editors/text/x-form/MultiView/o-n-m-nbform-FormEditorSupport$JavaEditorTopComponent.instance
 @1000 ("&Source")
 o.n.m.form.nb@                           
Editors/text/x-form/MultiView/o-n-m-nbform-FormDesignerTC.instance @2000 
("&Design")
-o.n.m.localhistory@                      
Editors/text/x-form/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-form/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-form/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-form/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-form/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance 
(merged)
@@ -5920,7 +5919,7 @@
 o.n.m.editor                             
Editors/text/x-fortran/Keybindings/NetBeans/Defaults/o-n-m-editor-keybindings.xml
 (merged)
 o.n.m.cnd.source@                        Editors/text/x-fortran/MultiView/
 o.n.m.cnd.source@                        
Editors/text/x-fortran/MultiView/o-n-m-cnd-source-FortranDataObject-createMultiViewEditorElement.instance
 @1 ("Source")
-o.n.m.localhistory@                      
Editors/text/x-fortran/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-fortran/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
                                          Editors/text/x-fortran/Popup/
 o.n.m.cnd.debugger.common2               
Editors/text/x-fortran/Popup/o-n-m-cnd-debugger-common2-debugger-actions-NewBreakpointAction.instance
 @200
 o.n.m.cnd.debugger.common2               
Editors/text/x-fortran/Popup/o-n-m-debugger-ui-actions-ToggleBreakpointAction.shadow
 @300
@@ -6015,7 +6014,7 @@
 o.n.m.java.source                        
Editors/text/x-fxml+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.javafx2.editor@                    Editors/text/x-fxml+xml/MultiView/
 o.n.m.javafx2.editor@                    
Editors/text/x-fxml+xml/MultiView/o-n-m-javafx2-editor-fxml-FXMLMultiViewHelper-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-fxml+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-fxml+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-fxml+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-fxml+xml/language.instance (merged)
 o.n.m.docbook                            Editors/text/x-fxml+xml/macros.xml 
(merged)
@@ -6197,7 +6196,7 @@
 o.n.m.groovy.editor                      
Editors/text/x-groovy/Keybindings/NetBeans/Defaults/o-n-m-groovy-keybindings.xml
 o.n.m.groovy.editor@                     Editors/text/x-groovy/MultiView/
 o.n.m.groovy.editor@                     
Editors/text/x-groovy/MultiView/o-n-m-groovy-editor-api-parser-GroovyLanguage-createEditor.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-groovy/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-groovy/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
                                          Editors/text/x-groovy/Popup/
                                          Editors/text/x-groovy/Popup/goto/ 
@500
 o.n.m.groovy.grailsproject               
Editors/text/x-groovy/Popup/goto/o-n-m-groovy-grailsproject-actions-GotoViewAction.shadow
 @100
@@ -6342,7 +6341,7 @@
 o.n.m.groovy.gsp                         
Editors/text/x-gsp/Keybindings/NetBeans/Defaults/o-n-m-groovy-gsp-keybindings.xml
 o.n.m.groovy.gsp@                        Editors/text/x-gsp/MultiView/
 o.n.m.groovy.gsp@                        
Editors/text/x-gsp/MultiView/o-n-m-groovy-gsp-loaders-GspDataObject-createEditor.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-gsp/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-gsp/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
                                          Editors/text/x-gsp/Popup/
 o.n.m.groovy.grailsproject               Editors/text/x-gsp/Popup/goto/ @100 
("Navigate")
 o.n.m.groovy.grailsproject               
Editors/text/x-gsp/Popup/goto/o-n-m-groovy-grailsproject-actions-GotoViewAction.shadow
 @100
@@ -6598,7 +6597,7 @@
 o.n.m.cnd.refactoring                    
Editors/text/x-h/Keybindings/NetBeans/Defaults/refactoring-keybindings.xml
 o.n.m.cnd.source@                        Editors/text/x-h/MultiView/
 o.n.m.cnd.source@                        
Editors/text/x-h/MultiView/o-n-m-cnd-source-HDataObject-createMultiViewEditorElement.instance
 @1 ("Source")
-o.n.m.localhistory@                      
Editors/text/x-h/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-h/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
                                          Editors/text/x-h/Popup/
                                          Editors/text/x-h/Popup/goto/ @100 
(o.n.m.cnd.editor: "Navigate")
 o.n.m.cnd.completion                     
Editors/text/x-h/Popup/goto/goto-declaration @100
@@ -6751,7 +6750,7 @@
 o.n.m.hibernate@                         
Editors/text/x-hibernate-cfg+xml/MultiView/
 o.n.m.hibernate@                         
Editors/text/x-hibernate-cfg+xml/MultiView/o-n-m-hibernate-loaders-cfg-HibernateCfgDataObject-createXmlMultiViewElement.instance
 @2550 ("Source")
 o.n.m.hibernate@                         
Editors/text/x-hibernate-cfg+xml/MultiView/o-n-m-hibernate-loaders-cfg-multiview-HibernateCfgToolBarMVElement.instance
 @2560 ("Design")
-o.n.m.localhistory@                      
Editors/text/x-hibernate-cfg+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-hibernate-cfg+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-hibernate-cfg+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-hibernate-cfg+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-hibernate-cfg+xml/macros.xml (merged)
@@ -6800,7 +6799,7 @@
 o.n.m.java.source                        
Editors/text/x-hibernate-mapping+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.hibernate@                         
Editors/text/x-hibernate-mapping+xml/MultiView/
 o.n.m.hibernate@                         
Editors/text/x-hibernate-mapping+xml/MultiView/o-n-m-hibernate-loaders-mapping-HibernateMappingDataObject-createXmlMultiViewElement.instance
 @1 ("Source")
-o.n.m.localhistory@                      
Editors/text/x-hibernate-mapping+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-hibernate-mapping+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-hibernate-mapping+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-hibernate-mapping+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-hibernate-mapping+xml/macros.xml (merged)
@@ -6845,7 +6844,7 @@
 o.n.m.java.source                        
Editors/text/x-hibernate-reveng+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.hibernate@                         
Editors/text/x-hibernate-reveng+xml/MultiView/
 o.n.m.hibernate@                         
Editors/text/x-hibernate-reveng+xml/MultiView/o-n-m-hibernate-loaders-reveng-HibernateRevengDataObject-createXmlMultiViewElement.instance
 @1 ("Source")
-o.n.m.localhistory@                      
Editors/text/x-hibernate-reveng+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-hibernate-reveng+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-hibernate-reveng+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-hibernate-reveng+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-hibernate-reveng+xml/macros.xml (merged)
@@ -6925,7 +6924,7 @@
 o.n.m.java.source                        
Editors/text/x-ini/JavaBinaryIndexer.instance (merged)
 o.n.m.languages.ini@                     Editors/text/x-ini/MultiView/
 o.n.m.languages.ini@                     
Editors/text/x-ini/MultiView/o-n-m-languages-ini-IniDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-ini/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-ini/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-ini/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-ini/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-ini/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance 
(merged)
@@ -7198,7 +7197,7 @@
 o.n.m.java.editor                        
Editors/text/x-java/Macros/Defaults/o-n-m-editor-java-macros.xml
 o.n.m.java.source@                       Editors/text/x-java/MultiView/
 o.n.m.java.source@                       
Editors/text/x-java/MultiView/o-n-m-java-JavaDataObject-createMultiViewEditorElement.instance
 @2000 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-java/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-java/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
                                          Editors/text/x-java/Popup/
                                          Editors/text/x-java/Popup/goto/ 
@500 (o.n.m.java.editor: "Navigate")
 o.n.m.java.editor                        
Editors/text/x-java/Popup/goto/goto-source @100
@@ -7417,7 +7416,7 @@
 o.n.m.beans@                             
Editors/text/x-java-beaninfo/MultiView/
 o.n.m.beans@                             
Editors/text/x-java-beaninfo/MultiView/o-n-m-beans-beaninfo-BIEditorSupport$JavaElement.instance
 @10 ("Source")
 o.n.m.beans@                             
Editors/text/x-java-beaninfo/MultiView/o-n-m-beans-beaninfo-BIEditorSupport$BeanInfoElement.instance
 @1000 ("Designer")
-o.n.m.localhistory@                      
Editors/text/x-java-beaninfo/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-java-beaninfo/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-java-beaninfo/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-java-beaninfo/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-java-beaninfo/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -7760,7 +7759,7 @@
 o.n.m.websvc.design@                     Editors/text/x-jaxws/MultiView/
 o.n.m.websvc.design@                     
Editors/text/x-jaxws/MultiView/o-n-m-websvc-design-multiview-SourceMultiViewElement.instance
 @1000 ("Source")
 o.n.m.websvc.design@                     
Editors/text/x-jaxws/MultiView/o-n-m-websvc-design-multiview-DesignMultiViewElement.instance
 @2000 ("Design")
-o.n.m.localhistory@                      
Editors/text/x-jaxws/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-jaxws/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-jaxws/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-jaxws/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-jaxws/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance 
(merged)
@@ -7795,7 +7794,7 @@
 o.n.m.java.source                        
Editors/text/x-jnlp+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.javawebstart@                      Editors/text/x-jnlp+xml/MultiView/
 o.n.m.javawebstart@                      
Editors/text/x-jnlp+xml/MultiView/o-n-m-javawebstart-JnlpDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-jnlp+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-jnlp+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-jnlp+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-jnlp+xml/language.instance (merged)
 o.n.m.docbook                            Editors/text/x-jnlp+xml/macros.xml 
(merged)
@@ -7842,7 +7841,7 @@
                                          Editors/text/x-jsf+xml/MultiView/
 o.n.m.web.jsf@                           
Editors/text/x-jsf+xml/MultiView/o-n-m-web-jsf-JSFConfigDataObject-createXmlMultiViewElement.instance
 @100 ("Source")
 o.n.m.web.jsf.navigation@                
Editors/text/x-jsf+xml/MultiView/o-n-m-web-jsf-navigation-PageFlowElement.instance
 @300 ("PageFlow")
-o.n.m.localhistory@                      
Editors/text/x-jsf+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-jsf+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.web.jsf                            Editors/text/x-jsf+xml/Popup/
 o.n.m.web.jsf                            
Editors/text/x-jsf+xml/Popup/o-n-m-web-jsf-editor-JsfPopupAction.instance 
@1000
 o.n.m.xml.text                           Editors/text/x-jsf+xml/Popup/format 
(merged) @1200
@@ -8091,7 +8090,7 @@
 o.n.m.web.core.syntax                    
Editors/text/x-jsp/Keybindings/NetBeans/Defaults/o-n-m-web-core-syntax-keybindings.xml
 o.n.m.web.core@                          Editors/text/x-jsp/MultiView/
 o.n.m.web.core@                          
Editors/text/x-jsp/MultiView/o-n-m-web-core-jsploader-JspDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-jsp/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-jsp/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.web.core                           
Editors/text/x-jsp/PaletteFactory.instance
                                          Editors/text/x-jsp/Popup/
 o.n.m.web.core                           
Editors/text/x-jsp/Popup/o-n-m-project-ui-RunSingle.shadow @1250
@@ -8276,7 +8275,7 @@
 o.n.m.cnd.script                         
Editors/text/x-make/MakefileIndentTaskFactory.instance
 o.n.m.cnd.script@                        Editors/text/x-make/MultiView/
 o.n.m.cnd.script@                        
Editors/text/x-make/MultiView/o-n-m-cnd-makefile-loaders-MakefileDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-make/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-make/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.cnd.script                         
Editors/text/x-make/ParserFactory.instance
 o.n.m.cnd.script                         Editors/text/x-make/Preferences/
 o.n.m.cnd.script                         
Editors/text/x-make/Preferences/Defaults/
@@ -8327,7 +8326,7 @@
 o.n.m.java.source                        
Editors/text/x-manifest/JavaBinaryIndexer.instance (merged)
 o.n.m.languages.manifest@                Editors/text/x-manifest/MultiView/
 o.n.m.languages.manifest@                
Editors/text/x-manifest/MultiView/o-n-m-languages-manifest-MfDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-manifest/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-manifest/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.languages.manifest                 Editors/text/x-manifest/Preferences/
 o.n.m.languages.manifest                 
Editors/text/x-manifest/Preferences/Defaults/
 o.n.m.editor.deprecated.pre61settings    
Editors/text/x-manifest/Preferences/Defaults/o-n-m-editor-deprecated-pre61settings-preferences.xml
 (merged)
@@ -8385,7 +8384,7 @@
                                          
Editors/text/x-maven-pom+xml/MultiView/
 o.n.m.maven.grammar@                     
Editors/text/x-maven-pom+xml/MultiView/o-n-m-maven-grammar-POMDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
 o.n.m.maven.graph@                       
Editors/text/x-maven-pom+xml/MultiView/o-n-m-maven-graph-DependencyGraphTopComponent-forPOM.instance
 @100 ("Graph")
-o.n.m.localhistory@                      
Editors/text/x-maven-pom+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-maven-pom+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
                                          Editors/text/x-maven-pom+xml/Popup/
 o.n.m.maven.grammar                      
Editors/text/x-maven-pom+xml/Popup/generate-code @13
 o.n.m.kenai.maven@                       
Editors/text/x-maven-pom+xml/Popup/o-n-m-kenai-maven-KenaiUpdateAction.shadow 
@163
@@ -8457,7 +8456,7 @@
 o.n.m.java.source                        
Editors/text/x-maven-settings+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.maven.grammar@                     
Editors/text/x-maven-settings+xml/MultiView/
 o.n.m.maven.grammar@                     
Editors/text/x-maven-settings+xml/MultiView/o-n-m-maven-grammar-POMDataObject-createSettingsMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-maven-settings+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-maven-settings+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.maven.grammar                      
Editors/text/x-maven-settings+xml/Popup/
 o.n.m.maven.grammar                      
Editors/text/x-maven-settings+xml/Popup/generate-code @13
 o.n.m.xml.text                           
Editors/text/x-maven-settings+xml/Popup/format (merged) @1200
@@ -8587,7 +8586,7 @@
 o.n.m.java.source                        
Editors/text/x-neon/JavaBinaryIndexer.instance (merged)
 o.n.m.languages.neon@                    Editors/text/x-neon/MultiView/
 o.n.m.languages.neon@                    
Editors/text/x-neon/MultiView/o-n-m-languages-neon-NeonDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-neon/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-neon/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-neon/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-neon/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-neon/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance 
(merged)
@@ -8622,7 +8621,7 @@
 o.n.m.java.source                        
Editors/text/x-netbeans-layer+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.apisupport.project@                
Editors/text/x-netbeans-layer+xml/MultiView/
 o.n.m.apisupport.project@                
Editors/text/x-netbeans-layer+xml/MultiView/o-n-m-apisupport-project-layers-LayerDataObject-createEditor.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-netbeans-layer+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-netbeans-layer+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.apisupport.refactoring@            
Editors/text/x-netbeans-layer+xml/UpToDateStatusProvider/
 o.n.m.apisupport.refactoring@            
Editors/text/x-netbeans-layer+xml/UpToDateStatusProvider/o-n-m-apisupport-hints-LayerHints.instance
 o.n.m.diff                               
Editors/text/x-netbeans-layer+xml/UpToDateStatusProvider/o-n-m-diff-builtin-visualizer-editable-DiffMarkProviderCreator.instance
 (merged)
@@ -8723,7 +8722,7 @@
 o.n.m.j2ee.persistence@                  
Editors/text/x-persistence1.0/MultiView/
 o.n.m.j2ee.persistence@                  
Editors/text/x-persistence1.0/MultiView/o-n-m-j2ee-persistence-unit-PersistenceToolBarMVElement.instance
 @1300 ("Design")
 o.n.m.j2ee.persistence@                  
Editors/text/x-persistence1.0/MultiView/o-n-m-j2ee-persistence-unit-PUDataObject-createXmlMultiViewElement.instance
 @2000 ("Source")
-o.n.m.localhistory@                      
Editors/text/x-persistence1.0/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-persistence1.0/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-persistence1.0/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-persistence1.0/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-persistence1.0/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -8948,7 +8947,7 @@
 o.n.m.php.editor                         
Editors/text/x-php5/Keybindings/NetBeans/Defaults/o-n-m-php-editor-keybindings.xml
 o.n.m.php.editor@                        Editors/text/x-php5/MultiView/
 o.n.m.php.editor@                        
Editors/text/x-php5/MultiView/o-n-m-php-editor-PHPLanguage-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-php5/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-php5/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.php.editor                         
Editors/text/x-php5/PaletteFactory.instance
                                          Editors/text/x-php5/Popup/
                                          Editors/text/x-php5/Popup/goto/ 
@500 (o.n.m.php.editor: "Navigate")
@@ -9149,7 +9148,7 @@
 o.n.m.properties.syntax                  
Editors/text/x-properties/Keybindings/NetBeans/Defaults/o-n-m-editor-properties-keybindings.xml
 o.n.m.properties@                        Editors/text/x-properties/MultiView/
 o.n.m.properties@                        
Editors/text/x-properties/MultiView/o-n-m-properties-PropertiesEditorSupport$PropertiesEditor.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-properties/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-properties/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.properties.syntax                  
Editors/text/x-properties/Preferences/
 o.n.m.properties.syntax                  
Editors/text/x-properties/Preferences/Defaults/
 o.n.m.editor.deprecated.pre61settings    
Editors/text/x-properties/Preferences/Defaults/o-n-m-editor-deprecated-pre61settings-preferences.xml
 (merged)
@@ -9513,7 +9512,7 @@
 o.n.m.java.source                        
Editors/text/x-qtproject/JavaBinaryIndexer.instance (merged)
 o.n.m.cnd@                               Editors/text/x-qtproject/MultiView/
 o.n.m.cnd@                               
Editors/text/x-qtproject/MultiView/o-n-m-cnd-loaders-QtProjectDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-qtproject/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-qtproject/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.cnd.spellchecker.bindings@         
Editors/text/x-qtproject/TokenListProvider/
 o.n.m.cnd.spellchecker.bindings@         
Editors/text/x-qtproject/TokenListProvider/o-n-m-cnd-spellchecker-bindings-CndTokenListProvider.instance
 @1000
 o.n.m.editor.codetemplates               
Editors/text/x-qtproject/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
@@ -9775,7 +9774,7 @@
 o.n.m.java.source                        
Editors/text/x-springconfig+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.spring.beans@                      
Editors/text/x-springconfig+xml/MultiView/
 o.n.m.spring.beans@                      
Editors/text/x-springconfig+xml/MultiView/o-n-m-spring-beans-loader-SpringXMLConfigDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-springconfig+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-springconfig+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-springconfig+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-springconfig+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-springconfig+xml/macros.xml (merged)
@@ -9841,7 +9840,7 @@
 o.n.m.java.source                        
Editors/text/x-sql/JavaBinaryIndexer.instance (merged)
 o.n.m.db.core@                           Editors/text/x-sql/MultiView/
 o.n.m.db.core@                           
Editors/text/x-sql/MultiView/o-n-m-db-sql-loader-SQLCloneableEditor.instance 
@1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-sql/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-sql/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.db.sql.editor                      Editors/text/x-sql/Popup/
 o.n.m.db.sql.editor                      
Editors/text/x-sql/Popup/o-n-m-db-sql-editor-ui-actions-RunSQLSelectionAction.shadow
 @800
 o.n.m.db.sql.editor                      
Editors/text/x-sql/Popup/o-n-m-db-sql-editor-ui-actions-SQLHistoryAction.shadow
 @802
@@ -9928,7 +9927,7 @@
 o.n.m.java.source                        
Editors/text/x-struts+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.web.struts@                        Editors/text/x-struts+xml/MultiView/
 o.n.m.web.struts@                        
Editors/text/x-struts+xml/MultiView/o-n-m-web-struts-StrutsConfigDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-struts+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-struts+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.web.struts                         Editors/text/x-struts+xml/Popup/
 o.n.m.web.struts                         
Editors/text/x-struts+xml/Popup/o-n-m-web-struts-editor-StrutsPopupAction.instance
 @900
 o.n.m.web.struts                         
Editors/text/x-struts+xml/Popup/Separator0.instance @1000
@@ -10017,7 +10016,7 @@
 o.n.m.java.source                        
Editors/text/x-tag/JavaBinaryIndexer.instance (merged)
 o.n.m.web.core@                          Editors/text/x-tag/MultiView/
 o.n.m.web.core@                          
Editors/text/x-tag/MultiView/o-n-m-web-core-jsploader-JspDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-tag/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-tag/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.web.core                           
Editors/text/x-tag/PaletteFactory.instance
 o.n.m.web.core.syntax                    Editors/text/x-tag/Popup/
 o.n.m.web.core.syntax                    
Editors/text/x-tag/Popup/o-n-m-refactoring-api-ui-WhereUsedAction.shadow @1280
@@ -10133,7 +10132,7 @@
 o.n.m.java.source                        
Editors/text/x-testng+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.testng@                            Editors/text/x-testng+xml/MultiView/
 o.n.m.testng@                            
Editors/text/x-testng+xml/MultiView/o-n-m-contrib-testng-TestNGSuiteDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-testng+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-testng+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/x-testng+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/x-testng+xml/language.instance (merged)
 o.n.m.docbook                            
Editors/text/x-testng+xml/macros.xml (merged)
@@ -10172,7 +10171,7 @@
 o.n.m.java.source                        
Editors/text/x-tld/JavaBinaryIndexer.instance (merged)
 o.n.m.web.core@                          Editors/text/x-tld/MultiView/
 o.n.m.web.core@                          
Editors/text/x-tld/MultiView/o-n-m-web-taglib-TLDDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-tld/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-tld/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-tld/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-tld/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-tld/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance 
(merged)
@@ -10233,7 +10232,7 @@
 o.n.m.java.source                        
Editors/text/x-tpl/JavaBinaryIndexer.instance (merged)
 o.n.m.php.smarty@                        Editors/text/x-tpl/MultiView/
 o.n.m.php.smarty@                        
Editors/text/x-tpl/MultiView/o-n-m-php-smarty-editor-TplDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-tpl/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-tpl/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.php.smarty                         
Editors/text/x-tpl/PaletteFactory.instance
 o.n.m.php.smarty                         Editors/text/x-tpl/Popup/
 o.n.m.php.smarty                         Editors/text/x-tpl/Popup/goto/ @500
@@ -10347,7 +10346,7 @@
 o.n.m.java.source                        
Editors/text/x-twig/JavaBinaryIndexer.instance (merged)
 o.n.m.php.twig@                          Editors/text/x-twig/MultiView/
 o.n.m.php.twig@                          
Editors/text/x-twig/MultiView/o-n-m-php-twig-editor-TwigDataObject-createMultiViewEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/x-twig/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-twig/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.php.twig                           Editors/text/x-twig/Popup/
 o.n.m.php.twig                           Editors/text/x-twig/Popup/goto/ @500
 o.n.m.php.twig                           Editors/text/x-twig/Popup/goto/goto 
@600
@@ -10465,7 +10464,7 @@
 o.n.m.mobility.end2end@                  
Editors/text/x-wsclient.class/MultiView/o-n-m-mobility-end2end-E2EDataObject-createClassSourceViewElement.instance
 @1 ("Source")
 o.n.m.mobility.end2end@                  
Editors/text/x-wsclient.class/MultiView/o-n-m-mobility-end2end-multiview-ClientMultiViewElement-createClassClientViewElement.instance
 @100 ("Client")
 o.n.m.mobility.end2end@                  
Editors/text/x-wsclient.class/MultiView/o-n-m-mobility-end2end-multiview-ServerMultiViewElement-createClassServerViewElement.instance
 @110 ("Server")
-o.n.m.localhistory@                      
Editors/text/x-wsclient.class/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-wsclient.class/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-wsclient.class/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-wsclient.class/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-wsclient.class/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -10500,7 +10499,7 @@
                                          
Editors/text/x-wsclient.jsr172/MultiView/
 o.n.m.mobility.end2end@                  
Editors/text/x-wsclient.jsr172/MultiView/o-n-m-mobility-end2end-E2EDataObject-createJsr172SourceViewElement.instance
 @1 ("Source")
 o.n.m.mobility.jsr172@                   
Editors/text/x-wsclient.jsr172/MultiView/o-n-m-mobility-jsr172-multiview-Jsr172ClientMultiViewElement-createJsr172ClientViewElement.instance
 @100 ("Client")
-o.n.m.localhistory@                      
Editors/text/x-wsclient.jsr172/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-wsclient.jsr172/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-wsclient.jsr172/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-wsclient.jsr172/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-wsclient.jsr172/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -10536,7 +10535,7 @@
 o.n.m.mobility.end2end@                  
Editors/text/x-wsclient.wsdl/MultiView/o-n-m-mobility-end2end-E2EDataObject-createWsdlSourceViewElement.instance
 @1 ("Source")
 o.n.m.mobility.end2end@                  
Editors/text/x-wsclient.wsdl/MultiView/o-n-m-mobility-end2end-multiview-ClientMultiViewElement-createWsdlClientViewElement.instance
 @100 ("Client")
 o.n.m.mobility.end2end@                  
Editors/text/x-wsclient.wsdl/MultiView/o-n-m-mobility-end2end-multiview-ServerMultiViewElement-createWsdlServerViewElement.instance
 @110 ("Server")
-o.n.m.localhistory@                      
Editors/text/x-wsclient.wsdl/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/x-wsclient.wsdl/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.editor.codetemplates               
Editors/text/x-wsclient.wsdl/o-n-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance
 (merged)
 o.n.m.editor                             
Editors/text/x-wsclient.wsdl/o-n-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance
 (merged)
 o.n.m.csl.api                            
Editors/text/x-wsclient.wsdl/o-n-m-csl-editor-fold-GsfFoldManagerTaskFactory.instance
 (merged)
@@ -11096,7 +11095,7 @@
 o.n.m.java.source                        
Editors/text/xml-external-parsed-entity/JavaBinaryIndexer.instance (merged)
 o.n.m.xml@                               
Editors/text/xml-external-parsed-entity/MultiView/
 o.n.m.xml@                               
Editors/text/xml-external-parsed-entity/MultiView/o-n-m-xml-EntityDataObject-createMultiViewDTDElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/xml-external-parsed-entity/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/xml-external-parsed-entity/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.xml.text                           
Editors/text/xml-external-parsed-entity/Popup/
 o.n.m.xml.text                           
Editors/text/xml-external-parsed-entity/Popup/format @1200
 o.n.m.xml.text                           
Editors/text/xml-external-parsed-entity/Popup/o-n-m-xml-actions-XMLViewActions.instance
 @1400
@@ -11157,7 +11156,7 @@
 o.n.m.java.source                        
Editors/text/xsd+xml/JavaBinaryIndexer.instance (merged)
 o.n.m.xml@                               Editors/text/xsd+xml/MultiView/
 o.n.m.xml@                               
Editors/text/xsd+xml/MultiView/o-n-m-xml-XMLDataObject-createMultiViewXSDEditorElement.instance
 @1 ("&Source")
-o.n.m.localhistory@                      
Editors/text/xsd+xml/MultiView/o-n-m-localhistory-ui-view-LocalHistoryTopComponent.instance
 (merged) @1000000 ("&History")
+o.n.m.versioning.ui@                     
Editors/text/xsd+xml/MultiView/o-n-m-versioning-ui-history-HistoryComponent.instance
 (merged) @1000000 ("&History")
 o.n.m.docbook                            
Editors/text/xsd+xml/abbreviations.xml (merged)
 o.n.m.xml.lexer                          
Editors/text/xsd+xml/language.instance (merged)
 o.n.m.docbook                            Editors/text/xsd+xml/macros.xml 
(merged)
@@ -15085,10 +15084,9 @@
 o.n.m.options.editor                     OptionsDialog/Actions/GoTo/goto-help
 o.n.m.options.editor                     
OptionsDialog/Actions/GoTo/goto-source
 o.n.m.options.editor                     
OptionsDialog/Actions/GoTo/goto-super-implementation
-o.n.m.localhistory                       OptionsDialog/Actions/LocalHistory/ 
("Local History")
-o.n.m.localhistory                       
OptionsDialog/Actions/LocalHistory/RevertDeletedAction.shadow
-o.n.m.localhistory                       
OptionsDialog/Actions/LocalHistory/RevertToAction.shadow
-o.n.m.localhistory                       
OptionsDialog/Actions/LocalHistory/ShowLocalHistoryAction.shadow
+o.n.m.localhistory@                      OptionsDialog/Actions/History/
+o.n.m.localhistory@                      
OptionsDialog/Actions/History/RevertDeletedAction.shadow
+o.n.m.localhistory@                      
OptionsDialog/Actions/History/ShowHistoryAction.shadow
 o.n.m.mercurial@                         OptionsDialog/Actions/Mercurial/
 o.n.m.mercurial@                         
OptionsDialog/Actions/Mercurial/o-n-m-mercurial-ui-status-OpenVersioningAction.shadow
 o.n.m.options.editor                     OptionsDialog/Actions/Refactor/ 
("Refactor")
@@ -15356,10 +15354,10 @@
 o.n.m.j2eeserver                         OptionsExport/Advanced/J2EE ("Java 
EE")
 o.n.m.web.core                           OptionsExport/Advanced/JSPPalette 
("JSP Palette")
 o.n.m.java.platform                      OptionsExport/Advanced/JavaPlatform 
("Java Platforms")
-o.n.m.localhistory                       OptionsExport/Advanced/LocalHistory 
("Local History")
 o.n.m.maven                              OptionsExport/Advanced/Maven 
("Maven")
 o.n.m.project.libraries                  
OptionsExport/Advanced/ProjectLibraries ("Libraries & Variables")
 o.n.core.windows                         OptionsExport/Advanced/Toolbars 
("Toolbars")
+o.n.m.versioning.ui                      
OptionsExport/Advanced/VersioningHistory ("History")
 o.n.m.vmd.midpnb                         OptionsExport/Advanced/VmdMidp 
("MIDP Palette")
 o.n.m.cnd.editor                         OptionsExport/CND/ @900 ("C/C++")
 o.n.m.cnd.editor                         OptionsExport/CND/BuildTools @100 
("Build Tools")
@@ -18102,7 +18100,7 @@
 o.n.m.versioning.system.cvss             VersioningOptionsDialog/Cvs.instance
 o.n.m.versioning.ui                      
VersioningOptionsDialog/General.instance
 o.n.m.git                                VersioningOptionsDialog/Git.instance
-o.n.m.localhistory                       
VersioningOptionsDialog/LocalHistory.instance
+o.n.m.versioning.ui                      
VersioningOptionsDialog/History.instance
 o.n.m.mercurial                          
VersioningOptionsDialog/Mercurial.instance
 o.n.m.subversion                         
VersioningOptionsDialog/Subversion.instance
                                          WarmUp/


[api-changes] Golden file changes in nbms-and-javadoc build #8610

hudson 01/31/2012

Project Features

About this Project

www was started in November 2009, is owned by jpirek, and has 21 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20131025.e7cbc9d). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close