Index: core/build.xml
===================================================================
RCS file: /cvs/core/build.xml,v
retrieving revision 1.91
diff -u -3 -p -r1.91 build.xml
--- core/build.xml	18 Apr 2005 22:16:33 -0000	1.91
+++ core/build.xml	24 Apr 2005 20:52:36 -0000
@@ -22,57 +22,37 @@ Microsystems, Inc. All Rights Reserved.
         <copy file="release/lib/ide.ks" todir="${netbeans.dest.dir}/${cluster.dir}/core"/>
     </target>
 
-<!-- XXX may be obsolete:
-  <target name="lib-modules" description="Create a standalone Modules API and implementation." depends="init">
-    <mkdir dir="modules-lib/src"/>
-    <copy todir="modules-lib/src">
-      <fileset dir="../openide/src">
-        <include name="org/openide/modules/SpecificationVersion.java"/>
-        <include name="org/openide/modules/ModuleInfo.java"/>
-        <include name="org/openide/modules/ModuleInstall.java"/>
-        <include name="org/openide/modules/Dependency.java"/>
+  <target name="clean-modules" description="Moves the moved classes back">
+    <move todir="src">
+      <fileset dir="bootstrap/src">
+        <include name="org/netbeans/core/modules/ChangeFirer.java"/>
+        <include name="org/netbeans/core/modules/DuplicateException.java"/>
+        <include name="org/netbeans/core/modules/Events.java"/>
+        <include name="org/netbeans/core/modules/InvalidException.java"/>
+        <include name="org/netbeans/core/modules/JarClassLoader.java"/>
+        <include name="org/netbeans/core/modules/Module.java"/>
+        <include name="org/netbeans/core/modules/ModuleInstaller.java"/>
+        <include name="org/netbeans/core/modules/ModuleManager.java"/>
+        <include name="org/netbeans/core/modules/ProxyClassLoader.java"/>
+        <include name="org/netbeans/core/modules/Util.java"/>
       </fileset>
+    </move>
+  </target>
+  <target name="lib-modules" description="Moves independent modules API to core/bootstrap">
+    <move todir="bootstrap/src">
       <fileset dir="src">
         <include name="org/netbeans/core/modules/ChangeFirer.java"/>
         <include name="org/netbeans/core/modules/DuplicateException.java"/>
         <include name="org/netbeans/core/modules/Events.java"/>
         <include name="org/netbeans/core/modules/InvalidException.java"/>
         <include name="org/netbeans/core/modules/JarClassLoader.java"/>
-        <include name="org/netbeans/core/modules/ManifestSection.java"/>
         <include name="org/netbeans/core/modules/Module.java"/>
         <include name="org/netbeans/core/modules/ModuleInstaller.java"/>
         <include name="org/netbeans/core/modules/ModuleManager.java"/>
         <include name="org/netbeans/core/modules/ProxyClassLoader.java"/>
         <include name="org/netbeans/core/modules/Util.java"/>
       </fileset>
-    </copy>
-    <ant dir="../openide" target="lib-util"/>
-    <javac srcdir="modules-lib/src" destdir="modules-lib/src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <exclude name="org/netbeans/core/modules/ManifestSection.java"/>
-      <classpath>
-        <pathelement location="../openide/netbeans/lib/openide-util.jar"/>
-      </classpath>
-    </javac>
-    <ant dir="../openide" target="jars"/>
-    <javac srcdir="modules-lib/src" destdir="modules-lib/src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
-      <include name="org/netbeans/core/modules/ManifestSection.java"/>
-      <classpath>
-        <pathelement location="../openide/netbeans/lib/openide.jar"/>
-      </classpath>
-    </javac>
-    <tstamp>
-      <format property="buildnumber-default" pattern="yyyyMMddHHmm"/>
-    </tstamp>
-    <property name="buildnumber" value="${buildnumber-default}"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest-modules.mf" tofile="modules-lib/manifest-modules-subst.mf" filtering="on"/>
-    <jar jarfile="modules-lib/modules.jar" manifest="modules-lib/manifest-modules-subst.mf">
-      <fileset dir="modules-lib/src">
-        <exclude name="**/*.java"/>
-        <exclude name="org/netbeans/core/modules/ManifestSection$*Section*.class"/>
-      </fileset>
-    </jar>
+    </move>
   </target>
--->
 
 </project>
Index: core/bootstrap/build.xml
===================================================================
RCS file: /cvs/core/bootstrap/build.xml,v
retrieving revision 1.5
diff -u -3 -p -r1.5 build.xml
--- core/bootstrap/build.xml	18 Apr 2005 22:16:34 -0000	1.5
+++ core/bootstrap/build.xml	24 Apr 2005 20:52:36 -0000
@@ -14,6 +14,13 @@ Microsystems, Inc. All Rights Reserved.
 <project name="core/bootstrap" default="netbeans" basedir=".">
 
     <import file="../../nbbuild/templates/projectized.xml"/> 
+    
+    <target name="init" depends="projectized.init" >
+    	<ant dir=".." target="lib-modules" />
+    </target>
+    <target name="clean" depends="projectized.clean" >
+    	<ant dir=".." target="clean-modules" />
+    </target>
 
     <target name="netbeans-extra" depends="release"/>
 
Index: core/bootstrap/nbproject/project.xml
===================================================================
RCS file: /cvs/core/bootstrap/nbproject/project.xml,v
retrieving revision 1.3
diff -u -3 -p -r1.3 project.xml
--- core/bootstrap/nbproject/project.xml	24 Feb 2005 10:28:19 -0000	1.3
+++ core/bootstrap/nbproject/project.xml	24 Apr 2005 20:52:36 -0000
@@ -19,12 +19,21 @@ Microsystems, Inc. All Rights Reserved.
             <path>core/bootstrap</path>
             <module-dependencies>
                 <dependency>
-                    <code-name-base>org.openide</code-name-base>
+                    <code-name-base>org.openide.util</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>5.0</specification-version>
+                        <specification-version>6.0</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.modules</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>6.0</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>