Index: spec-vers.properties
===================================================================
RCS file: /cvs/xml/spec-vers.properties,v
retrieving revision 1.23
diff -u -b -r1.23 spec-vers.properties
--- spec-vers.properties	17 Dec 2002 14:57:34 -0000	1.23
+++ spec-vers.properties	11 Mar 2003 16:33:34 -0000
@@ -53,3 +53,14 @@
 # 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
+
Index: catalog/build.xml
===================================================================
RCS file: /cvs/xml/catalog/build.xml,v
retrieving revision 1.49
diff -u -b -r1.49 build.xml
--- catalog/build.xml	20 Feb 2003 19:37:00 -0000	1.49
+++ catalog/build.xml	11 Mar 2003 16:33:34 -0000
@@ -41,6 +41,8 @@
         <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>
 
Index: catalog/manifest.mf
===================================================================
RCS file: /cvs/xml/catalog/manifest.mf,v
retrieving revision 1.16
diff -u -b -r1.16 manifest.mf
--- catalog/manifest.mf	20 Feb 2003 19:37:00 -0000	1.16
+++ catalog/manifest.mf	11 Mar 2003 16:33:34 -0000
@@ -1,15 +1,14 @@
-OpenIDE-Module: org.netbeans.modules.xml.catalog/1
+OpenIDE-Module: org.netbeans.modules.xml.catalog/2
 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: @BUILD_NUMBER_SUBST@
+OpenIDE-Module-Implementation-Version: @XML_BUILD_NUMBER_SUBST@
 OpenIDE-Module-Public-Packages: 
- org.netbeans.modules.xml.catalog.spi.**,
- org.netbeans.modules.xml.catalog.settings.*
+ 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/1 = @BUILD_NUMBER_SUBST@
+ org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@
 Class-Path: ext/resolver-1_1_nb.jar
 
Index: core/build.xml
===================================================================
RCS file: /cvs/xml/core/build.xml,v
retrieving revision 1.59
diff -u -b -r1.59 build.xml
--- core/build.xml	20 Feb 2003 19:37:00 -0000	1.59
+++ core/build.xml	11 Mar 2003 16:33:34 -0000
@@ -41,6 +41,8 @@
         <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">
Index: core/manifest.mf
===================================================================
RCS file: /cvs/xml/core/manifest.mf,v
retrieving revision 1.30
diff -u -b -r1.30 manifest.mf
--- core/manifest.mf	26 Feb 2003 18:30:08 -0000	1.30
+++ core/manifest.mf	11 Mar 2003 16:33:34 -0000
@@ -1,19 +1,16 @@
-OpenIDE-Module: org.netbeans.modules.xml.core/1
+OpenIDE-Module: org.netbeans.modules.xml.core/2
 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: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-Public-Packages: 
- org.netbeans.modules.xml.api.**,
- org.netbeans.modules.xml.spi.**
+OpenIDE-Module-Implementation-Version: @XML_BUILD_NUMBER_SUBST@
+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.openide.execution > 1.0,
  org.openide.io > 1.0
 OpenIDE-Module-Requires: org.openide.windows.IOProvider
-OpenIDE-Module-Provides: org.netbeans.modules.xml.api.grammar_alpha1
 Class-Path: docs/xml-core.jar
 
 Name: org/netbeans/modules/xml/core/XMLDataLoader.class
Index: css/manifest.mf
===================================================================
RCS file: /cvs/xml/css/manifest.mf,v
retrieving revision 1.13
diff -u -b -r1.13 manifest.mf
--- css/manifest.mf	18 Feb 2003 18:30:03 -0000	1.13
+++ css/manifest.mf	11 Mar 2003 16:33:34 -0000
@@ -1,4 +1,4 @@
-OpenIDE-Module: org.netbeans.modules.css/1
+OpenIDE-Module: org.netbeans.modules.css/2
 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
