1.1 --- a/clazz/build.xml	Mon Mar 29 15:16:00 2004 +0000
     1.2 +++ b/clazz/build.xml	Mon Mar 29 17:32:01 2004 +0000
     1.3 @@ -24,10 +24,10 @@
     1.4        <pathelement location="${classfile.dir}/${nb.modules/autoload.dir}/classfile.jar"/>
     1.5        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
     1.6        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
     1.7 -      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
     1.8 -      <pathelement location="${java/srcmodel.dir}/${nb.modules/autoload.dir}/java-src-model.jar"/>
     1.9 -      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules/autoload.dir}/openide-debugger.jar"/>
    1.10 -      <pathelement location="${java/api.dir}/${nb.modules/autoload.dir}/java-api.jar"/>
    1.11 +      <pathelement location="${openide/execution.dir}/${nb.modules.dir}/org-openide-execution.jar"/>
    1.12 +      <pathelement location="${java/srcmodel.dir}/${nb.modules.dir}/org-openide-src.jar"/>
    1.13 +      <pathelement location="${debuggercore/oldapi.dir}/${nb.modules.dir}/org-openide-debugger.jar"/>
    1.14 +      <pathelement location="${java/api.dir}/${nb.modules.dir}/org-netbeans-api-java.jar"/>
    1.15      </path>
    1.16    </target>
    1.17  

     2.1 --- a/clazz/test/build-qa-functional.xml	Mon Mar 29 15:16:00 2004 +0000
     2.2 +++ b/clazz/test/build-qa-functional.xml	Mon Mar 29 17:32:01 2004 +0000
     2.3 @@ -172,7 +172,7 @@
     2.4              <pathelement location="${netbeans.home}/modules/clazz.jar"/>
     2.5              <pathelement location="${netbeans.home}/lib/openide.jar"/>
     2.6              <pathelement location="${netbeans.home}/lib/openide-loaders.jar"/>
     2.7 -            <pathelement location="${netbeans.home}/modules/autoload/java-src-model.jar"/>
     2.8 +            <pathelement location="${netbeans.home}/modules/org-openide-src.jar"/>
     2.9     	</path>
    2.10      </target>
    2.11      

     3.1 --- a/jemmysupport/build.xml	Mon Mar 29 15:16:00 2004 +0000
     3.2 +++ b/jemmysupport/build.xml	Mon Mar 29 17:32:01 2004 +0000
     3.3 @@ -39,7 +39,7 @@
     3.4          <pathelement location="../openide/openide-13javac-workaround.jar"/>
     3.5          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar" />
     3.6          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar" />
     3.7 -        <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar" />
     3.8 +        <pathelement location="${openide/execution.dir}/${nb.modules.dir}/org-openide-execution.jar" />
     3.9          <pathelement location="${core.dir}/${nb.lib.dir}/core.jar" />
    3.10          <pathelement location="${diff.dir}/${nb.modules.dir}/diff.jar" />
    3.11          <!-- Hopefully set up by nbbuild/build.xml: -->

     4.1 --- a/o.n.tasklistapi/build.xml	Mon Mar 29 15:16:00 2004 +0000
     4.2 +++ b/o.n.tasklistapi/build.xml	Mon Mar 29 17:32:01 2004 +0000
     4.3 @@ -25,7 +25,7 @@
     4.4          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
     4.5          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
     4.6          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
     4.7 -        <pathelement location="${java.dir}/${nb.modules.dir}/java.jar"/>  <!-- Hard compile-time, soft run-time dependency -->
     4.8 +        <pathelement location="${java.dir}/${nb.modules.dir}/org-netbeans-modules-java.jar"/>  <!-- Hard compile-time, soft run-time dependency -->
     4.9        </path>
    4.10      </target>
    4.11    

     5.1 --- a/tasklist.core/build.xml	Mon Mar 29 15:16:00 2004 +0000
     5.2 +++ b/tasklist.core/build.xml	Mon Mar 29 17:32:01 2004 +0000
     5.3 @@ -26,7 +26,7 @@
     5.4          <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
     5.5          <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
     5.6          <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
     5.7 -        <pathelement location="${core/settings.dir}/${nb.modules/autoload.dir}/core-settings.jar"/>
     5.8 +        <pathelement location="${core/settings.dir}/${nb.modules.dir}/org-netbeans-modules-settings.jar"/>
     5.9          <!-- tasklist api -->
    5.10          <pathelement location="${tasklist/api.dir}/${nb.modules/autoload.dir}/tasklist-api.jar"/>
    5.11        </path>

     6.1 --- a/tasklist.docscan/build.xml	Mon Mar 29 15:16:00 2004 +0000
     6.2 +++ b/tasklist.docscan/build.xml	Mon Mar 29 17:32:01 2004 +0000
     6.3 @@ -32,9 +32,9 @@
     6.4          <pathelement location="${editor.dir}/${nb.modules.dir}/editor.jar"/>
     6.5  
     6.6          <!-- Projects dependency -->
     6.7 -        <pathelement location="${java/api.dir}/${nb.modules/autoload.dir}/java-api.jar"/>
     6.8 -        <pathelement location="${projects/projectapi.dir}/${nb.modules/autoload.dir}/org-netbeans-modules-projectapi.jar"/>
     6.9 -        <pathelement location="${projects/projectuiapi.dir}/${nb.modules/autoload.dir}/org-netbeans-modules-projectuiapi.jar"/>
    6.10 +        <pathelement location="${java/api.dir}/${nb.modules.dir}/org-netbeans-api-java.jar"/>
    6.11 +        <pathelement location="${projects/projectapi.dir}/${nb.modules.dir}/org-netbeans-modules-projectapi.jar"/>
    6.12 +        <pathelement location="${projects/projectuiapi.dir}/${nb.modules.dir}/org-netbeans-modules-projectuiapi.jar"/>
    6.13        </path>
    6.14      </target>
    6.15    

     7.1 --- a/tasklist.pmd/build.xml	Mon Mar 29 15:16:00 2004 +0000
     7.2 +++ b/tasklist.pmd/build.xml	Mon Mar 29 17:32:01 2004 +0000
     7.3 @@ -52,7 +52,7 @@
     7.4              <classpath>
     7.5                  <path refid="cp"/>                
     7.6                  <!-- java src model -->
     7.7 -                <pathelement path="../../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
     7.8 +                <pathelement path="../../java/srcmodel/netbeans/modules/org-openide-src.jar"/>
     7.9                  <!-- pmd -->
    7.10                  <path refid="pmd.cp"/>
    7.11              </classpath>

     8.1 --- a/vcscore/build.xml	Mon Mar 29 15:16:00 2004 +0000
     8.2 +++ b/vcscore/build.xml	Mon Mar 29 17:32:01 2004 +0000
     8.3 @@ -27,7 +27,7 @@
     8.4        <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
     8.5        <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
     8.6        <pathelement location="${openide/io.dir}/${nb.modules/autoload.dir}/openide-io.jar"/>
     8.7 -      <pathelement location="${openide/execution.dir}/${nb.modules/autoload.dir}/openide-execution.jar"/>
     8.8 +      <pathelement location="${openide/execution.dir}/${nb.modules.dir}/org-openide-execution.jar"/>
     8.9      </path>
    8.10    </target>
    8.11