Index: openide/registry/build.xml
===================================================================
RCS file: /cvs/openide/registry/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- openide/registry/build.xml	26 May 2003 08:30:51 -0000	1.3
+++ openide/registry/build.xml	5 Jun 2003 08:06:44 -0000
@@ -56,7 +56,7 @@
     <mkdir dir="netbeans/modules"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/org-netbeans-modules-registry-1-${OpenIDE-Module-Specification-Version}.jar"
+    <locjar jarfile="netbeans/modules/autoload/org-netbeans-modules-registry-1-${OpenIDE-Module-Specification-Version}.jar"
          manifest="manifest-subst.mf"
          basedir="src"
 	 excludesfile="../../nbbuild/standard-jar-excludes.txt"
@@ -72,7 +72,7 @@
   <target name="nbm" depends="netbeans" description="Build module NBM file.">
     <makenbm file="org-netbeans-modules-registry-1-${OpenIDE-Module-Specification-Version}.nbm"
              topdir="."
-             module="netbeans/modules/org-netbeans-modules-registry-1-${OpenIDE-Module-Specification-Version}.jar"
+             module="netbeans/modules/autoload/org-netbeans-modules-registry-1-${OpenIDE-Module-Specification-Version}.jar"
 	     homepage="http://openide.${homepage.base}/"
 	     distribution="http://${dist.base}/registry.nbm">
       <license file="${license.file}"/>
Index: openide/registry/manifest.mf
===================================================================
RCS file: /cvs/openide/registry/manifest.mf,v
retrieving revision 1.2
diff -u -r1.2 manifest.mf
--- openide/registry/manifest.mf	26 May 2003 08:30:51 -0000	1.2
+++ openide/registry/manifest.mf	5 Jun 2003 08:06:44 -0000
@@ -4,4 +4,5 @@
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
 OpenIDE-Module-Public-Packages: org.netbeans.api.registry.** org.netbeans.spi.registry.**
+OpenIDE-Module-Requires: org.netbeans.modules.registry.RootContextFactory
 
Index: openide/registry/test/build.xml
===================================================================
RCS file: /cvs/openide/registry/test/build.xml,v
retrieving revision 1.2
diff -u -r1.2 build.xml
--- openide/registry/test/build.xml	28 May 2003 07:16:55 -0000	1.2
+++ openide/registry/test/build.xml	5 Jun 2003 08:06:44 -0000
@@ -169,14 +169,14 @@
     	<!-- this classpath will be used for compiling tests against jars -->
 	<path id="compiletest.classpath">        
 
-		  <fileset dir="../netbeans/modules" includes="org-netbeans-modules-registry-1-*.jar"/>
+		  <fileset dir="../netbeans/modules/autoload" includes="org-netbeans-modules-registry-1-*.jar"/>
 
             <!-- openide -->
             <fileset dir="${nb_all}/openide/netbeans/lib">
                 <include name="openide*.jar"/>
             </fileset>
             <pathelement path="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-		  <fileset dir="${nb_all}/core/registry/netbeans/modules" includes="org-netbeans-core-registry-1-*.jar"/>
+		  <fileset dir="${nb_all}/core/registry/netbeans/modules/autoload" includes="org-netbeans-core-registry-1-*.jar"/>
 
             <!-- junit framework -->
 	    <pathelement path="${junit.path}"/>
@@ -196,7 +196,7 @@
                 <include name="openide*.jar"/>
             </fileset>
             <pathelement path="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-		  <fileset dir="${nb_all}/core/registry/netbeans/modules" includes="org-netbeans-core-registry-1-*.jar"/>
+		  <fileset dir="${nb_all}/core/registry/netbeans/modules/autoload" includes="org-netbeans-core-registry-1-*.jar"/>
 
             <!-- junit framework -->
             <pathelement path="${junit.path}"/>
@@ -209,14 +209,14 @@
     	<!-- this classpath will be used for compiling tests against installed IDE -->
     	<path id="compiletest.classpath">        
 
-		  <fileset dir="${netbeans.home}/modules" includes="org-netbeans-modules-registry-1-*.jar"/>
+		  <fileset dir="${netbeans.home}/modules/autoload" includes="org-netbeans-modules-registry-1-*.jar"/>
 
             <!-- openide -->
             <fileset dir="${netbeans.home}/lib">
                 <include name="openide*.jar"/>
             </fileset>
             <pathelement path="${netbeans.home}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-		  <fileset dir="${netbeans.home}/core/registry/netbeans/modules" includes="org-netbeans-core-registry-1-*.jar"/>
+		  <fileset dir="${netbeans.home}/core/registry/netbeans/modules/autoload" includes="org-netbeans-core-registry-1-*.jar"/>
 
             <!-- junit framework -->
             <pathelement path="${junit.path}"/>
@@ -236,10 +236,10 @@
         <!-- this classpath will be used for executing tests against jars -->
     	<path id="codetest.classpath">
              <pathelement location="${nb_all}/core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
-             <fileset dir="../netbeans/modules" includes="org-netbeans-modules-registry-1-*.jar"/>
+             <fileset dir="../netbeans/modules/autoload" includes="org-netbeans-modules-registry-1-*.jar"/>
 	        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
 	        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-		  <fileset dir="${nb_all}/core/registry/netbeans/modules" includes="org-netbeans-core-registry-1-*.jar"/>
+		  <fileset dir="${nb_all}/core/registry/netbeans/modules/autoload" includes="org-netbeans-core-registry-1-*.jar"/>
 	        <fileset dir="${nb_all}/core/netbeans/lib">
                     <include name="core.jar"/>
                     <include name="ext/*.jar"/>
@@ -253,10 +253,10 @@
     	<path id="codetest.classpath">
              <pathelement location="${nb_all}//core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
 	        <pathelement location="../src"/>
-		   <fileset dir="../netbeans/modules" includes="org-netbeans-modules-registry-1-*.jar"/>
+		   <fileset dir="../netbeans/modules/autoload" includes="org-netbeans-modules-registry-1-*.jar"/>
 	        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
 	        <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
-		  <fileset dir="${nb_all}/core/registry/netbeans/modules" includes="org-netbeans-core-registry-1-*.jar"/>
+		  <fileset dir="${nb_all}/core/registry/netbeans/modules/autoload" includes="org-netbeans-core-registry-1-*.jar"/>
 	        <fileset dir="${nb_all}/core/netbeans/lib">
                     <include name="core.jar"/>
                     <include name="ext/*.jar"/>
@@ -269,10 +269,10 @@
         <!-- this classpath will be used for executing tests against installed IDE -->
     	<path id="codetest.classpath">
           <pathelement location="../../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
-          <fileset dir="../netbeans/modules" includes="org-netbeans-modules-registry-1-*.jar"/>
+          <fileset dir="../netbeans/modules/autoload" includes="org-netbeans-modules-registry-1-*.jar"/>
           <pathelement location="${netbeans.home}/lib/openide.jar"/>
           <pathelement location="${netbeans.home}/lib/openide-loaders.jar"/>
-          <fileset dir="${netbeans.home}/core/registry/netbeans/modules" includes="org-netbeans-core-registry-1-*.jar"/>
+          <fileset dir="${netbeans.home}/core/registry/netbeans/modules/autoload" includes="org-netbeans-core-registry-1-*.jar"/>
           <fileset dir="${netbeans.home}/lib">
                     <include name="core.jar"/>
                     <include name="ext/*.jar"/>
Index: core/registry/build.xml
===================================================================
RCS file: /cvs/core/registry/build.xml,v
retrieving revision 1.1
diff -u -r1.1 build.xml
--- core/registry/build.xml	15 May 2003 17:31:13 -0000	1.1
+++ core/registry/build.xml	5 Jun 2003 08:06:45 -0000
@@ -43,7 +43,7 @@
       <classpath>
         <pathelement location="../../openide/openide-13javac-workaround.jar"/>
         <pathelement location="../../openide/netbeans/lib/openide.jar"/>
-        <fileset dir="../../openide/registry/netbeans/modules" includes="org-netbeans-modules-registry-1-*.jar"/>
+        <fileset dir="../../openide/registry/netbeans/modules/autoload" includes="org-netbeans-modules-registry-1-*.jar"/>
         <pathelement location="../../openide/loaders/netbeans/lib/openide-loaders.jar"/>
         <pathelement location="../netbeans/lib/core.jar"/>
         <fileset dir="../external">
@@ -58,7 +58,7 @@
     <mkdir dir="netbeans/modules"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/modules/org-netbeans-core-registry-1-${OpenIDE-Module-Specification-Version}.jar"
+    <locjar jarfile="netbeans/modules/autoload/org-netbeans-core-registry-1-${OpenIDE-Module-Specification-Version}.jar"
          manifest="manifest-subst.mf"
          basedir="src"
 	 excludesfile="../../nbbuild/standard-jar-excludes.txt"
@@ -74,7 +74,7 @@
   <target name="nbm" depends="netbeans" description="Build module NBM file.">
     <makenbm file="org-netbeans-core-registry-1-${OpenIDE-Module-Specification-Version}.nbm"
              topdir="."
-             module="netbeans/modules/org-netbeans-core-registry-1-${OpenIDE-Module-Specification-Version}.jar"
+             module="netbeans/modules/autoload/org-netbeans-core-registry-1-${OpenIDE-Module-Specification-Version}.jar"
 	     homepage="http://core.${homepage.base}/"
 	     distribution="http://${dist.base}/registry-core.nbm">
       <license file="${license.file}"/>
Index: core/registry/manifest.mf
===================================================================
RCS file: /cvs/core/registry/manifest.mf,v
retrieving revision 1.1
diff -u -r1.1 manifest.mf
--- core/registry/manifest.mf	15 May 2003 17:31:14 -0000	1.1
+++ core/registry/manifest.mf	5 Jun 2003 08:06:45 -0000
@@ -5,4 +5,5 @@
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
 OpenIDE-Module-Public-Packages: -
 OpenIDE-Module-Module-Dependencies: org.netbeans.modules.registry/1 = @BUILD_NUMBER_SUBST@, org.netbeans.core/1 > 1.15
+OpenIDE-Module-Provides: org.netbeans.modules.registry.RootContextFactory