Index: xml/xsl/manifest.mf
===================================================================
RCS file: /cvs/xml/xsl/manifest.mf,v
retrieving revision 1.13
diff -u -r1.13 manifest.mf
--- xml/xsl/manifest.mf	14 Mar 2003 23:30:08 -0000	1.13
+++ xml/xsl/manifest.mf	8 Jan 2004 22:37:13 -0000
@@ -2,13 +2,14 @@
 OpenIDE-Module: org.netbeans.modules.xsl/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xsl/resources/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/xsl/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: @XSL_SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @XML_BUILD_NUMBER_SUBST@
+OpenIDE-Module-Specification-Version: ${xml.xsl.spec.version}
+OpenIDE-Module-Implementation-Version: ${xml.common.impl.version}
+OpenIDE-Module-Build-Version: ${buildnumber}
 OpenIDE-Module-Public-Packages: -
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
 OpenIDE-Module-Module-Dependencies: 
- org.netbeans.api.xml/1 > @API_SPEC_VERS_SUBST@,
- org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@,
+ org.netbeans.api.xml/1 > ${xml.api.spec.version},
+ org.netbeans.modules.xml.core/2 = ${xml.common.impl.version},
  org.netbeans.libs.jaxp/1,
  org.netbeans.libs.xalan/1 > 1.1,
  org.netbeans.modules.servletapi/1,
Index: xml/xsl/build.xml
===================================================================
RCS file: /cvs/xml/xsl/build.xml,v
retrieving revision 1.22
diff -u -r1.22 build.xml
--- xml/xsl/build.xml	5 Jun 2003 19:29:25 -0000	1.22
+++ xml/xsl/build.xml	8 Jan 2004 22:37:13 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -38,18 +38,11 @@
 
 
     <target name="init">
-        <property file="${xml_root}/spec-vers.properties"/>
-        <filter  token="API_SPEC_VERS_SUBST" value="${xml.api.specification.version}"/>
-        <filter  token="XSL_SPEC_VERS_SUBST" value="${xml.xsl.specification.version}"/>
-        <filter token="CORE_SPEC_VERS_SUBST" value="${xml.core.specification.version}"/>
-        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-        <property name="xml.implementation.version" value="${buildnumber}"/>
-        <filter token="XML_BUILD_NUMBER_SUBST"  value="${xml.implementation.version}"/>
         <ant dir="${nbroot}/xml/external" target="unscramble"/>
         <ant dir="${nbroot}/libs/external" target="unscramble"/>
     </target>
 
-    <target name="compile">
+    <target name="compile" depends="init">
         <property file="${libs_root}/public.properties"/>
 
         <echo message="Compiling XSL module classes..."/>
@@ -70,10 +63,14 @@
         </javac>
     </target>
 
-    <target name="jars" depends="init,compile">
+    <target name="jars" depends="compile">
         <mkdir dir="netbeans/modules"/>
-
-        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+        <property file="${xml_root}/spec-vers.properties"/>
+        <copy file="manifest.mf" tofile="manifest-subst.mf">
+            <filterchain>
+                <expandproperties/>
+            </filterchain>
+        </copy>
         <locjar jarfile="netbeans/modules/xsl.jar"
                 manifest="manifest-subst.mf"
                 compress="false">
Index: xml/tree-edit/manifest.mf
===================================================================
RCS file: /cvs/xml/tree-edit/manifest.mf,v
retrieving revision 1.22
diff -u -r1.22 manifest.mf
--- xml/tree-edit/manifest.mf	14 Mar 2003 23:30:08 -0000	1.22
+++ xml/tree-edit/manifest.mf	8 Jan 2004 22:37:13 -0000
@@ -3,13 +3,14 @@
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/tree/resources/Bundle.properties
 OpenIDE-Module-Install: org/netbeans/modules/xml/tree/TreeEditModuleInstall.class
 OpenIDE-Module-Layer: org/netbeans/modules/xml/tree/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: @TREE_SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @XML_BUILD_NUMBER_SUBST@
+OpenIDE-Module-Specification-Version: ${xml.tree-edit.spec.version}
+OpenIDE-Module-Implementation-Version: ${xml.common.impl.version}
+OpenIDE-Module-Build-Version: ${buildnumber}
 OpenIDE-Module-Public-Packages: -
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
 OpenIDE-Module-Module-Dependencies: 
- org.netbeans.api.xml/1 > @API_SPEC_VERS_SUBST@,
- org.netbeans.modules.xml.tax/2  = @XML_BUILD_NUMBER_SUBST@,
- org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@
+ org.netbeans.api.xml/1 > ${xml.api.spec.version},
+ org.netbeans.modules.xml.tax/2  = ${xml.common.impl.version},
+ org.netbeans.modules.xml.core/2 = ${xml.common.impl.version}
 Class-Path: docs/xml-tree-help.jar
 
Index: xml/tree-edit/build.xml
===================================================================
RCS file: /cvs/xml/tree-edit/build.xml,v
retrieving revision 1.49
diff -u -r1.49 build.xml
--- xml/tree-edit/build.xml	5 Jun 2003 19:29:25 -0000	1.49
+++ xml/tree-edit/build.xml	8 Jan 2004 22:37:13 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -36,18 +36,6 @@
 
     <property name="build.compiler.debug" value="on"/>
 