Index: schema/build.xml
===================================================================
RCS file: /cvs/xml/schema/build.xml,v
retrieving revision 1.10
diff -u -b -r1.10 build.xml
--- schema/build.xml	18 Feb 2003 18:30:08 -0000	1.10
+++ schema/build.xml	11 Mar 2003 16:33:34 -0000
@@ -43,6 +43,8 @@
         <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">
Index: schema/manifest.mf
===================================================================
RCS file: /cvs/xml/schema/manifest.mf,v
retrieving revision 1.5
diff -u -b -r1.5 manifest.mf
--- schema/manifest.mf	20 Feb 2003 19:37:01 -0000	1.5
+++ schema/manifest.mf	11 Mar 2003 16:33:34 -0000
@@ -3,10 +3,11 @@
 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-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/1 = @BUILD_NUMBER_SUBST@
+ org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@
 
 Name: org/netbeans/modules/xml/schema/SchemaLoader.class
 OpenIDE-Module-Class: Loader
Index: tax/build.xml
===================================================================
RCS file: /cvs/xml/tax/build.xml,v
retrieving revision 1.48
diff -u -b -r1.48 build.xml
--- tax/build.xml	20 Feb 2003 19:37:02 -0000	1.48
+++ tax/build.xml	11 Mar 2003 16:33:34 -0000
@@ -40,6 +40,8 @@
         <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">
Index: tax/manifest.mf
===================================================================
RCS file: /cvs/xml/tax/manifest.mf,v
retrieving revision 1.15
diff -u -b -r1.15 manifest.mf
--- tax/manifest.mf	20 Feb 2003 19:37:02 -0000	1.15
+++ tax/manifest.mf	11 Mar 2003 16:33:34 -0000
@@ -1,10 +1,10 @@
-OpenIDE-Module: org.netbeans.modules.xml.tax/1
+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: @BUILD_NUMBER_SUBST@
+OpenIDE-Module-Implementation-Version: @XML_BUILD_NUMBER_SUBST@
 OpenIDE-Module-Layer: org/netbeans/modules/xml/tax/resources/mf-layer.xml
 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/1 = @BUILD_NUMBER_SUBST@
+OpenIDE-Module-Module-Dependencies: org.netbeans.api.xml/1 > @API_SPEC_VERS_SUBST@, org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@
 Class-Path: ext/tax.jar ext/xerces2.jar
 OpenIDE-Module-Public-Packages: -
Index: text-edit/build.xml
===================================================================
RCS file: /cvs/xml/text-edit/build.xml,v
retrieving revision 1.48
diff -u -b -r1.48 build.xml
--- text-edit/build.xml	18 Feb 2003 18:30:16 -0000	1.48
+++ text-edit/build.xml	11 Mar 2003 16:33:35 -0000
@@ -43,6 +43,8 @@
         <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">
Index: text-edit/manifest.mf
===================================================================
RCS file: /cvs/xml/text-edit/manifest.mf,v
retrieving revision 1.20
diff -u -b -r1.20 manifest.mf
--- text-edit/manifest.mf	20 Feb 2003 19:37:02 -0000	1.20
+++ text-edit/manifest.mf	11 Mar 2003 16:33:35 -0000
@@ -1,14 +1,13 @@
-OpenIDE-Module: org.netbeans.modules.xml.text/1
+OpenIDE-Module: org.netbeans.modules.xml.text/2
 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: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-Public-Packages: org.netbeans.modules.xml.text.syntax.*
+OpenIDE-Module-Implementation-Version: @XML_BUILD_NUMBER_SUBST@
+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/1 = @BUILD_NUMBER_SUBST@,
+ org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@,
  org.netbeans.modules.editor/1 > 1.7
-OpenIDE-Module-Provides: org.netbeans.modules.xml.api.grammar_client
 
Index: tools/build.xml
===================================================================
RCS file: /cvs/xml/tools/build.xml,v
retrieving revision 1.51
diff -u -b -r1.51 build.xml
--- tools/build.xml	20 Feb 2003 19:37:03 -0000	1.51
+++ tools/build.xml	11 Mar 2003 16:33:35 -0000
@@ -43,6 +43,8 @@
         <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">
