+
-
+
Index: ant/browsetask/manifest.mf
===================================================================
RCS file: /cvs/ant/browsetask/manifest.mf,v
--- ant/browsetask/manifest.mf 1 Nov 2003 16:25:23 -0000 1.3
+++ ant/browsetask/manifest.mf 24 Dec 2003 00:40:29 -0000
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.ant.browsetask
-OpenIDE-Module-Specification-Version: 1.4
+OpenIDE-Module-Specification-Version: 1.5
OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-Module-Dependencies: org.apache.tools.ant.module/3 > 3.1
+OpenIDE-Module-Module-Dependencies: org.apache.tools.ant.module/3 > 3.6
OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.31
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ant/browsetask/Bundle.properties
Index: ant/browsetask/src/META-INF/taskdefs.properties
===================================================================
RCS file: ant/browsetask/src/META-INF/taskdefs.properties
--- ant/browsetask/src/META-INF/taskdefs.properties 7 Jul 2003 16:22:56 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1, +0,0 @@
-nbbrowse=org.netbeans.modules.ant.browsetask.NbBrowse
Index: ant/browsetask/src/org/netbeans/modules/ant/browsetask/antlib.xml
===================================================================
RCS file: ant/browsetask/src/org/netbeans/modules/ant/browsetask/antlib.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ant/browsetask/src/org/netbeans/modules/ant/browsetask/antlib.xml 26 Dec 2003 18:05:34 -0000
@@ -0,0 +1,4 @@
+
+
+
+
Index: ant/src/org/apache/tools/ant/module/api/IntrospectedInfo.java
===================================================================
RCS file: /cvs/ant/src/org/apache/tools/ant/module/api/IntrospectedInfo.java,v
--- ant/src/org/apache/tools/ant/module/api/IntrospectedInfo.java 9 Nov 2003 16:02:08 -0000 1.18
+++ ant/src/org/apache/tools/ant/module/api/IntrospectedInfo.java 24 Dec 2003 18:09:05 -0000
@@ -30,12 +30,27 @@
import org.apache.tools.ant.module.bridge.*;
import org.openide.util.Utilities;
+// XXX in order to support Ant 1.6 interface addition types, need to keep
+// track of which classes implement a given interface
+
/** Represents Ant-style introspection info for a set of classes.
* There should be one instance which is loaded automatically
* from defaults.properties files, i.e. standard tasks/datatypes.
* A second is loaded from settings and represents custom tasks/datatypes.
* Uses Ant's IntrospectionHelper for the actual work, but manages the results
* and makes them safely serializable (stores only classnames, etc.).
+ *
+ * All task and type names may be namespace-qualified for use
+ * in Ant 1.6: a name of the form nsuri:localname refers to
+ * an XML element with namespace nsuri and local name localname.
+ * Attribute names could also be similarly qualified, but in practice attributes
+ * used in Ant never have a defined namespace. The prefix antlib:org.apache.tools.ant:
+ * is implied, not expressed, on Ant core element names (for backwards compatibility).
+ * Subelement names are *not* namespace-qualified here, even though in the script
+ * they would be - because the namespace used in the script will actually vary
+ * according to how an antlib is imported and used. An unqualified subelement name
+ * should be understood to inherit a namespace from its parent element.
+ * (Namespace support since org.apache.tools.ant.module/3 3.6
)
*/
public final class IntrospectedInfo implements Serializable {
@@ -340,7 +355,14 @@
}
private void loadNetBeansSpecificDefinitions() {
- Map defsByKind = AntBridge.getCustomDefs();
+ loadNetBeansSpecificDefinitions0(AntBridge.getCustomDefsNoNamespace());
+ if (AntBridge.getInterface().isAnt16()) {
+ // Define both.
+ loadNetBeansSpecificDefinitions0(AntBridge.getCustomDefsWithNamespace());
+ }
+ }
+
+ private void loadNetBeansSpecificDefinitions0(Map defsByKind) {
Iterator kindIt = defsByKind.entrySet().iterator();
while (kindIt.hasNext()) {
Map.Entry kindE = (Map.Entry)kindIt.next();
Index: ant/src/org/apache/tools/ant/module/bridge/AntBridge.java
===================================================================
RCS file: /cvs/ant/src/org/apache/tools/ant/module/bridge/AntBridge.java,v
--- ant/src/org/apache/tools/ant/module/bridge/AntBridge.java 24 Nov 2003 18:18:36 -0000 1.7
+++ ant/src/org/apache/tools/ant/module/bridge/AntBridge.java 26 Dec 2003 18:07:16 -0000
@@ -30,7 +30,15 @@
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
import org.openide.modules.InstalledFileLocator;
+import org.openide.modules.ModuleInfo;
import org.openide.util.*;
+import org.openide.xml.XMLUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/**
* Utility class providing entry points to the bridging functionality.
@@ -41,33 +49,62 @@
private AntBridge() {}
private static final String KEY_MAIN_CLASS_LOADER = "mainClassLoader"; // NOI18N
- private static final String KEY_AUX_CLASS_LOADER = "auxClassLoader"; // NOI18N
+ private static final String KEY_BRIDGE_CLASS_LOADER = "bridgeClassLoader"; // NOI18N
private static final String KEY_BRIDGE = "bridge"; // NOI18N
- private static final String KEY_CUSTOM_DEFS = "customDefs";
+ private static final String KEY_CUSTOM_DEFS = "customDefs"; // NOI18N
+ private static final String KEY_CUSTOM_DEF_CLASS_LOADERS = "customDefClassLoaders"; // NOI18N
private static Reference stuff = null; // Reference