-
-    <target name="init">
-        <property file="${xml_root}/spec-vers.properties"/>
-        <filter  token="API_SPEC_VERS_SUBST" value="${xml.api.specification.version}"/>
-        <filter token="TREE_SPEC_VERS_SUBST" value="${xml.tree-edit.specification.version}"/>
-        <filter token="CORE_SPEC_VERS_SUBST" value="${xml.core.specification.version}"/>
-        <filter  token="TAX_SPEC_VERS_SUBST" value="${xml.tax.specification.version}"/>
-        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-        <property name="xml.implementation.version" value="${buildnumber}"/>
-        <filter token="XML_BUILD_NUMBER_SUBST"  value="${xml.implementation.version}"/>
-    </target>
-
     <target name="compile">
         <echo message="Compiling XML tree-edit module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -65,10 +53,14 @@
         <for-each locations="compat"/>
     </target>
 
-    <target name="jars" depends="init,compile">
+    <target name="jars" depends="compile">
         <mkdir dir="netbeans/modules"/>
-
-        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+        <property file="${xml_root}/spec-vers.properties"/>
+        <copy file="manifest.mf" tofile="manifest-subst.mf">
+            <filterchain>
+                <expandproperties/>
+            </filterchain>
+        </copy>
         <locjar jarfile="netbeans/modules/xml-tree-edit.jar"
                 manifest="manifest-subst.mf"
                 compress="false">
@@ -106,7 +98,7 @@
         <genlist targetname="nbm" outputfiledir="netbeans"/>
     </target>
 
-    <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
+    <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
         <mkdir dir="test"/>
 
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
Index: xml/tools/manifest.mf
===================================================================
RCS file: /cvs/xml/tools/manifest.mf,v
retrieving revision 1.23
diff -u -r1.23 manifest.mf
--- xml/tools/manifest.mf	14 Mar 2003 23:30:08 -0000	1.23
+++ xml/tools/manifest.mf	8 Jan 2004 22:37:13 -0000
@@ -3,14 +3,15 @@
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/tools/resources/Bundle.properties
 OpenIDE-Module-Install: org/netbeans/modules/xml/tools/ToolsModuleInstall.class
 OpenIDE-Module-Layer: org/netbeans/modules/xml/tools/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: @TOOLS_SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module-Specification-Version: ${xml.tools.spec.version}
+OpenIDE-Module-Implementation-Version: ${xml.common.impl.version}
+OpenIDE-Module-Build-Version: ${buildnumber}
 OpenIDE-Module-Public-Packages: -
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
 OpenIDE-Module-Module-Dependencies: 
- org.netbeans.api.xml/1 > @API_SPEC_VERS_SUBST@, 
- org.netbeans.modules.xml.tax/2 = @XML_BUILD_NUMBER_SUBST@,
- org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@, 
+ org.netbeans.api.xml/1 > ${xml.api.spec.version}, 
+ org.netbeans.modules.xml.tax/2 = ${xml.common.impl.version},
+ org.netbeans.modules.xml.core/2 = ${xml.common.impl.version}, 
  org.netbeans.libs.jaxp/1,
  org.openide.src > 1.0
 
Index: xml/tools/build.xml
===================================================================
RCS file: /cvs/xml/tools/build.xml,v
retrieving revision 1.54
diff -u -r1.54 build.xml
--- xml/tools/build.xml	5 Jun 2003 19:29:23 -0000	1.54
+++ xml/tools/build.xml	8 Jan 2004 22:37:13 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -35,18 +35,6 @@
 
     <property name="build.compiler.debug" value="on"/>
 
-
-    <target name="init">
-        <property file="${xml_root}/spec-vers.properties"/>
-        <filter   token="API_SPEC_VERS_SUBST" value="${xml.api.specification.version}"/>
-        <filter token="TOOLS_SPEC_VERS_SUBST" value="${xml.tools.specification.version}"/>
-        <filter  token="CORE_SPEC_VERS_SUBST" value="${xml.core.specification.version}"/>
-        <filter token="TAX_SPEC_VERS_SUBST" value="${xml.tax.specification.version}"/>
-        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-        <property name="xml.implementation.version" value="${buildnumber}"/>
-        <filter token="XML_BUILD_NUMBER_SUBST"  value="${xml.implementation.version}"/>
-    </target>
-
     <target name="compile">
         <echo message="Compiling XML tools module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -62,10 +50,14 @@
         </javac>
     </target>
 
-    <target name="jars" depends="init,compile">
+    <target name="jars" depends="compile">
         <mkdir dir="netbeans/modules"/>
-
-        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+        <property file="${xml_root}/spec-vers.properties"/>
+        <copy file="manifest.mf" tofile="manifest-subst.mf">
+            <filterchain>
+                <expandproperties/>
+            </filterchain>
+        </copy>
         <locjar jarfile="netbeans/modules/xml-tools.jar"
                 manifest="manifest-subst.mf"
                 compress="false">
@@ -89,7 +81,7 @@
         <genlist targetname="nbm" outputfiledir="netbeans"/>
     </target>
 
-    <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
+    <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
         <mkdir dir="test"/>
 
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
Index: xml/text-edit/manifest.mf
===================================================================
RCS file: /cvs/xml/text-edit/manifest.mf,v
retrieving revision 1.22
diff -u -r1.22 manifest.mf
--- xml/text-edit/manifest.mf	14 Mar 2003 23:30:08 -0000	1.22
+++ xml/text-edit/manifest.mf	8 Jan 2004 22:37:13 -0000
@@ -3,12 +3,13 @@
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/text/resources/Bundle.properties
 OpenIDE-Module-Install: org/netbeans/modules/xml/text/TextEditModuleInstall.class
 OpenIDE-Module-Layer: org/netbeans/modules/xml/text/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: @TEXT_SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @XML_BUILD_NUMBER_SUBST@
+OpenIDE-Module-Specification-Version: ${xml.text-edit.spec.version}
+OpenIDE-Module-Implementation-Version: ${xml.common.impl.version}
+OpenIDE-Module-Build-Version: ${buildnumber}
 OpenIDE-Module-Public-Packages: -
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
 OpenIDE-Module-Module-Dependencies: 
