Index: openide/compat/nbproject/project.xml
===================================================================
RCS file: /cvs/openide/compat/nbproject/project.xml,v
retrieving revision 1.3
diff -u -r1.3 project.xml
--- openide/compat/nbproject/project.xml	28 Apr 2005 04:48:38 -0000	1.3
+++ openide/compat/nbproject/project.xml	3 May 2005 14:28:44 -0000
@@ -90,7 +90,7 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.fs</code-name-base>
+                    <code-name-base>org.openide.filesystems</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
Index: openide/fs/nbproject/project.xml
===================================================================
RCS file: /cvs/openide/fs/nbproject/project.xml,v
retrieving revision 1.3
diff -u -r1.3 project.xml
--- openide/fs/nbproject/project.xml	28 Apr 2005 04:48:41 -0000	1.3
+++ openide/fs/nbproject/project.xml	3 May 2005 14:28:44 -0000
@@ -15,7 +15,7 @@
     <type>org.netbeans.modules.apisupport.project</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
-            <code-name-base>org.openide.fs</code-name-base>
+            <code-name-base>org.openide.filesystems</code-name-base>
             <module-dependencies>
                 <dependency>
                     <code-name-base>org.openide.util</code-name-base>
Index: openide/loaders/nbproject/project.properties
===================================================================
RCS file: /cvs/openide/loaders/nbproject/project.properties,v
retrieving revision 1.5
diff -u -r1.5 project.properties
--- openide/loaders/nbproject/project.properties	25 Apr 2005 12:44:38 -0000	1.5
+++ openide/loaders/nbproject/project.properties	3 May 2005 14:28:44 -0000
@@ -9,8 +9,6 @@
 # Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
 # Microsystems, Inc. All Rights Reserved.
 
-module.jar.dir=core
-module.jar.basename=openide-loaders.jar
 javadoc.title=Loaders API
 javadoc.main.page=org/openide/loaders/doc-files/api.html
 javadoc.arch=${basedir}/../arch/arch-openide-datasystems.xml
