This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 38267
Collapse All | Expand All

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

Return to bug 38267