Index: ant/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml
===================================================================
RCS file: /cvs/ant/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml,v
retrieving revision 1.34
diff -u -r1.34 AntModuleLayer.xml
--- ant/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml	23 Mar 2005 16:14:59 -0000	1.34
+++ ant/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml	21 Jul 2005 15:52:46 -0000
@@ -26,119 +26,126 @@
         </folder>
     </folder>
 
-  <folder name="Templates">
+    <folder name="Templates">
  
-    <attr name="Package/Ant" boolvalue="true"/>
-    <folder name="Ant">
-      <attr name="SystemFileSystem.localizingBundle" stringvalue="org.apache.tools.ant.module.resources.Bundle"/>
-      <attr name="templateWizardURL" urlvalue="nbresloc:/org/apache/tools/ant/module/resources/AntDescription.html"/>
-      <file name="Project.xml" url="Project.xml_">
-        <attr name="template" boolvalue="true"/>
-        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.apache.tools.ant.module.resources.Bundle"/>
-        <attr name="templateWizardURL" urlvalue="nbresloc:/org/apache/tools/ant/module/resources/ProjectDescription.html"/>
-        <attr name="templateCategory" stringvalue="ant-script"/>
-      </file>
-      <attr name="Project.xml/CustomTask.java" boolvalue="true"/>
-      <file name="CustomTask.java" url="CustomTask_java">
-        <attr name="template" boolvalue="true"/>
-        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.apache.tools.ant.module.resources.Bundle"/>
-        <!-- XXX #44054: implies a runtime dep on java/project module: -->
-        <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplateIterator"/>
-        <attr name="instantiatingIteratorURL" urlvalue="nbresloc:/org/apache/tools/ant/module/resources/CustomTaskDescription.html"/>
-        <attr name="templateCategory" stringvalue="ant-task"/>
-      </file>
+        <attr name="Package/Ant" boolvalue="true"/>
+        <folder name="Ant">
+            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.apache.tools.ant.module.resources.Bundle"/>
+            <attr name="templateWizardURL" urlvalue="nbresloc:/org/apache/tools/ant/module/resources/AntDescription.html"/>
+            <file name="Project.xml" url="Project.xml_">
+                <attr name="template" boolvalue="true"/>
+                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.apache.tools.ant.module.resources.Bundle"/>
+                <attr name="templateWizardURL" urlvalue="nbresloc:/org/apache/tools/ant/module/resources/ProjectDescription.html"/>
+                <attr name="templateCategory" stringvalue="ant-script"/>
+            </file>
+            <attr name="Project.xml/CustomTask.java" boolvalue="true"/>
+            <file name="CustomTask.java" url="CustomTask_java">
+                <attr name="template" boolvalue="true"/>
+                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.apache.tools.ant.module.resources.Bundle"/>
+                <!-- XXX #44054: implies a runtime dep on java/project module: -->
+                <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplateIterator"/>
+                <attr name="instantiatingIteratorURL" urlvalue="nbresloc:/org/apache/tools/ant/module/resources/CustomTaskDescription.html"/>
+                <attr name="templateCategory" stringvalue="ant-task"/>
+            </file>
+        </folder>
+        <attr name="Classes/Ant" boolvalue="true"/>
+        <attr name="Ant/Other" boolvalue="true"/>
+
     </folder>
-    <attr name="Classes/Ant" boolvalue="true"/>
-    <attr name="Ant/Other" boolvalue="true"/>
 
-  </folder>
+    <folder name="Services">
 
-  <folder name="Services">
+        <file name="org-apache-tools-ant-module-AntSettings.settings" url="AntSettings.settings">
+            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.apache.tools.ant.module.resources.Bundle"/>
+            <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/apache/tools/ant/module/resources/AntIcon.gif"/>
+        </file>
 
-    <file name="org-apache-tools-ant-module-AntSettings.settings" url="AntSettings.settings">
-        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.apache.tools.ant.module.resources.Bundle"/>
-        <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/apache/tools/ant/module/resources/AntIcon.gif"/>
-    </file>
-
-    <!-- Recognize text/x-ant+xml: -->
-    <folder name="MIMEResolver">
-      <file name="org-apache-tools-ant-module-mime-resolver.xml" url="mime-resolver.xml">
-        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.apache.tools.ant.module.resources.Bundle"/>
-        <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/apache/tools/ant/module/resources/AntIcon.gif"/>
-      </file>
-    </folder>
+        <!-- Recognize text/x-ant+xml: -->
+        <folder name="MIMEResolver">
+            <file name="org-apache-tools-ant-module-mime-resolver.xml" url="mime-resolver.xml">
+                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.apache.tools.ant.module.resources.Bundle"/>
+                <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/apache/tools/ant/module/resources/AntIcon.gif"/>
+            </file>
+        </folder>
 