Index: tools/manifest.mf
===================================================================
RCS file: /cvs/xml/tools/manifest.mf,v
retrieving revision 1.21
diff -u -b -r1.21 manifest.mf
--- tools/manifest.mf	20 Feb 2003 19:37:03 -0000	1.21
+++ tools/manifest.mf	11 Mar 2003 16:33:35 -0000
@@ -1,4 +1,4 @@
-OpenIDE-Module: org.netbeans.modules.xml.tools/1
+OpenIDE-Module: org.netbeans.modules.xml.tools/2
 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
@@ -8,8 +8,8 @@
 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/1 = @BUILD_NUMBER_SUBST@,
- org.netbeans.modules.xml.core/1 = @BUILD_NUMBER_SUBST@, 
+ org.netbeans.modules.xml.tax/2 = @XML_BUILD_NUMBER_SUBST@,
+ org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@, 
  org.netbeans.libs.jaxp/1,
  org.openide.src > 1.0
 
Index: tree-edit/build.xml
===================================================================
RCS file: /cvs/xml/tree-edit/build.xml,v
retrieving revision 1.46
diff -u -b -r1.46 build.xml
--- tree-edit/build.xml	21 Feb 2003 13:38:08 -0000	1.46
+++ tree-edit/build.xml	11 Mar 2003 16:33:35 -0000
@@ -44,6 +44,8 @@
         <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">
Index: tree-edit/manifest.mf
===================================================================
RCS file: /cvs/xml/tree-edit/manifest.mf,v
retrieving revision 1.20
diff -u -b -r1.20 manifest.mf
--- tree-edit/manifest.mf	21 Feb 2003 13:38:08 -0000	1.20
+++ tree-edit/manifest.mf	11 Mar 2003 16:33:35 -0000
@@ -1,14 +1,14 @@
-OpenIDE-Module: org.netbeans.modules.xml.tree/1
+OpenIDE-Module: org.netbeans.modules.xml.tree/2
 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: @BUILD_NUMBER_SUBST@
+OpenIDE-Module-Implementation-Version: @XML_BUILD_NUMBER_SUBST@
 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/1  = @BUILD_NUMBER_SUBST@,
- org.netbeans.modules.xml.core/1 = @BUILD_NUMBER_SUBST@
+ org.netbeans.modules.xml.tax/2  = @XML_BUILD_NUMBER_SUBST@,
+ org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@
 Class-Path: docs/xml-tree-help.jar
 
Index: xsl/build.xml
===================================================================
RCS file: /cvs/xml/xsl/build.xml,v
retrieving revision 1.19
diff -u -b -r1.19 build.xml
--- xsl/build.xml	25 Feb 2003 11:05:06 -0000	1.19
+++ xsl/build.xml	11 Mar 2003 16:33:39 -0000
@@ -43,6 +43,8 @@
         <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>
Index: xsl/manifest.mf
===================================================================
RCS file: /cvs/xml/xsl/manifest.mf,v
retrieving revision 1.11
diff -u -b -r1.11 manifest.mf
--- xsl/manifest.mf	20 Feb 2003 15:31:53 -0000	1.11
+++ xsl/manifest.mf	11 Mar 2003 16:33:39 -0000
@@ -2,12 +2,12 @@
 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: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-Public-Packages: org.netbeans.modules.xsl.api.**
+OpenIDE-Module-Implementation-Version: @XML_BUILD_NUMBER_SUBST@
+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/1 = @BUILD_NUMBER_SUBST@,
+ org.netbeans.modules.xml.core/2 = @XML_BUILD_NUMBER_SUBST@,
  org.netbeans.libs.jaxp/1,
  org.netbeans.libs.xalan/1 > 1.1,
  org.netbeans.modules.servletapi/1,