- org.netbeans.api.xml/1 > @API_SPEC_VERS_SUBST@,
- org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@,
+ org.netbeans.api.xml/1 > ${xml.api.spec.version},
+ org.netbeans.modules.xml.core/2 = ${xml.common.impl.version},
  org.netbeans.modules.editor/1 > 1.7
 
Index: xml/text-edit/build.xml
===================================================================
RCS file: /cvs/xml/text-edit/build.xml,v
retrieving revision 1.51
diff -u -r1.51 build.xml
--- xml/text-edit/build.xml	5 Jun 2003 19:29:23 -0000	1.51
+++ xml/text-edit/build.xml	8 Jan 2004 22:37:13 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -36,17 +36,6 @@
 
     <property name="build.compiler.debug" value="on"/>
 
-
-    <target name="init">
-        <property file="${xml_root}/spec-vers.properties"/>
-        <filter  token="API_SPEC_VERS_SUBST" value="${xml.api.specification.version}"/>
-        <filter token="TEXT_SPEC_VERS_SUBST" value="${xml.text-edit.specification.version}"/>
-        <filter token="CORE_SPEC_VERS_SUBST" value="${xml.core.specification.version}"/>
-        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-        <property name="xml.implementation.version" value="${buildnumber}"/>
-        <filter token="XML_BUILD_NUMBER_SUBST"  value="${xml.implementation.version}"/>
-    </target>
-
     <target name="compile">
         <echo message="Compiling XML text-edit module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -64,10 +53,14 @@
         <for-each locations="compat"/>
     </target>
 
-    <target name="jars" depends="init,compile">
+    <target name="jars" depends="compile">
         <mkdir dir="netbeans/modules"/>
-
-        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+        <property file="${xml_root}/spec-vers.properties"/>
+        <copy file="manifest.mf" tofile="manifest-subst.mf">
+            <filterchain>
+                <expandproperties/>
+            </filterchain>
+        </copy>
         <locjar jarfile="netbeans/modules/xml-text-edit.jar"
                 manifest="manifest-subst.mf"
                 compress="false">
@@ -88,7 +81,7 @@
         <genlist targetname="nbm" outputfiledir="netbeans"/>
     </target>
 
-    <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
+    <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
         <mkdir dir="test"/>
 
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
Index: xml/tax/lib/manifest.mf
===================================================================
RCS file: /cvs/xml/tax/lib/manifest.mf,v
retrieving revision 1.4
diff -u -r1.4 manifest.mf
--- xml/tax/lib/manifest.mf	14 Mar 2003 23:30:07 -0000	1.4
+++ xml/tax/lib/manifest.mf	8 Jan 2004 22:37:13 -0000
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Specification-Title: Tree API for XML ("TAX")
-Specification-Version: @TAX_LIB_SPEC_VERS_SUBST@
+Specification-Version: ${xml.tax.lib.spec.version}
 Specification-Vendor: NetBeans / Sun Microsystems, Inc.
-Implementation-Version: @BUILD_NUMBER_SUBST@
+Implementation-Version: ${xml.common.impl.version} ${buildnumber}
 
Index: xml/tax/lib/build.xml
===================================================================
RCS file: /cvs/xml/tax/lib/build.xml,v
retrieving revision 1.20
diff -u -r1.20 build.xml
--- xml/tax/lib/build.xml	5 Feb 2003 22:21:59 -0000	1.20
+++ xml/tax/lib/build.xml	8 Jan 2004 22:37:13 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -26,19 +26,7 @@
 
     <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext_root}/nbantext.jar"/>
 
-
-    <target name="set-buildnumber" unless="buildnumber">
-      <tstamp>
-    	<format property="buildnumber" pattern="yyyyMMddHHmm"/>
-      </tstamp>
-    </target>
-
-    <target name="init" depends="set-buildnumber">
-        <echo message="buildnumber = ${buildnumber}"/>
-
-        <property file="${xml_root}/spec-vers.properties"/>
-        <filter token="TAX_LIB_SPEC_VERS_SUBST" value="${xml.tax.lib.specification.version}"/>
-        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
+    <target name="init">
         <ant dir="${nbroot}/xml/external" target="unscramble"/>
     </target>
 
@@ -51,10 +39,14 @@
         </javac>
     </target>
 
-    <target name="jars" depends="init,compile">
+    <target name="jars" depends="compile">
         <mkdir dir="netbeans/modules/autoload/ext"/>
-
-        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+        <property file="${xml_root}/spec-vers.properties"/>
+        <copy file="manifest.mf" tofile="manifest-subst.mf">
+            <filterchain>
+                <expandproperties/>
+            </filterchain>
+        </copy>
         <locjar jarfile="netbeans/modules/autoload/ext/tax.jar"
              manifest="manifest-subst.mf"
              compress="false">
Index: xml/tax/manifest.mf
===================================================================
RCS file: /cvs/xml/tax/manifest.mf,v
retrieving revision 1.18
diff -u -r1.18 manifest.mf
--- xml/tax/manifest.mf	25 Jun 2003 12:53:37 -0000	1.18
+++ xml/tax/manifest.mf	8 Jan 2004 22:37:13 -0000
@@ -2,11 +2,12 @@
 OpenIDE-Module: org.netbeans.modules.xml.tax/2
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/tax/resources/Bundle.properties
 OpenIDE-Module-Install: org/netbeans/modules/xml/tax/TAXModuleInstall.class