-    <folder name="Hidden">
-      <!-- To make the module nicer to debug, list the cookies it provides. -->
-      <file name="org-apache-tools-ant-module-cookies.xml" url="cookies.xml"/>
-    </folder>
+        <folder name="Hidden">
+            <!-- To make the module nicer to debug, list the cookies it provides. -->
+            <file name="org-apache-tools-ant-module-cookies.xml" url="cookies.xml"/>
+        </folder>
 
-  </folder>
+    </folder>
 
-  <folder name="UI">
+    <folder name="UI">
 
-    <folder name="Services">
+        <folder name="Services">
 
-      <folder name="Building">
-        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.apache.tools.ant.module.resources.Bundle"/>
-        <file name="org-apache-tools-ant-module-AntSettings.shadow">
-          <attr name="originalFile" stringvalue="Services/org-apache-tools-ant-module-AntSettings.settings"/>
-        </file>
-      </folder> <!-- Building -->
+            <folder name="Building">
+                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.apache.tools.ant.module.resources.Bundle"/>
+                <file name="org-apache-tools-ant-module-AntSettings.shadow">
+                    <attr name="originalFile" stringvalue="Services/org-apache-tools-ant-module-AntSettings.settings"/>
+                </file>
+            </folder> <!-- Building -->
 
-    </folder> <!-- Services -->
+        </folder> <!-- Services -->
 
-  </folder> <!-- UI -->
+    </folder> <!-- UI -->
 
-  <!-- Lines marked as erroneous: -->
-  <folder name="Editors">
-    <folder name="AnnotationTypes">
-      <file name="org-apache-tools-ant-module-error.xml" url="error-annotation.xml"/>
+    <!-- Lines marked as erroneous: -->
+    <folder name="Editors">
+        <folder name="AnnotationTypes">
+            <file name="org-apache-tools-ant-module-error.xml" url="error-annotation.xml"/>
+        </folder>
+        <folder name="text">
+            <folder name="x-ant+xml">
+                <folder name="Popup">
+                    <file name="org-apache-tools-ant-module-nodes-RunTargetsAction.instance"/>
+                </folder>
+            </folder>
+        </folder>
     </folder>
-  </folder>
   
