Index: apisupport/project/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerModuleList.java
===================================================================
RCS file: /cvs/apisupport/project/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerModuleList.java,v
retrieving revision 1.12
diff -u -r1.12 SuiteCustomizerModuleList.java
--- apisupport/project/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerModuleList.java	16 Sep 2005 19:42:38 -0000	1.12
+++ apisupport/project/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerModuleList.java	27 Sep 2005 13:12:33 -0000
@@ -191,6 +191,8 @@
 	DISABLED_PLATFORM_MODULES.add("org.openide.io"); // NOI18N
 	DISABLED_PLATFORM_MODULES.add("org.netbeans.core.output2"); // NOI18N
 	DISABLED_PLATFORM_MODULES.add("org.netbeans.core.multiview"); // NOI18N
+    // this one is useful only for writers of apps showing local disk
+	DISABLED_PLATFORM_MODULES.add("org.netbeans.modules.favorites"); // NOI18N
 	// And these are deprecated:
 	DISABLED_PLATFORM_MODULES.add("org.openide.compat"); // NOI18N
 	DISABLED_PLATFORM_MODULES.add("org.openide.util.enumerations"); // NOI18N
Index: apisupport/www/phase-V-ui.html
===================================================================
RCS file: /cvs/apisupport/www/phase-V-ui.html,v
retrieving revision 1.11
diff -u -r1.11 phase-V-ui.html
--- apisupport/www/phase-V-ui.html	23 Sep 2005 21:38:51 -0000	1.11
+++ apisupport/www/phase-V-ui.html	27 Sep 2005 13:12:33 -0000
@@ -427,7 +427,8 @@
    The <q>platform</q> modules <b>Auto Update</b> (meaningless in JNLP mode and not necessarily desirable in
    other applications); <b>Execution API</b>, <b>Core - Execution</b>, <b>Input/Output APIs</b>, <b>Output
    Window</b>, and <b>Multi-View Windows</b> (not very likely to be wanted in non-IDE-oriented applications, and
-   can add undesirable GUI elements in JNLP mode); <b>Deprecated Compatibility APIs</b> and <b>Deprecated
+   can add undesirable GUI elements in JNLP mode); <b>Favorites</b> as that are needed only for applications
+   accessing local files; <b>Deprecated Compatibility APIs</b> and <b>Deprecated
    Enumeration APIs</b> (only exist for compatibility with old modules).
   </p>
  </li>
Index: ide/golden/deps.txt
===================================================================
RCS file: /cvs/ide/golden/deps.txt,v
retrieving revision 1.211
diff -u -r1.211 deps.txt
--- ide/golden/deps.txt	23 Sep 2005 15:25:54 -0000	1.211
+++ ide/golden/deps.txt	27 Sep 2005 13:12:34 -0000
@@ -621,7 +621,7 @@
   REQUIRES org.openide.modules.ModuleFormat1
   REQUIRES org.openide.options (platform)
   REQUIRES org.openide.util (platform)
-MODULE org.netbeans.modules.favorites/1 (ide)
+MODULE org.netbeans.modules.favorites/1 (platform)
   REQUIRES org.openide.actions (platform)
   REQUIRES org.openide.awt (platform)
   REQUIRES org.openide.dialogs (platform)
Index: ide/golden/files-layout.txt
===================================================================
RCS file: /cvs/ide/golden/files-layout.txt,v
retrieving revision 1.104
diff -u -r1.104 files-layout.txt
--- ide/golden/files-layout.txt	25 Sep 2005 11:08:46 -0000	1.104
+++ ide/golden/files-layout.txt	27 Sep 2005 13:12:34 -0000
@@ -616,7 +616,6 @@
 ide6/config/Modules/org-netbeans-modules-editor-util.xml
 ide6/config/Modules/org-netbeans-modules-editor.xml
 ide6/config/Modules/org-netbeans-modules-extbrowser.xml
-ide6/config/Modules/org-netbeans-modules-favorites.xml
 ide6/config/Modules/org-netbeans-modules-form.xml
 ide6/config/Modules/org-netbeans-modules-html-editor-lib.xml
 ide6/config/Modules/org-netbeans-modules-html-editor.xml
@@ -774,7 +773,6 @@
 ide6/modules/org-netbeans-modules-editor-util.jar
 ide6/modules/org-netbeans-modules-editor.jar
 ide6/modules/org-netbeans-modules-extbrowser.jar
-ide6/modules/org-netbeans-modules-favorites.jar
 ide6/modules/org-netbeans-modules-form.jar
 ide6/modules/org-netbeans-modules-html-editor-lib.jar
 ide6/modules/org-netbeans-modules-html-editor.jar
@@ -891,7 +889,6 @@
 ide6/update_tracking/org-netbeans-modules-editor-util.xml
 ide6/update_tracking/org-netbeans-modules-editor.xml
 ide6/update_tracking/org-netbeans-modules-extbrowser.xml
