Index: core/nbproject/project.xml
===================================================================
RCS file: /cvs/core/nbproject/project.xml,v
retrieving revision 1.11
diff -u -r1.11 project.xml
--- core/nbproject/project.xml	14 Sep 2005 09:57:58 -0000	1.11
+++ core/nbproject/project.xml	26 Oct 2005 13:29:08 -0000
@@ -14,7 +14,8 @@
 <project xmlns="http://www.netbeans.org/ns/project/1">
     <type>org.netbeans.modules.apisupport.project</type>
     <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
+        
+    <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
             <code-name-base>org.netbeans.core</code-name-base>
             <module-dependencies>
                 <dependency>
@@ -138,14 +139,25 @@
                     </run-dependency>
                 </dependency>
             </module-dependencies>
-            <public-packages>
-                <!-- core/execution, editor, i18n -->
+            
+        <friend-packages>
+                <friend>org.netbeans.core.execution</friend>
+                <friend>org.netbeans.core.ide</friend>
+                <friend>org.netbeans.core.windows</friend>
+                <friend>org.netbeans.modules.autoupdate</friend>
+                <friend>org.netbeans.modules.form</friend>
+                <friend>org.netbeans.modules.i18n</friend>
+                <friend>org.netbeans.modules.java</friend>
+                <friend>org.netbeans.modules.javadoc</friend>
+                <friend>org.netbeans.modules.javahelp</friend>
+                <friend>org.netbeans.modules.options.editor</friend>
+                <friend>org.netbeans.modules.settings</friend>
+                <friend>org.netbeans.modules.utilities</friend>
+                <friend>org.netbeans.modules.xml.tax</friend>
+                <friend>org.openide.compat</friend>
                 <package>org.netbeans.beaninfo.editors</package>
-                <!-- autoupdate, core/windows, core/deprecated, scripting, sim/bugsubmitter -->
                 <package>org.netbeans.core</package>
-                <!-- autoupdate, apisupport/ant, apisupport/lite -->
-                <package>org.netbeans.core.modules</package>
-            </public-packages>
+            </friend-packages>
         </data>
     </configuration>
 </project>
Index: ide/golden/friend-packages.txt
===================================================================
RCS file: /cvs/ide/golden/friend-packages.txt,v
retrieving revision 1.2
diff -u -r1.2 friend-packages.txt
--- ide/golden/friend-packages.txt	27 Sep 2005 13:50:15 -0000	1.2
+++ ide/golden/friend-packages.txt	26 Oct 2005 13:29:08 -0000
@@ -1,3 +1,20 @@
+MODULE org.netbeans.core/2 (platform)
+  FRIEND org.netbeans.core.execution/1 (platform)
+  FRIEND org.netbeans.core.ide/1 (ide)
+  FRIEND org.netbeans.core.windows/2 (platform)
+  FRIEND org.netbeans.modules.autoupdate/1 (platform)
+  FRIEND org.netbeans.modules.form/2 (ide)
+  FRIEND org.netbeans.modules.i18n/1 (ide)
+  FRIEND org.netbeans.modules.java/1 (ide)
+  FRIEND org.netbeans.modules.javadoc/1 (ide)
+  FRIEND org.netbeans.modules.javahelp/1 (platform)
+  FRIEND org.netbeans.modules.options.editor/1 (ide)
+  FRIEND org.netbeans.modules.settings/1 (platform)
+  FRIEND org.netbeans.modules.utilities/1 (ide)
+  FRIEND org.netbeans.modules.xml.tax/2 (ide)
+  FRIEND org.openide.compat (platform)
+  PACKAGE org.netbeans.beaninfo.editors
+  PACKAGE org.netbeans.core
 MODULE org.netbeans.core.startup/1 (platform)
   FRIEND org.netbeans.core/2 (platform)
   FRIEND org.netbeans.modules.apisupport.ant (ide)
Index: ide/golden/public-packages.txt
===================================================================
RCS file: /cvs/ide/golden/public-packages.txt,v
retrieving revision 1.48
diff -u -r1.48 public-packages.txt
--- ide/golden/public-packages.txt	13 Oct 2005 12:00:38 -0000	1.48
+++ ide/golden/public-packages.txt	26 Oct 2005 13:29:08 -0000
@@ -103,8 +103,6 @@
 org.netbeans.api.xml.cookies
 org.netbeans.api.xml.parsers
 org.netbeans.api.xml.services
-org.netbeans.beaninfo.editors
-org.netbeans.core
 org.netbeans.core.api.multiview
 org.netbeans.core.spi.multiview
 org.netbeans.editor