-  <folder name="Loaders">
-    <folder name="text">
-      <folder name="x-ant+xml">
-        <folder name="Actions">
-          <file name="org-openide-actions-OpenAction.instance"/>
-          <attr name="org-openide-actions-OpenAction.instance/org-apache-tools-ant-module-nodes-RunTargetsAction.instance" boolvalue="true"/>
-          <file name="org-apache-tools-ant-module-nodes-RunTargetsAction.instance"/>
-          <attr name="org-apache-tools-ant-module-nodes-RunTargetsAction.instance/org-openide-actions-FileSystemAction.instance" boolvalue="true"/>
-          <file name="org-openide-actions-FileSystemAction.instance"/>
-          <attr name="org-openide-actions-FileSystemAction.instance/sep-1.instance" boolvalue="true"/>
-          <file name="sep-1.instance">
-            <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-          </file>
-          <attr name="sep-1.instance/org-openide-actions-CutAction.instance" boolvalue="true"/>
-          <file name="org-openide-actions-CutAction.instance"/>
-          <attr name="org-openide-actions-CutAction.instance/org-openide-actions-CopyAction.instance" boolvalue="true"/>
-          <file name="org-openide-actions-CopyAction.instance"/>
-          <attr name="org-openide-actions-CopyAction.instance/sep-2.instance" boolvalue="true"/>
-          <file name="sep-2.instance">
-            <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-          </file>
-          <attr name="sep-2.instance/org-openide-actions-DeleteAction.instance" boolvalue="true"/>
-          <file name="org-openide-actions-DeleteAction.instance"/>
-          <attr name="org-openide-actions-DeleteAction.instance/org-openide-actions-RenameAction.instance" boolvalue="true"/>
-          <file name="org-openide-actions-RenameAction.instance"/>
-          <attr name="org-openide-actions-RenameAction.instance/sep-3.instance" boolvalue="true"/>
-          <file name="sep-3.instance">
-            <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-          </file>
-          <attr name="sep-3.instance/org-openide-actions-SaveAsTemplateAction.instance" boolvalue="true"/>
-          <file name="org-openide-actions-SaveAsTemplateAction.instance"/>
-          <attr name="org-openide-actions-SaveAsTemplateAction.instance/sep-4.instance" boolvalue="true"/>
-          <file name="sep-4.instance">
-            <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-          </file>
-          <attr name="sep-4.instance/org-openide-actions-ToolsAction.instance" boolvalue="true"/>
-          <file name="org-openide-actions-ToolsAction.instance"/>
-          <attr name="org-openide-actions-ToolsAction.instance/org-openide-actions-PropertiesAction.instance" boolvalue="true"/>
-          <file name="org-openide-actions-PropertiesAction.instance"/>
+    <folder name="Loaders">
+        <folder name="text">
+            <folder name="x-ant+xml">
+                <folder name="Actions">
+                    <file name="org-openide-actions-OpenAction.instance"/>
+                    <attr name="org-openide-actions-OpenAction.instance/org-apache-tools-ant-module-nodes-RunTargetsAction.instance" boolvalue="true"/>
+                    <file name="org-apache-tools-ant-module-nodes-RunTargetsAction.instance"/>
+                    <attr name="org-apache-tools-ant-module-nodes-RunTargetsAction.instance/org-openide-actions-FileSystemAction.instance" boolvalue="true"/>
+                    <file name="org-openide-actions-FileSystemAction.instance"/>
+                    <attr name="org-openide-actions-FileSystemAction.instance/sep-1.instance" boolvalue="true"/>
+                    <file name="sep-1.instance">
+                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+                    </file>
+                    <attr name="sep-1.instance/org-openide-actions-CutAction.instance" boolvalue="true"/>
+                    <file name="org-openide-actions-CutAction.instance"/>
+                    <attr name="org-openide-actions-CutAction.instance/org-openide-actions-CopyAction.instance" boolvalue="true"/>
+                    <file name="org-openide-actions-CopyAction.instance"/>
+                    <attr name="org-openide-actions-CopyAction.instance/sep-2.instance" boolvalue="true"/>
+                    <file name="sep-2.instance">
+                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+                    </file>
+                    <attr name="sep-2.instance/org-openide-actions-DeleteAction.instance" boolvalue="true"/>
+                    <file name="org-openide-actions-DeleteAction.instance"/>
+                    <attr name="org-openide-actions-DeleteAction.instance/org-openide-actions-RenameAction.instance" boolvalue="true"/>
+                    <file name="org-openide-actions-RenameAction.instance"/>
+                    <attr name="org-openide-actions-RenameAction.instance/sep-3.instance" boolvalue="true"/>
+                    <file name="sep-3.instance">
+                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+                    </file>
+                    <attr name="sep-3.instance/org-openide-actions-SaveAsTemplateAction.instance" boolvalue="true"/>
+                    <file name="org-openide-actions-SaveAsTemplateAction.instance"/>
+                    <attr name="org-openide-actions-SaveAsTemplateAction.instance/sep-4.instance" boolvalue="true"/>
+                    <file name="sep-4.instance">
+                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+                    </file>
+                    <attr name="sep-4.instance/org-openide-actions-ToolsAction.instance" boolvalue="true"/>
+                    <file name="org-openide-actions-ToolsAction.instance"/>
+                    <attr name="org-openide-actions-ToolsAction.instance/org-openide-actions-PropertiesAction.instance" boolvalue="true"/>
+                    <file name="org-openide-actions-PropertiesAction.instance"/>
+                </folder>
+            </folder>
         </folder>
-      </folder>
     </folder>
-  </folder>
 
 </filesystem>