-ide6/update_tracking/org-netbeans-modules-favorites.xml
 ide6/update_tracking/org-netbeans-modules-form.xml
 ide6/update_tracking/org-netbeans-modules-html-editor-lib.xml
 ide6/update_tracking/org-netbeans-modules-html-editor.xml
@@ -1089,6 +1086,7 @@
 platform6/config/Modules/org-netbeans-core-windows.xml
 platform6/config/Modules/org-netbeans-core.xml
 platform6/config/Modules/org-netbeans-modules-autoupdate.xml
+platform6/config/Modules/org-netbeans-modules-favorites.xml
 platform6/config/Modules/org-netbeans-modules-javahelp.xml
 platform6/config/Modules/org-netbeans-modules-masterfs.xml
 platform6/config/Modules/org-netbeans-modules-queries.xml
@@ -1127,6 +1125,7 @@
 platform6/modules/org-netbeans-core-windows.jar
 platform6/modules/org-netbeans-core.jar
 platform6/modules/org-netbeans-modules-autoupdate.jar
+platform6/modules/org-netbeans-modules-favorites.jar
 platform6/modules/org-netbeans-modules-javahelp.jar
 platform6/modules/org-netbeans-modules-masterfs.jar
 platform6/modules/org-netbeans-modules-queries.jar
@@ -1156,6 +1155,7 @@
 platform6/update_tracking/org-netbeans-core-windows.xml
 platform6/update_tracking/org-netbeans-core.xml
 platform6/update_tracking/org-netbeans-modules-autoupdate.xml
+platform6/update_tracking/org-netbeans-modules-favorites.xml
 platform6/update_tracking/org-netbeans-modules-javahelp.xml
 platform6/update_tracking/org-netbeans-modules-masterfs.xml
 platform6/update_tracking/org-netbeans-modules-queries.xml
Index: ide/golden/modules.txt
===================================================================
RCS file: /cvs/ide/golden/modules.txt,v
retrieving revision 1.54
diff -u -r1.54 modules.txt
--- ide/golden/modules.txt	23 Sep 2005 15:25:56 -0000	1.54
+++ ide/golden/modules.txt	27 Sep 2005 13:12:34 -0000
@@ -66,7 +66,7 @@
 MODULE org.netbeans.modules.editor.structure/1 (ide)
 MODULE org.netbeans.modules.editor.util/1 (ide)
 MODULE org.netbeans.modules.extbrowser/1 (ide)
-MODULE org.netbeans.modules.favorites/1 (ide)
+MODULE org.netbeans.modules.favorites/1 (platform)
 MODULE org.netbeans.modules.form/2 (ide)
 MODULE org.netbeans.modules.html/1 (ide)
 MODULE org.netbeans.modules.html.editor/1 (ide)
Index: nbbuild/cluster.properties
===================================================================
RCS file: /cvs/nbbuild/cluster.properties,v
retrieving revision 1.127
diff -u -r1.127 cluster.properties
--- nbbuild/cluster.properties	17 Sep 2005 14:21:35 -0000	1.127
+++ nbbuild/cluster.properties	27 Sep 2005 13:12:34 -0000
@@ -42,6 +42,7 @@
         core/swing/plaf,\
         core/swing/tabcontrol,\
         core/ui,\
+        core/favorites,\
         core/windows,\
         openide/actions,\
         openide/awt,\
@@ -65,7 +66,6 @@
 nb.pkg.idesupport=\
 	editor/completion,\
         ant/debugger,\
-        core/favorites,\
         core/ide,\
         core/navigator,\
         core/options,\
Index: core/favorites/src/org/netbeans/modules/favorites/Bundle.properties
===================================================================
RCS file: /cvs/core/favorites/src/org/netbeans/modules/favorites/Bundle.properties,v
retrieving revision 1.16
diff -u -r1.16 Bundle.properties
--- core/favorites/src/org/netbeans/modules/favorites/Bundle.properties	23 Aug 2005 11:21:49 -0000	1.16
+++ core/favorites/src/org/netbeans/modules/favorites/Bundle.properties	27 Sep 2005 13:12:34 -0000
@@ -18,6 +18,7 @@
 
 Favorites=Favorites
 Templates/Other=Other
+Templates/Other/Folder=Folder
 Templates/Other/file=Empty File
 
 #name [display name]
Index: core/favorites/src/org/netbeans/modules/favorites/resources/layer.xml
===================================================================
RCS file: /cvs/core/favorites/src/org/netbeans/modules/favorites/resources/layer.xml,v
retrieving revision 1.14
diff -u -r1.14 layer.xml
--- core/favorites/src/org/netbeans/modules/favorites/resources/layer.xml	19 Sep 2005 13:54:47 -0000	1.14
+++ core/favorites/src/org/netbeans/modules/favorites/resources/layer.xml	27 Sep 2005 13:12:34 -0000
@@ -86,6 +86,11 @@
 
     <folder name="Templates" >
         <folder name="Other" >
+            <folder name="Folder">
+                <attr name="template" boolvalue="true"/>
+                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.favorites.Bundle" />
+                <attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/modules/favorites/resources/templatesFolder.html" />
+            </folder>
             <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.favorites.Bundle"/>
             <file name="file">
                 <![CDATA[]]>
@@ -96,6 +101,12 @@
                 <attr name="templateCategory" stringvalue="simple-files"/>
             </file>
         </folder>
+        <!-- folder for all privileged templates -->
+        <folder name="Privileged">
+	    <file name="Folder.shadow">
+                <attr name="originalFile" stringvalue="Templates/Other/Folder"/>
+            </file>
+	</folder>
     </folder>
  
 </filesystem>
Index: core/favorites/src/org/netbeans/modules/favorites/resources/templatesFolder.html
===================================================================
RCS file: core/favorites/src/org/netbeans/modules/favorites/resources/templatesFolder.html
diff -N core/favorites/src/org/netbeans/modules/favorites/resources/templatesFolder.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ core/favorites/src/org/netbeans/modules/favorites/resources/templatesFolder.html	27 Sep 2005 13:12:34 -0000
@@ -0,0 +1,16 @@
+<!--
+   -                 Sun Public License Notice
+   - 
+   - The contents of this file are subject to the Sun Public License
+   - Version 1.0 (the "License"). You may not use this file except in
+   - compliance with the License. A copy of the License is available at
+   - http://www.sun.com/
+   - 
+   - The Original Code is NetBeans. The Initial Developer of the Original
+   - Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
+   - Microsystems, Inc. All Rights Reserved.
+  -->
+
+<HTML><BODY>
+Creates a new folder on your disk.
+</BODY></HTML>
Index: core/src/org/netbeans/core/Bundle.properties
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/Bundle.properties,v
retrieving revision 1.414
diff -u -r1.414 Bundle.properties
--- core/src/org/netbeans/core/Bundle.properties	22 Sep 2005 10:35:11 -0000	1.414
+++ core/src/org/netbeans/core/Bundle.properties	27 Sep 2005 13:12:35 -0000
@@ -243,7 +243,6 @@
 Toolbars/StatusLine=Status Line
 Projects=Projects
 Bookmarks=&Bookmarks
-Templates/Folder=Folder
 Templates/Mount=Filesystems
 Mount=Filesystems Settings
 
Index: core/src/org/netbeans/core/resources/templatesFolder.html
===================================================================
RCS file: core/src/org/netbeans/core/resources/templatesFolder.html
diff -N core/src/org/netbeans/core/resources/templatesFolder.html
--- core/src/org/netbeans/core/resources/templatesFolder.html	1 Apr 2005 12:21:51 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<!--
-   -                 Sun Public License Notice
-   - 
-   - The contents of this file are subject to the Sun Public License
-   - Version 1.0 (the "License"). You may not use this file except in
-   - compliance with the License. A copy of the License is available at
-   - http://www.sun.com/
-   - 
-   - The Original Code is NetBeans. The Initial Developer of the Original
-   - Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
-   - Microsystems, Inc. All Rights Reserved.
-  -->
-
-<HTML><BODY>
-Creates a new folder on your disk.
-</BODY></HTML>
Index: core/ui/src/org/netbeans/core/ui/resources/layer.xml
===================================================================
RCS file: /cvs/core/ui/src/org/netbeans/core/ui/resources/layer.xml,v
retrieving revision 1.103
diff -u -r1.103 layer.xml
--- core/ui/src/org/netbeans/core/ui/resources/layer.xml	23 Sep 2005 08:46:57 -0000	1.103
+++ core/ui/src/org/netbeans/core/ui/resources/layer.xml	27 Sep 2005 13:12:35 -0000
@@ -252,12 +252,6 @@
         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.Bundle"/>
         <attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/core/resources/templatesRootDescription.html"/>
         <attr name="helpID" stringvalue="org.netbeans.core.actions.OptionsAction$Templates"/>
-
-        <folder name="Folder">
-            <attr name="template" boolvalue="true"/>
-            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.Bundle" />
-            <attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/core/resources/templatesFolder.html" />
-        </folder>
         
         <folder name="Services">
             <attr name="simple" boolvalue="false" />
@@ -275,9 +269,6 @@
             <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.ui.resources.Bundle"/>
             <!-- a value to signal that this folder should not be visible in the simple new from template wizard -->
             <attr name="simple" boolvalue="false" />
-	    <file name="Folder.shadow">
-                <attr name="originalFile" stringvalue="Templates/Folder"/>
-            </file>
 	</folder>
         
         <!-- folder for all recent templates -->