-OpenIDE-Module-Specification-Version: @TAX_SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @XML_BUILD_NUMBER_SUBST@
+OpenIDE-Module-Specification-Version: ${xml.tax.spec.version}
+OpenIDE-Module-Implementation-Version: ${xml.common.impl.version}
+OpenIDE-Module-Build-Version: ${buildnumber}
 OpenIDE-Module-Layer: org/netbeans/modules/xml/tax/resources/mf-layer.xml
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.21
-OpenIDE-Module-Module-Dependencies: org.netbeans.api.xml/1 > @API_SPEC_VERS_SUBST@, org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@
+OpenIDE-Module-Module-Dependencies: org.netbeans.api.xml/1 > ${xml.api.spec.version}, org.netbeans.modules.xml.core/2 = ${xml.common.impl.version}
 Class-Path: ext/tax.jar
 OpenIDE-Module-Requires: org.openide.modules.InstalledFileLocator
 OpenIDE-Module-Public-Packages: -
Index: xml/tax/build.xml
===================================================================
RCS file: /cvs/xml/tax/build.xml,v
retrieving revision 1.51
diff -u -r1.51 build.xml
--- xml/tax/build.xml	5 Jun 2003 19:29:23 -0000	1.51
+++ xml/tax/build.xml	8 Jan 2004 22:37:13 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -33,17 +33,6 @@
 
     <property name="build.compiler.debug" value="on"/>
 
-
-    <target name="init">
-        <property file="${xml_root}/spec-vers.properties"/>
-        <filter token="API_SPEC_VERS_SUBST" value="${xml.api.specification.version}"/>
-        <filter token="TAX_SPEC_VERS_SUBST" value="${xml.tax.specification.version}"/>
-        <filter token="CORE_SPEC_VERS_SUBST" value="${xml.core.specification.version}"/>
-        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-        <property name="xml.implementation.version" value="${buildnumber}"/>
-        <filter token="XML_BUILD_NUMBER_SUBST"  value="${xml.implementation.version}"/>
-    </target>
-
     <target name="compile">
         <for-each locations="lib"/>
 
@@ -62,11 +51,15 @@
         <for-each locations="compat"/>
     </target>
 
-    <target name="jars" depends="init,compile">
+    <target name="jars" depends="compile">
         <for-each locations="lib"/>
-
         <mkdir dir="netbeans/modules/autoload"/>   
-        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+        <property file="${xml_root}/spec-vers.properties"/>
+        <copy file="manifest.mf" tofile="manifest-subst.mf">
+            <filterchain>
+                <expandproperties/>
+            </filterchain>
+        </copy>
         <locjar jarfile="netbeans/modules/autoload/xml-tax.jar"
                 manifest="manifest-subst.mf"
                 compress="false">
@@ -90,7 +83,7 @@
         <genlist targetname="nbm" outputfiledir="netbeans"/>
     </target>
 
-    <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
+    <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
         <mkdir dir="test"/>
 
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
Index: xml/schema/manifest.mf
===================================================================
RCS file: /cvs/xml/schema/manifest.mf,v
retrieving revision 1.7
diff -u -r1.7 manifest.mf
--- xml/schema/manifest.mf	14 Mar 2003 23:30:07 -0000	1.7
+++ xml/schema/manifest.mf	8 Jan 2004 22:37:13 -0000
@@ -2,13 +2,14 @@
 OpenIDE-Module: org.netbeans.modules.xml.schema/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/schema/resources/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/xml/schema/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: @SCHEMA_SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module-Specification-Version: ${xml.schema.spec.version}
+OpenIDE-Module-Implementation-Version: ${xml.common.impl.version}
+OpenIDE-Module-Build-Version: ${buildnumber}
 OpenIDE-Module-Public-Packages: -
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
 OpenIDE-Module-Module-Dependencies: 
- org.netbeans.api.xml/1 > @API_SPEC_VERS_SUBST@,
- org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@
+ org.netbeans.api.xml/1 > ${xml.api.spec.version},
+ org.netbeans.modules.xml.core/2 = ${xml.common.impl.version}
 
 Name: org/netbeans/modules/xml/schema/SchemaLoader.class
 OpenIDE-Module-Class: Loader
Index: xml/schema/build.xml
===================================================================
RCS file: /cvs/xml/schema/build.xml,v
retrieving revision 1.13
diff -u -r1.13 build.xml
--- xml/schema/build.xml	5 Jun 2003 19:29:22 -0000	1.13
+++ xml/schema/build.xml	8 Jan 2004 22:37:13 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -35,18 +35,6 @@
 
     <property name="build.compiler.debug" value="on"/>
 
-
-    <target name="init">
-        <property file="${xml_root}/spec-vers.properties"/>
-        <filter token="API_SPEC_VERS_SUBST" value="${xml.api.specification.version}"/>
-        <filter token="SCHEMA_SPEC_VERS_SUBST" value="${xml.schema.specification.version}"/>
-        <filter token="CORE_SPEC_VERS_SUBST" value="${xml.core.specification.version}"/>
-        <filter token="TAX_SPEC_VERS_SUBST" value="${xml.tax.specification.version}"/>
-        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-        <property name="xml.implementation.version" value="${buildnumber}"/>
-        <filter token="XML_BUILD_NUMBER_SUBST"  value="${xml.implementation.version}"/>
-    </target>
-
     <target name="compile">
         <echo message="Compiling XML schema module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -60,10 +48,14 @@
         </javac>
     </target>
 
-    <target name="jars" depends="init,compile">
+    <target name="jars" depends="compile">
         <mkdir dir="netbeans/modules"/>
-
-        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+        <property file="${xml_root}/spec-vers.properties"/>
+        <copy file="manifest.mf" tofile="manifest-subst.mf">
+            <filterchain>
+                <expandproperties/>
+            </filterchain>
+        </copy>
         <locjar jarfile="netbeans/modules/xml-schema.jar"
                 manifest="manifest-subst.mf"
                 compress="false">
@@ -82,7 +74,7 @@
    
     <target name="javahelp" description="Please use xml/core javahelp target instead." />
  
-    <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
+    <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
         <mkdir dir="test"/>
 
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
Index: xml/css/manifest.mf
===================================================================
RCS file: /cvs/xml/css/manifest.mf,v
retrieving revision 1.15
diff -u -r1.15 manifest.mf
--- xml/css/manifest.mf	14 Mar 2003 23:30:06 -0000	1.15
+++ xml/css/manifest.mf	8 Jan 2004 22:37:13 -0000
@@ -3,13 +3,14 @@
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/resources/Bundle.properties
 OpenIDE-Module-Install: org/netbeans/modules/css/CSSModuleInstall.class
 OpenIDE-Module-Layer: org/netbeans/modules/css/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: @CSS_SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module-Specification-Version: ${xml.css.spec.version}
+OpenIDE-Module-Implementation-Version: ${xml.common.impl.version}
+OpenIDE-Module-Build-Version: ${buildnumber}
 OpenIDE-Module-Public-Packages: -
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
 OpenIDE-Module-Requires: org.openide.windows.IOProvider
 OpenIDE-Module-Module-Dependencies: 
- org.netbeans.api.xml/1 > @API_SPEC_VERS_SUBST@,
+ org.netbeans.api.xml/1 > ${xml.api.spec.version},
  org.netbeans.modules.editor/1 > 1.8,
  org.openide.io > 1.0
 Class-Path: ext/flute.jar ext/sac.jar
Index: xml/css/build.xml
===================================================================
RCS file: /cvs/xml/css/build.xml,v
retrieving revision 1.55
diff -u -r1.55 build.xml
--- xml/css/build.xml	5 Jun 2003 19:29:22 -0000	1.55
+++ xml/css/build.xml	8 Jan 2004 22:37:13 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -35,10 +35,6 @@
 
 
     <target name="init">
-        <property file="${xml_root}/spec-vers.properties"/>
-        <filter token="API_SPEC_VERS_SUBST" value="${xml.api.specification.version}"/>
-        <filter token="CSS_SPEC_VERS_SUBST" value="${xml.css.specification.version}"/>
-        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
         <ant dir="${nbroot}/xml/external" target="unscramble"/>
     </target>
 
@@ -60,10 +56,14 @@
         <for-each locations="compat"/>
     </target>
 
-    <target name="jars" depends="init,compile">
+    <target name="jars" depends="compile">
         <mkdir dir="netbeans/modules"/>
-
-        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+        <property file="${xml_root}/spec-vers.properties"/>
+        <copy file="manifest.mf" tofile="manifest-subst.mf">
+            <filterchain>
+                <expandproperties/>
+            </filterchain>
+        </copy>
         <locjar jarfile="netbeans/modules/css.jar"
                 manifest="manifest-subst.mf"
                 compress="false">
Index: xml/core/manifest.mf
===================================================================
RCS file: /cvs/xml/core/manifest.mf,v
retrieving revision 1.32
diff -u -r1.32 manifest.mf
--- xml/core/manifest.mf	14 Mar 2003 23:30:06 -0000	1.32
+++ xml/core/manifest.mf	8 Jan 2004 22:37:13 -0000
@@ -3,12 +3,13 @@
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/core/resources/Bundle.properties
 OpenIDE-Module-Install: org/netbeans/modules/xml/core/CoreModuleInstall.class
 OpenIDE-Module-Layer: org/netbeans/modules/xml/core/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: @CORE_SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @XML_BUILD_NUMBER_SUBST@
+OpenIDE-Module-Specification-Version: ${xml.core.spec.version}
+OpenIDE-Module-Implementation-Version: ${xml.common.impl.version}
+OpenIDE-Module-Build-Version: ${buildnumber}
 OpenIDE-Module-Public-Packages: -
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.40
 OpenIDE-Module-Module-Dependencies: 
- org.netbeans.api.xml/1 > @API_SPEC_VERS_SUBST@,
+ org.netbeans.api.xml/1 > ${xml.api.spec.version},
  org.openide.execution > 1.0,
  org.openide.io > 1.0
 OpenIDE-Module-Requires: org.openide.windows.IOProvider
Index: xml/core/build.xml
===================================================================
RCS file: /cvs/xml/core/build.xml,v
retrieving revision 1.62
diff -u -r1.62 build.xml
--- xml/core/build.xml	5 Jun 2003 19:29:21 -0000	1.62
+++ xml/core/build.xml	8 Jan 2004 22:37:13 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -35,16 +35,6 @@
 
     <property name="build.compiler.debug" value="on"/>
 
-
-    <target name="init">
-        <property file="${xml_root}/spec-vers.properties"/>
-        <filter  token="API_SPEC_VERS_SUBST" value="${xml.api.specification.version}"/>
-        <filter token="CORE_SPEC_VERS_SUBST" value="${xml.core.specification.version}"/>
-        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-        <property name="xml.implementation.version" value="${buildnumber}"/>
-        <filter token="XML_BUILD_NUMBER_SUBST"  value="${xml.implementation.version}"/>
-    </target>
-
     <target name="compile">
         <echo message="Compiling XML core module classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -61,10 +51,14 @@
         <for-each locations="compat"/>
     </target>
 
-    <target name="jars" depends="init,compile">
+    <target name="jars" depends="compile">
         <mkdir dir="netbeans/modules"/>
-
-        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+        <property file="${xml_root}/spec-vers.properties"/>
+        <copy file="manifest.mf" tofile="manifest-subst.mf">
+            <filterchain>
+                <expandproperties/>
+            </filterchain>
+        </copy>
         <locjar jarfile="netbeans/modules/autoload/xml-core.jar"
                 manifest="manifest-subst.mf"
                 compress="false">
@@ -74,9 +68,6 @@
         </locjar>
     </target>
 
-    <target name="release">
-    </target>
-
     <target name="javahelp">
         <mkdir dir="javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch"/>
         <jhindexer basedir="javahelp/org/netbeans/modules/xml/core/docs/"
@@ -98,12 +89,12 @@
         </locjar>
     </target>
 
-    <target name="netbeans" depends="jars,release,javahelp">
+    <target name="netbeans" depends="jars,javahelp">
         <genlist targetname="nbm" outputfiledir="netbeans"/>
     </target>
 
     
-    <target name="reload" depends="init,compile" description="Test module inside running IDE (API Support with Ant required).">
+    <target name="reload" depends="compile" description="Test module inside running IDE (API Support with Ant required).">
         <mkdir dir="test"/>
 
         <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
Index: xml/catalog/manifest.mf
===================================================================
RCS file: /cvs/xml/catalog/manifest.mf,v
retrieving revision 1.18
diff -u -r1.18 manifest.mf
--- xml/catalog/manifest.mf	14 Mar 2003 23:30:06 -0000	1.18
+++ xml/catalog/manifest.mf	8 Jan 2004 22:37:13 -0000
@@ -3,13 +3,14 @@
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/catalog/resources/Bundle.properties
 OpenIDE-Module-Install: org/netbeans/modules/xml/catalog/CatalogModuleInstall.class
 OpenIDE-Module-Layer: org/netbeans/modules/xml/catalog/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: @CATALOG_SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @XML_BUILD_NUMBER_SUBST@
+OpenIDE-Module-Specification-Version: ${xml.catalog.spec.version}
+OpenIDE-Module-Implementation-Version: ${xml.common.impl.version}
+OpenIDE-Module-Build-Version: ${buildnumber}
 OpenIDE-Module-Public-Packages: 
  org.netbeans.modules.xml.catalog.spi.**
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
 OpenIDE-Module-Module-Dependencies: 
- org.netbeans.api.xml/1 > @API_SPEC_VERS_SUBST@,
- org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@
+ org.netbeans.api.xml/1 > ${xml.api.spec.version},
+ org.netbeans.modules.xml.core/2 = ${xml.common.impl.version}
 Class-Path: ext/resolver-1_1_nb.jar
 
Index: xml/catalog/build.xml
===================================================================
RCS file: /cvs/xml/catalog/build.xml,v
retrieving revision 1.52
diff -u -r1.52 build.xml
--- xml/catalog/build.xml	5 Jun 2003 19:29:21 -0000	1.52
+++ xml/catalog/build.xml	8 Jan 2004 22:37:13 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -36,13 +36,6 @@
 
 
     <target name="init">
-        <property file="${xml_root}/spec-vers.properties"/>
-        <filter     token="API_SPEC_VERS_SUBST" value="${xml.api.specification.version}"/>
-        <filter token="CATALOG_SPEC_VERS_SUBST" value="${xml.catalog.specification.version}"/>
-        <filter    token="CORE_SPEC_VERS_SUBST" value="${xml.core.specification.version}"/>
-        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-        <property name="xml.implementation.version" value="${buildnumber}"/>
-        <filter token="XML_BUILD_NUMBER_SUBST"  value="${xml.implementation.version}"/>
         <ant dir="${nbroot}/xml/external" target="unscramble"/>
     </target>
 
@@ -64,10 +57,14 @@
         <for-each locations="compat"/>
     </target>
 
-    <target name="jars" depends="init,compile">
+    <target name="jars" depends="compile">
         <mkdir dir="netbeans/modules"/>
-
-        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+        <property file="${xml_root}/spec-vers.properties"/>
+        <copy file="manifest.mf" tofile="manifest-subst.mf">
+            <filterchain>
+                <expandproperties/>
+            </filterchain>
+        </copy>
         <locjar jarfile="netbeans/modules/xml-catalog.jar"
                 manifest="manifest-subst.mf"
                 compress="false">
Index: xml/api/manifest.mf
===================================================================
RCS file: /cvs/xml/api/manifest.mf,v
retrieving revision 1.10
diff -u -r1.10 manifest.mf
--- xml/api/manifest.mf	14 Mar 2003 23:30:05 -0000	1.10
+++ xml/api/manifest.mf	8 Jan 2004 22:37:13 -0000
@@ -2,8 +2,9 @@
 OpenIDE-Module: org.netbeans.api.xml/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/api/xml/resources/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/api/xml/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: @API_SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module-Specification-Version: ${xml.api.spec.version}
+OpenIDE-Module-Implementation-Version: ${xml.common.impl.version}
+OpenIDE-Module-Build-Version: ${buildnumber}
 OpenIDE-Module-Public-Packages: 
  org.netbeans.api.xml.**,
  org.netbeans.spi.xml.**
Index: xml/api/build.xml
===================================================================
RCS file: /cvs/xml/api/build.xml,v
retrieving revision 1.31
diff -u -r1.31 build.xml
--- xml/api/build.xml	5 Jun 2003 19:29:20 -0000	1.31
+++ xml/api/build.xml	8 Jan 2004 22:37:13 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -31,13 +31,6 @@
 
     <property name="build.compiler.debug" value="on"/>
 
-
-    <target name="init">
-        <property file="${xml_root}/spec-vers.properties"/>
-        <filter token="API_SPEC_VERS_SUBST" value="${xml.api.specification.version}"/>
-        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    </target>
-
     <target name="compile"> 
         <echo message="Compiling XML tools API classes..."/>
         <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
@@ -49,10 +42,14 @@
         </javac>
     </target>
 
-    <target name="jars" depends="init,compile">
+    <target name="jars" depends="compile">
         <mkdir dir="netbeans/modules"/>
-
-        <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+        <property file="${xml_root}/spec-vers.properties"/>
+        <copy file="manifest.mf" tofile="manifest-subst.mf">
+            <filterchain>
+                <expandproperties/>
+            </filterchain>
+        </copy>
         <locjar jarfile="netbeans/modules/autoload/xml-api.jar"
                 manifest="manifest-subst.mf"
                 compress="false">
@@ -61,14 +58,7 @@
         </locjar>    
     </target>
 
-    <target name="release">
-    </target>
-
-    <target name="javahelp">
-        <!-- No one provided. -->
-    </target>
-
-    <target name="netbeans" depends="jars,release,javahelp">
+    <target name="netbeans" depends="jars">
         <genlist targetname="nbm" outputfiledir="netbeans"/>
     </target>
 
Index: xml/spec-vers.properties
===================================================================
RCS file: /cvs/xml/spec-vers.properties,v
retrieving revision 1.25
diff -u -r1.25 spec-vers.properties
--- xml/spec-vers.properties	14 Mar 2003 23:30:05 -0000	1.25
+++ xml/spec-vers.properties	8 Jan 2004 22:37:14 -0000
@@ -6,60 +6,76 @@
 # http://www.sun.com/
 # 
 # The Original Code is NetBeans. The Initial Developer of the Original
-# Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 # Microsystems, Inc. All Rights Reserved.
 
-# Single place to change the modules' specification version.
+# Single place to change specification and implementation versions of XML modules.
 
-# Must always be numeric (numbers separated by '.', e.g. 1.11.3).
-# See http://openide.netbeans.org/versioning-policy.html for more.
+# Implementation version used for semistable intermodule dependencies.
+# Keep it numeric - when it is incremented all spec versions will go
+# up too, which will ensure that the newest versions are published on
+# AU and made available to AU clients.
+xml.common.impl.version=3.6.0
 
+# Default specification version. Must be numeric.
+xml.common.spec.version=1.0.${xml.common.impl.version}
 
-# common module specification.version
-xml.common=1.0
+# For a release, do in the branch e.g.
+#
+# xml.common.impl.version=release36
+# xml.common.spec.version=1.1
 
+# Outside modules using implementation packages from one of these
+# modules should of course be prepared to adapt to incompatible
+# changes, and should specify e.g.
+#
+# OpenIDE-Module-Specification-Version: 12.34.${xml.common.impl.version}
+# OpenIDE-Module-Implementation-Version: ${buildnumber}
+# OpenIDE-Module-Module-Dependencies: org.netbeans.modules.xml.core/2 = ${xml.common.impl.version}
+#
+# This ensures that when the impl version changes, new versions of
+# these modules will also be published (assuming they compile!), and
+# they will match the XML impl version.
+#
+# In the build scripts you can use e.g.
+#
+# <property file="${nbroot}/xml/spec-vers.properties"/>
+# <copy file="manifest.mf" tofile="manifest-subst.mf">
+#     <filterchain>
+#         <expandproperties/>
+#     </filterchain>
+# </copy>
 
 # XML tools API
-xml.api.specification.version=1.2
+xml.api.spec.version=1.2.${xml.common.impl.version}
 
 # XML Entity Catalog
-xml.catalog.specification.version=1.0
+xml.catalog.spec.version=1.0.${xml.common.impl.version}
 
 # XML Backward Compatibility
-xml.compat.specification.version=${xml.common}
+xml.compat.spec.version=${xml.common.spec.version}
 
 # XML Core
-xml.core.specification.version=${xml.common}
+xml.core.spec.version=${xml.common.spec.version}
 
 # CSS Support
-xml.css.specification.version=${xml.common}
+xml.css.spec.version=${xml.common.spec.version}
 
 # Tree API for XML
-xml.tax.specification.version=${xml.common}
-xml.tax.lib.specification.version=1.0
+xml.tax.spec.version=${xml.common.spec.version}
+xml.tax.lib.spec.version=1.0.${xml.common.impl.version}
 
 # XML Text Editor
-xml.text-edit.specification.version=${xml.common}
+xml.text-edit.spec.version=${xml.common.spec.version}
 
 # XML Productivity Tools
-xml.tools.specification.version=${xml.common}
+xml.tools.spec.version=${xml.common.spec.version}
 
 # XML Tree Editor
-xml.tree-edit.specification.version=${xml.common}
+xml.tree-edit.spec.version=${xml.common.spec.version}
 
 # XSL Support
-xml.xsl.specification.version=${xml.common}
+xml.xsl.spec.version=${xml.common.spec.version}
 
 # XML Schema Support
-xml.schema.specification.version=${xml.common}
-
-
-#
-# @XML_BUILD_NUMBER_SUBST@ 
-# release public classes compatability range
-# set a value once implementation public classes are frozen
-# (typically after branching)
-# otherwise it defaults to ${buildnumber}
-
-# e.g. NB35 and Sun's Nevada shares XMLr35
-#xml.implementation.version=XMLr35
+xml.schema.spec.version=${xml.common.spec.version}
Index: web/taglibed/manifest.mf
===================================================================
RCS file: /cvs/web/taglibed/manifest.mf,v
retrieving revision 1.23
diff -u -r1.23 manifest.mf
--- web/taglibed/manifest.mf	14 Mar 2003 23:30:05 -0000	1.23
+++ web/taglibed/manifest.mf	8 Jan 2004 22:37:14 -0000
@@ -2,11 +2,11 @@
 OpenIDE-Module: org.netbeans.modules.web.taglibed/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/taglibed/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/web/taglibed/layer.xml
-OpenIDE-Module-Specification-Version: 1.12
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module-Specification-Version: 1.12.${xml.common.impl.version}
+OpenIDE-Module-Implementation-Version: ${buildnumber}
 OpenIDE-Module-Module-Dependencies: org.netbeans.modules.web.core/1 > 1.14,
    org.netbeans.modules.jarpackager/2,
-   org.netbeans.modules.xml.core/2 = @BUILD_NUMBER_SUBST@,
+   org.netbeans.modules.xml.core/2 = ${xml.common.impl.version},
    org.netbeans.modules.servletapi/1,
    org.netbeans.api.java/1,
    org.openide.src > 1.0,
Index: web/taglibed/build.xml
===================================================================
RCS file: /cvs/web/taglibed/build.xml,v
retrieving revision 1.32
diff -u -r1.32 build.xml
--- web/taglibed/build.xml	5 Jun 2003 19:29:19 -0000	1.32
+++ web/taglibed/build.xml	8 Jan 2004 22:37:14 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -86,9 +86,12 @@
 
   <target name="jars" depends="compile">
     <mkdir dir="netbeans/modules"/>
-    <filter token="BUILD_NUMBER_SUBST" 
-	    value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+    <property file="${nb_root}/xml/spec-vers.properties"/>
+    <copy file="manifest.mf" tofile="manifest-subst.mf">
+      <filterchain>
+        <expandproperties/>
+      </filterchain>
+    </copy>
     <locjar jarfile="netbeans/modules/taglibed.jar"
             manifest="manifest-subst.mf"
             basedir="src"
Index: web/strutssupport/manifest.mf
===================================================================
RCS file: /cvs/web/strutssupport/manifest.mf,v
retrieving revision 1.3
diff -u -r1.3 manifest.mf
--- web/strutssupport/manifest.mf	11 Mar 2003 16:56:08 -0000	1.3
+++ web/strutssupport/manifest.mf	8 Jan 2004 22:37:14 -0000
@@ -2,12 +2,13 @@
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/struts/Bundle.properties
 OpenIDE-Module-Install: org/netbeans/modules/struts/StrutsInstall.class
 OpenIDE-Module-Layer: org/netbeans/modules/struts/resources/layer.xml
-OpenIDE-Module-Specification-Version: 1.1.1
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-Module-Dependencies: org.netbeans.modules.xml.catalog/2 = @BUILD_NUMBER_SUBST@
+OpenIDE-Module-Specification-Version: 1.2.${xml.common.impl.version}
+OpenIDE-Module-Implementation-Version: ${buildnumber}
+OpenIDE-Module-Module-Dependencies: org.netbeans.modules.xml.catalog/2 = ${xml.common.impl.version}
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 1.24
 Class-Path: ext/console.jar ext/jdom.jar
 
 Name: org/netbeans/modules/struts/StrutsConfigDataLoader.class
 OpenIDE-Module-Class: Loader
 Install-Before: org.netbeans.modules.xml.core.XMLDataObject, org.openide.loaders.XMLDataObject
+
Index: web/strutssupport/build.xml
===================================================================
RCS file: /cvs/web/strutssupport/build.xml,v
retrieving revision 1.14
diff -u -r1.14 build.xml
--- web/strutssupport/build.xml	5 Jun 2003 19:29:18 -0000	1.14
+++ web/strutssupport/build.xml	8 Jan 2004 22:37:14 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -45,8 +45,12 @@
 
   <target name="jars" depends="compile">
     <mkdir dir="netbeans/modules"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+    <property file="${nb_root}/xml/spec-vers.properties"/>
+    <copy file="manifest.mf" tofile="manifest-subst.mf">
+      <filterchain>
+        <expandproperties/>
+      </filterchain>
+    </copy>
     <locjar jarfile="netbeans/modules/strutssupport.jar"
             manifest="manifest-subst.mf"
             basedir="src"
Index: ant/grammar/manifest.mf
===================================================================
RCS file: /cvs/ant/grammar/manifest.mf,v
retrieving revision 1.10
diff -u -r1.10 manifest.mf
--- ant/grammar/manifest.mf	29 Dec 2003 19:30:50 -0000	1.10
+++ ant/grammar/manifest.mf	8 Jan 2004 22:37:14 -0000
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.ant.grammar/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ant/grammar/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.5
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module-Specification-Version: 1.5.${xml.common.impl.version}
+OpenIDE-Module-Implementation-Version: ${buildnumber}
 OpenIDE-Module-Layer: org/netbeans/modules/ant/grammar/mf-layer.xml
-OpenIDE-Module-Module-Dependencies: org.netbeans.modules.xml.core/2 = @BUILD_NUMBER_SUBST@, org.apache.tools.ant.module/3 > 3.3
+OpenIDE-Module-Module-Dependencies: org.netbeans.modules.xml.core/2 = ${xml.common.impl.version}, org.apache.tools.ant.module/3 > 3.3
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
 
Index: ant/grammar/build.xml
===================================================================
RCS file: /cvs/ant/grammar/build.xml,v
retrieving revision 1.8
diff -u -r1.8 build.xml
--- ant/grammar/build.xml	28 Dec 2003 05:01:51 -0000	1.8
+++ ant/grammar/build.xml	8 Jan 2004 22:37:14 -0000
@@ -8,7 +8,7 @@
 http://www.sun.com/
 
 The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -38,8 +38,12 @@
 
   <target name="jars" depends="compile">
     <mkdir dir="netbeans/modules/eager"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+    <property file="../../xml/spec-vers.properties"/>
+    <copy file="manifest.mf" tofile="manifest-subst.mf">
+      <filterchain>
+        <expandproperties/>
+      </filterchain>
+    </copy>
     <locjar jarfile="netbeans/modules/eager/ant-grammar.jar"
          manifest="manifest-subst.mf"
          basedir="src"