Index: ant/src/org/apache/tools/ant/module/loader/AntProjectDataLoader.java
===================================================================
RCS file: /cvs/ant/src/org/apache/tools/ant/module/loader/AntProjectDataLoader.java,v
retrieving revision 1.24
diff -u -r1.24 AntProjectDataLoader.java
--- ant/src/org/apache/tools/ant/module/loader/AntProjectDataLoader.java	23 Mar 2005 16:14:59 -0000	1.24
+++ ant/src/org/apache/tools/ant/module/loader/AntProjectDataLoader.java	21 Jul 2005 15:52:46 -0000
@@ -25,7 +25,7 @@
  */
 public class AntProjectDataLoader extends UniFileLoader {
 
-    private static final String REQUIRED_MIME = "text/x-ant+xml"; // NOI18N
+    public static final String REQUIRED_MIME = "text/x-ant+xml"; // NOI18N
     private static final String KNOWN_ANT_FILE = "org.apache.tools.ant.module.loader.AntProjectDataLoader.KNOWN_ANT_FILE"; // NOI18N
     private static final String KNOWN_ANT_FILE_OLD = "org.apache.tools.ant.module.AntProjectDataLoader.KNOWN_ANT_FILE"; // NOI18N
     private static final String KNOWN_ANT_FILENAME = "build.xml"; // NOI18N
Index: ant/src/org/apache/tools/ant/module/loader/AntProjectDataEditor.java
===================================================================
RCS file: /cvs/ant/src/org/apache/tools/ant/module/loader/AntProjectDataEditor.java,v
retrieving revision 1.5
diff -u -r1.5 AntProjectDataEditor.java
--- ant/src/org/apache/tools/ant/module/loader/AntProjectDataEditor.java	15 Jan 2004 21:59:07 -0000	1.5
+++ ant/src/org/apache/tools/ant/module/loader/AntProjectDataEditor.java	21 Jul 2005 15:52:46 -0000
@@ -7,7 +7,7 @@
  * 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
+ * Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
  * Microsystems, Inc. All Rights Reserved.
  *
  * Contributor(s): Jesse Glick.
@@ -39,7 +39,7 @@
 
     public AntProjectDataEditor (AntProjectDataObject obj) {
         super (obj, new AntEnv (obj));
-        setMIMEType ("text/xml"); // NOI18N
+        setMIMEType(AntProjectDataLoader.REQUIRED_MIME);
     }
 
     protected boolean notifyModified () {
Index: ant/nbproject/project.xml
===================================================================
RCS file: /cvs/ant/nbproject/project.xml,v
retrieving revision 1.18
diff -u -r1.18 project.xml
--- ant/nbproject/project.xml	11 Jun 2005 07:01:51 -0000	1.18
+++ ant/nbproject/project.xml	21 Jul 2005 15:52:46 -0000
@@ -18,7 +18,14 @@
             <code-name-base>org.apache.tools.ant.module</code-name-base>
             <module-dependencies>
                 <dependency>
-                    <code-name-base>org.openide.filesystems</code-name-base>
+                    <code-name-base>org.netbeans.modules.editor</code-name-base>
+                    <run-dependency>
+                        <release-version>3</release-version>
+                        <specification-version>1.23</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.actions</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
@@ -26,7 +33,7 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
+                    <code-name-base>org.openide.awt</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
@@ -34,7 +41,7 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.modules</code-name-base>
+                    <code-name-base>org.openide.dialogs</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
@@ -42,15 +49,15 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
+                    <code-name-base>org.openide.execution</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.2</specification-version>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
+                    <code-name-base>org.openide.filesystems</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
@@ -58,23 +65,23 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
+                    <code-name-base>org.openide.io</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.2</specification-version>
+                        <specification-version>1.5</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.options</code-name-base>
+                    <code-name-base>org.openide.loaders</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.2</specification-version>
+                        <specification-version>5.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
+                    <code-name-base>org.openide.modules</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
@@ -82,7 +89,7 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.text</code-name-base>
+                    <code-name-base>org.openide.nodes</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
@@ -90,7 +97,7 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.actions</code-name-base>
+                    <code-name-base>org.openide.options</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
@@ -98,27 +105,27 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.execution</code-name-base>
+                    <code-name-base>org.openide.text</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.2</specification-version>
+                        <specification-version>6.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.io</code-name-base>
+                    <code-name-base>org.openide.util</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.5</specification-version>
+                        <specification-version>6.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.loaders</code-name-base>
+                    <code-name-base>org.openide.windows</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>5.0</specification-version>
+                        <specification-version>6.2</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
Index: ant/manifest.mf
===================================================================
RCS file: /cvs/ant/manifest.mf,v
retrieving revision 1.78
diff -u -r1.78 manifest.mf
--- ant/manifest.mf	22 Jun 2005 22:20:10 -0000	1.78
+++ ant/manifest.mf	21 Jul 2005 15:52:46 -0000
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.apache.tools.ant.module/3
 OpenIDE-Module-Localizing-Bundle: org/apache/tools/ant/module/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.20
+OpenIDE-Module-Specification-Version: 3.21
 OpenIDE-Module-Install: org/apache/tools/ant/module/AntModule.class
 OpenIDE-Module-Layer: org/apache/tools/ant/module/resources/AntModuleLayer.xml
 OpenIDE-Module-Requires: