Index: debuggerjpda/manifest.mf
===================================================================
RCS file: /cvs/debuggerjpda/manifest.mf,v
retrieving revision 1.64
diff -u -r1.64 manifest.mf
--- debuggerjpda/manifest.mf	12 Dec 2005 15:37:48 -0000	1.64
+++ debuggerjpda/manifest.mf	17 Jul 2006 16:11:59 -0000
@@ -3,4 +3,4 @@
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.17
 OpenIDE-Module-Provides: org.netbeans.api.debugger.jpda.JPDADebuggerEngineImpl
-
+OpenIDE-Module-Requires: org.netbeans.spi.debugger.jpda.EditorContext, org.netbeans.spi.debugger.jpda.SourcePathProvider
Index: debuggerjpda/nbproject/project.xml
===================================================================
RCS file: /cvs/debuggerjpda/nbproject/project.xml,v
retrieving revision 1.16
diff -u -r1.16 project.xml
--- debuggerjpda/nbproject/project.xml	30 Jun 2006 19:04:51 -0000	1.16
+++ debuggerjpda/nbproject/project.xml	17 Jul 2006 16:11:59 -0000
@@ -47,12 +47,6 @@
                         <release-version>2</release-version>
                     </run-dependency>
                 </dependency>
-                <dependency> <!-- An artificial runtime dependency on JPDA Debugger Ant Task. We need to have the EditorContext implementation. -->
-                    <code-name-base>org.netbeans.modules.debugger.jpda.ant</code-name-base>
-                    <run-dependency>
-                        <!-- <release-version>1</release-version>  There is no release version -->
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.openide.filesystems</code-name-base>
                     <build-prerequisite/>
Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/resources/mf-layer.xml
===================================================================
RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/resources/mf-layer.xml,v
retrieving revision 1.32
diff -u -r1.32 mf-layer.xml
--- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/resources/mf-layer.xml	30 Jun 2006 19:05:04 -0000	1.32
+++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/resources/mf-layer.xml	17 Jul 2006 16:11:59 -0000
@@ -24,7 +24,7 @@
         <folder name="text">
             <folder name="x-java">
                 <folder name="ToolTips">
-                    <file name="org-netbeans-modules-debugger-projects-ToolTipAnnotation.instance"/>
+                    <file name="org-netbeans-modules-debugger-jpda-projects-ToolTipAnnotation.instance"/>
                 </folder>
                 <folder name="GlyphGutterActions">
                     <file name="org-netbeans-modules-debugger-ui-actions-ToggleBreakpointAction.shadow">
Index: nbbuild/nbproject/project.xml
===================================================================
RCS file: /cvs/nbbuild/nbproject/project.xml,v
retrieving revision 1.45
diff -u -r1.45 project.xml
--- nbbuild/nbproject/project.xml	30 Jun 2006 21:07:48 -0000	1.45
+++ nbbuild/nbproject/project.xml	17 Jul 2006 16:11:59 -0000
@@ -209,6 +209,7 @@
                 <project>../debuggerjpda</project>
                 <project>../debuggerjpda/ant</project>
                 <project>../debuggerjpda/api</project>
+                <project>../debuggerjpda/projects</project>
                 <project>../debuggerjpda/ui</project>
                 <project>../diff</project>
                 <project>../editor</project>
Index: nbbuild/cluster.properties
===================================================================
RCS file: /cvs/nbbuild/cluster.properties,v
retrieving revision 1.138
diff -u -r1.138 cluster.properties
--- nbbuild/cluster.properties	30 Jun 2006 21:07:38 -0000	1.138
+++ nbbuild/cluster.properties	17 Jul 2006 16:11:59 -0000
@@ -165,6 +165,7 @@
         debuggerjpda,\
         debuggerjpda/ant,\
         debuggerjpda/api,\
+        debuggerjpda/projects,\
         debuggerjpda/ui,\
         form,\
         java,\
Index: debuggerjpda/ant/manifest.mf
===================================================================
RCS file: /cvs/debuggerjpda/ant/manifest.mf,v
retrieving revision 1.21
diff -u -r1.21 manifest.mf
--- debuggerjpda/ant/manifest.mf	14 Apr 2006 11:59:13 -0000	1.21
+++ debuggerjpda/ant/manifest.mf	17 Jul 2006 16:11:59 -0000
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.debugger.jpda.ant
 OpenIDE-Module-Specification-Version: 1.8
-OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/projects/Bundle.properties
+OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/ant/Bundle.properties
 
Index: debuggerjpda/ant/antsrc/org/netbeans/modules/debugger/jpda/ant/JPDAReload.java
===================================================================
RCS file: /cvs/debuggerjpda/ant/antsrc/org/netbeans/modules/debugger/jpda/ant/JPDAReload.java,v
retrieving revision 1.10
diff -u -r1.10 JPDAReload.java
--- debuggerjpda/ant/antsrc/org/netbeans/modules/debugger/jpda/ant/JPDAReload.java	30 Jun 2006 19:04:44 -0000	1.10
+++ debuggerjpda/ant/antsrc/org/netbeans/modules/debugger/jpda/ant/JPDAReload.java	17 Jul 2006 16:11:59 -0000
@@ -39,7 +39,6 @@
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileStateInvalidException;
 import org.openide.filesystems.FileUtil;
-import org.openide.loaders.DataObject;
 
 import org.netbeans.api.debugger.DebuggerEngine;
 import org.netbeans.api.debugger.DebuggerManager;
Index: debuggerjpda/ant/nbproject/project.properties
===================================================================
RCS file: /cvs/debuggerjpda/ant/nbproject/project.properties,v
retrieving revision 1.7
diff -u -r1.7 project.properties
--- debuggerjpda/ant/nbproject/project.properties	30 Jun 2006 19:04:44 -0000	1.7
+++ debuggerjpda/ant/nbproject/project.properties	17 Jul 2006 16:12:00 -0000
@@ -15,7 +15,7 @@
 # Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 # Microsystems, Inc. All Rights Reserved.
 
-is.autoload=true
+is.eager=true
 ant.jar=${nb_all}/ant/external/lib/ant.jar
 javadoc.title=Debugger JPDA ANT
 javadoc.arch=${basedir}/arch.xml
Index: debuggerjpda/ant/nbproject/project.xml
===================================================================
RCS file: /cvs/debuggerjpda/ant/nbproject/project.xml,v
retrieving revision 1.20
diff -u -r1.20 project.xml
--- debuggerjpda/ant/nbproject/project.xml	30 Jun 2006 19:04:44 -0000	1.20
+++ debuggerjpda/ant/nbproject/project.xml	17 Jul 2006 16:12:00 -0000
@@ -31,83 +31,15 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.api.java</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.filesystems</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.text</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.src</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency/>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.platform</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.project</code-name-base>
+                    <code-name-base>org.netbeans.api.debugger</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
+                        <specification-version>1.8</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.loaders</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency/>
-                </dependency>
-                <dependency>
                     <code-name-base>org.netbeans.api.debugger.jpda</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
@@ -116,36 +48,36 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.api.debugger</code-name-base>
+                    <code-name-base>org.netbeans.api.java</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
+                        <specification-version>1.11</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.spi.viewmodel</code-name-base>
+                    <code-name-base>org.netbeans.modules.java.platform</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>2</release-version>
+                        <release-version>1</release-version>
+                        <specification-version>1.9</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
+                    <code-name-base>org.openide.filesystems</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
+                        <specification-version>7.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
+                    <code-name-base>org.openide.util</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                    </run-dependency>
+                    <run-dependency/>
                 </dependency>
             </module-dependencies>
             <public-packages/>
cvs server: debuggerjpda/ant/src/META-INF/debugger/org.netbeans.spi.debugger.ActionsProvider was removed, no comparison available
cvs server: debuggerjpda/ant/src/META-INF/debugger/org.netbeans.spi.debugger.jpda.EditorContext was removed, no comparison available
cvs server: debuggerjpda/ant/src/META-INF/debugger/netbeans-JPDASession/org.netbeans.spi.debugger.ActionsProvider was removed, no comparison available
cvs server: debuggerjpda/ant/src/META-INF/debugger/netbeans-JPDASession/org.netbeans.spi.debugger.jpda.SourcePathProvider was removed, no comparison available
cvs server: debuggerjpda/ant/src/META-INF/debugger/netbeans-JPDASession/SourcesView/org.netbeans.spi.viewmodel.NodeModel was removed, no comparison available
cvs server: debuggerjpda/ant/src/META-INF/services/org.openide.text.AnnotationProvider was removed, no comparison available
cvs server: debuggerjpda/ant/src/org/netbeans/modules/debugger/jpda/ant/Bundle.properties is a new entry, no comparison available
cvs server: debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/BreakpointAnnotationProvider.java was removed, no comparison available
cvs server: debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/Bundle.properties was removed, no comparison available
cvs server: debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/DebuggerAnnotation.java was removed, no comparison available
cvs server: debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/EditorContextImpl.java was removed, no comparison available
cvs server: debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/FixActionProvider.java was removed, no comparison available
cvs server: debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/MainProjectManager.java was removed, no comparison available
cvs server: debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/RunToCursorActionProvider.java was removed, no comparison available
cvs server: debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/SourcePathProviderImpl.java was removed, no comparison available
cvs server: debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/SourcesNodeModel.java was removed, no comparison available
cvs server: debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/StepIntoActionProvider.java was removed, no comparison available
cvs server: debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/ToolTipAnnotation.java was removed, no comparison available
cvs server: debuggerjpda/projects/.cvsignore is a new entry, no comparison available
cvs server: debuggerjpda/projects/build.xml is a new entry, no comparison available
cvs server: debuggerjpda/projects/manifest.mf is a new entry, no comparison available
cvs server: debuggerjpda/projects/nbproject/.cvsignore is a new entry, no comparison available
cvs server: debuggerjpda/projects/nbproject/project.properties is a new entry, no comparison available
cvs server: debuggerjpda/projects/nbproject/project.xml is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/META-INF/debugger/org.netbeans.spi.debugger.ActionsProvider is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/META-INF/debugger/org.netbeans.spi.debugger.jpda.EditorContext is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/META-INF/debugger/netbeans-JPDASession/org.netbeans.spi.debugger.ActionsProvider is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/META-INF/debugger/netbeans-JPDASession/org.netbeans.spi.debugger.jpda.SourcePathProvider is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/META-INF/debugger/netbeans-JPDASession/SourcesView/org.netbeans.spi.viewmodel.NodeModel is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/META-INF/services/org.openide.text.AnnotationProvider is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/org/netbeans/modules/debugger/jpda/projects/BreakpointAnnotationProvider.java is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/org/netbeans/modules/debugger/jpda/projects/Bundle.properties is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/org/netbeans/modules/debugger/jpda/projects/DebuggerAnnotation.java is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/org/netbeans/modules/debugger/jpda/projects/EditorContextImpl.java is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/org/netbeans/modules/debugger/jpda/projects/FixActionProvider.java is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/org/netbeans/modules/debugger/jpda/projects/MainProjectManager.java is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/org/netbeans/modules/debugger/jpda/projects/RunToCursorActionProvider.java is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/org/netbeans/modules/debugger/jpda/projects/SourcePathProviderImpl.java is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/org/netbeans/modules/debugger/jpda/projects/SourcesNodeModel.java is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/org/netbeans/modules/debugger/jpda/projects/StepIntoActionProvider.java is a new entry, no comparison available
cvs server: debuggerjpda/projects/src/org/netbeans/modules/debugger/jpda/projects/ToolTipAnnotation.java is a new entry, no comparison available
Index: debuggerjpda/ui/nbproject/project.xml
===================================================================
RCS file: /cvs/debuggerjpda/ui/nbproject/project.xml,v
retrieving revision 1.15
diff -u -r1.15 project.xml
--- debuggerjpda/ui/nbproject/project.xml	30 Jun 2006 19:05:03 -0000	1.15
+++ debuggerjpda/ui/nbproject/project.xml	17 Jul 2006 16:12:00 -0000
@@ -55,12 +55,6 @@
                         <release-version>2</release-version>
                     </run-dependency>
                 </dependency>
-                <dependency> <!-- An artificial runtime dependency on JPDA Debugger Ant Task. We need to have the EditorContext implementation. -->
-                    <code-name-base>org.netbeans.modules.debugger.jpda.ant</code-name-base>
-                    <run-dependency>
-                        <!-- <release-version>1</release-version> There is no release version -->
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.openide.nodes</code-name-base>
                     <build-prerequisite/>
Index: ide/golden/deps.txt
===================================================================
RCS file: /cvs/ide/golden/deps.txt,v
retrieving revision 1.291
diff -u -r1.291 deps.txt
--- ide/golden/deps.txt	22 Jun 2006 17:32:14 -0000	1.291
+++ ide/golden/deps.txt	17 Jul 2006 16:12:01 -0000
@@ -454,7 +454,8 @@
 MODULE org.netbeans.modules.debugger.jpda/2 (ide)
   REQUIRES org.netbeans.api.debugger/1 (ide)
   REQUIRES org.netbeans.api.debugger.jpda/2 (ide)
-  REQUIRES org.netbeans.modules.debugger.jpda.ant (ide)
+  REQUIRES org.netbeans.modules.debugger.jpda.projects (ide)
+  REQUIRES org.netbeans.modules.debugger.jpda.projects (ide)
   REQUIRES org.netbeans.spi.viewmodel/2 (ide)
   REQUIRES org.openide.filesystems (platform)
   REQUIRES org.openide.modules.ModuleFormat1
@@ -465,6 +466,14 @@
   REQUIRES org.netbeans.api.debugger.jpda/2 (ide)
   REQUIRES org.netbeans.api.java/1 (ide)
   REQUIRES org.netbeans.modules.java.platform/1 (ide)
+  REQUIRES org.openide.filesystems (platform)
+  REQUIRES org.openide.modules.ModuleFormat1
+  REQUIRES org.openide.util (platform)
+MODULE org.netbeans.modules.debugger.jpda.projects (ide)
+  REQUIRES org.netbeans.api.debugger/1 (ide)
+  REQUIRES org.netbeans.api.debugger.jpda/2 (ide)
+  REQUIRES org.netbeans.api.java/1 (ide)
+  REQUIRES org.netbeans.modules.java.platform/1 (ide)
   REQUIRES org.netbeans.modules.java.project/1 (ide)
   REQUIRES org.netbeans.modules.projectapi/1 (ide)
   REQUIRES org.netbeans.modules.projectuiapi/1 (ide)
@@ -482,7 +491,6 @@
   REQUIRES org.netbeans.api.debugger.jpda/2 (ide)
   REQUIRES org.netbeans.modules.debugger.jpda/2 (ide)
   REQUIRES org.netbeans.api.progress/1 (platform)
-  REQUIRES org.netbeans.modules.debugger.jpda.ant (ide)
   REQUIRES org.netbeans.spi.debugger.ui/1 (ide)
   REQUIRES org.netbeans.spi.viewmodel/2 (ide)
   REQUIRES org.openide.awt (platform)
Index: ide/golden/files-layout.txt
===================================================================
RCS file: /cvs/ide/golden/files-layout.txt,v
retrieving revision 1.146
diff -u -r1.146 files-layout.txt
--- ide/golden/files-layout.txt	22 Jun 2006 17:32:13 -0000	1.146
+++ ide/golden/files-layout.txt	17 Jul 2006 16:12:01 -0000
@@ -618,6 +618,7 @@
 ide8/config/Modules/org-netbeans-modules-db-sql-editor.xml
 ide8/config/Modules/org-netbeans-modules-db.xml
 ide8/config/Modules/org-netbeans-modules-debugger-jpda-ant.xml
+ide8/config/Modules/org-netbeans-modules-debugger-jpda-projects.xml
 ide8/config/Modules/org-netbeans-modules-debugger-jpda-ui.xml
 ide8/config/Modules/org-netbeans-modules-debugger-jpda.xml
 ide8/config/Modules/org-netbeans-modules-defaults.xml
@@ -776,6 +777,7 @@
 ide8/modules/org-netbeans-modules-db-sql-editor.jar
 ide8/modules/org-netbeans-modules-db.jar
 ide8/modules/org-netbeans-modules-debugger-jpda-ant.jar
+ide8/modules/org-netbeans-modules-debugger-jpda-projects.jar
 ide8/modules/org-netbeans-modules-debugger-jpda-ui.jar
 ide8/modules/org-netbeans-modules-debugger-jpda.jar
 ide8/modules/org-netbeans-modules-defaults.jar
@@ -893,6 +895,7 @@
 ide8/update_tracking/org-netbeans-modules-db-sql-editor.xml
 ide8/update_tracking/org-netbeans-modules-db.xml
 ide8/update_tracking/org-netbeans-modules-debugger-jpda-ant.xml
+ide8/update_tracking/org-netbeans-modules-debugger-jpda-projects.xml
 ide8/update_tracking/org-netbeans-modules-debugger-jpda-ui.xml
 ide8/update_tracking/org-netbeans-modules-debugger-jpda.xml
 ide8/update_tracking/org-netbeans-modules-defaults.xml
Index: ide/golden/modules.txt
===================================================================
RCS file: /cvs/ide/golden/modules.txt,v
retrieving revision 1.64
diff -u -r1.64 modules.txt
--- ide/golden/modules.txt	22 Jun 2006 17:32:13 -0000	1.64
+++ ide/golden/modules.txt	17 Jul 2006 16:12:02 -0000
@@ -48,6 +48,7 @@
 MODULE org.netbeans.modules.dbschema/1 (j2ee)
 MODULE org.netbeans.modules.debugger.jpda/2 (ide)
 MODULE org.netbeans.modules.debugger.jpda.ant (ide)
+MODULE org.netbeans.modules.debugger.jpda.projects (ide)
 MODULE org.netbeans.modules.debugger.jpda.ui/1 (ide)
 MODULE org.netbeans.modules.defaults/1 (ide)
 MODULE org.netbeans.modules.derby (j2ee)