Index: openide/modules/autodeps.xml
===================================================================
RCS file: openide/modules/autodeps.xml
diff -N openide/modules/autodeps.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/modules/autodeps.xml	3 May 2005 14:28:44 -0000
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                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-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+
+<!DOCTYPE transformations PUBLIC "-//NetBeans//DTD Module Automatic Dependencies 1.0//EN" "http://www.netbeans.org/dtds/module-auto-deps-1_0.dtd">
+
+<transformations version="1.0">
+
+    <transformationgroup>
+        <description>JavaHelp was moved into a module: http://www.netbeans.org/download/dev/javadoc/OpenAPIs/org/openide/doc-files/upgrade.html#3.4-require-javahelp</description>
+        <exclusion codenamebase="org.netbeans.core" prefix="true"/>
+        <exclusion codenamebase="org.openide" prefix="true"/>
+        <exclusion codenamebase="org.netbeans.modules.javahelp" prefix="false"/>
+        <transformation>
+            <trigger-dependency type="older">
+                <module-dependency codenamebase="org.openide" major="1" spec="2.2"/>
+            </trigger-dependency>
+            <implies>
+                <result>
+                    <token-dependency name="org.netbeans.api.javahelp.Help"/>
+                </result>
+            </implies>
+        </transformation>
+        <!-- #27776: package deps too -->
+        <transformation>
+            <trigger-dependency type="cancel">
+                <package-dependency name="javax.help"/>
+            </trigger-dependency>
+            <implies>
+                <result>
+                    <module-dependency codenamebase="org.netbeans.modules.javahelp" major="1" spec="1.0"/>
+                </result>
+            </implies>
+        </transformation>
+    </transformationgroup>
+
+    <transformationgroup>
+        <description>API separation phase I (#19443): http://www.netbeans.org/download/dev/javadoc/OpenAPIs/org/openide/doc-files/upgrade.html#3.5i-sep-I</description>
+        <exclusion codenamebase="org.netbeans.core" prefix="true"/>
+        <exclusion codenamebase="org.openide" prefix="true"/>
+        <transformation>
+            <trigger-dependency type="older">
+                <module-dependency codenamebase="org.openide" major="1" spec="3.14"/>
+            </trigger-dependency>
+            <implies>
+                <result>
+                    <module-dependency codenamebase="org.openide.deprecated" spec="1.0"/>
+                </result>
+                <result>
+                    <token-dependency name="org.openide.TopManager"/>
+                </result>
+                <result>
+                    <module-dependency codenamebase="org.openide.src" spec="1.0"/>
+                </result>
+            </implies>
+        </transformation>
+    </transformationgroup>
+
+    <transformationgroup>
+        <description>API separation phase II (#19443): http://www.netbeans.org/download/dev/javadoc/OpenAPIs/org/openide/doc-files/upgrade.html#3.5i-sep-II (HINT: if you have no dependencies in your manifest at all, that is your problem! Use at a minimum (but probably you want something much newer): OpenIDE-Module-IDE-Dependencies: IDE/1 &gt; 3.17)</description>
+        <exclusion codenamebase="org.netbeans.core" prefix="true"/>
+        <exclusion codenamebase="org.openide" prefix="true"/>
+        <transformation>
+            <trigger-dependency type="older">
+                <module-dependency codenamebase="org.openide" major="1" spec="3.17"/>
+            </trigger-dependency>
+            <implies>
+                <result>
+                    <module-dependency codenamebase="org.openide.compiler" spec="1.0"/>
+                </result>
+                <result>
+                    <token-dependency name="org.openide.compiler.CompilationEngine"/>
+                </result>
+                <result>
+                    <module-dependency codenamebase="org.openide.execution" spec="1.2"/>
+                </result>
+                <result>
+                    <module-dependency codenamebase="org.openide.execution.deprecated" spec="1.0"/>
+                </result>
+                <result>
+                    <token-dependency name="org.openide.execution.ExecutionEngine"/>
+                </result>
+                <result>
+                    <module-dependency codenamebase="org.openide.io" spec="1.0"/>
+                </result>
+                <result>
+                    <token-dependency name="org.openide.windows.IOProvider"/>
+                </result>
+            </implies>
+        </transformation>
+    </transformationgroup>
+
+
+    <transformationgroup>
+        <description>openide.jar split into smaller parts</description>
+        <!--
+        <exclusion codenamebase="org.openide" prefix="true"/>
+        <exclusion codenamebase="org.netbeans.core" prefix="true"/>
+        -->
+        <transformation>
+            <trigger-dependency type="cancel">
+                <module-dependency codenamebase="org.openide" major="1" spec="6.0"/>
+            </trigger-dependency>
+            <implies>
+                <result>
+                    <module-dependency codenamebase="org.openide.filesystems" spec="6.0"/>
+                    <module-dependency codenamebase="org.openide.util" spec="6.0"/>
+                    <module-dependency codenamebase="org.openide.util.enum" spec="6.0"/>
+                    <module-dependency codenamebase="org.openide.modules" spec="6.0"/>
+                    <module-dependency codenamebase="org.openide.nodes" spec="6.0"/>
+                    <module-dependency codenamebase="org.openide.explorer" spec="6.0"/>
+                    <module-dependency codenamebase="org.openide.awt" spec="6.0"/>
+                    <module-dependency codenamebase="org.openide.dialogs" spec="6.0"/>
+                    <module-dependency codenamebase="org.openide.compat" spec="6.0"/>
+                    <module-dependency codenamebase="org.openide.options" spec="6.0"/>
+                    <module-dependency codenamebase="org.openide.windows" spec="6.0"/>
+                    <module-dependency codenamebase="org.openide.text" spec="6.0"/>
+                </result>
+            </implies>
+        </transformation>
+    </transformationgroup>
+
+</transformations>
Index: openide/modules/nbproject/project.properties
===================================================================
RCS file: /cvs/openide/modules/nbproject/project.properties,v
retrieving revision 1.5
diff -u -r1.5 project.properties
--- openide/modules/nbproject/project.properties	2 May 2005 14:00:37 -0000	1.5
+++ openide/modules/nbproject/project.properties	3 May 2005 14:28:44 -0000
@@ -9,6 +9,8 @@
 # Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 # Microsystems, Inc. All Rights Reserved.
 
+module.auto.deps.xml=${basedir}/autodeps.xml
+
 module.jar.dir=lib
 javadoc.title=Modules API
 javadoc.main.page=org/openide/modules/doc-files/api.html