Attachment #5718 for bug #23055

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 23055
Collapse All | Expand All

Lines 38-43 Link Here

(-)ant/build.xml (+2 lines)
38	<include name="ant.jar"/>	38	<include name="ant.jar"/>
39	<include name="ant-1.*.jar"/>	39	<include name="ant-1.*.jar"/>
40	</fileset>	40	</fileset>
		41	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
41	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	42	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
42	<pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>	43	<pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
43	</classpath>	44	</classpath>
Lines 182-187 Link Here
182	<pathelement location="${useful-sources}"/>	183	<pathelement location="${useful-sources}"/>
183	</sourcepath>	184	</sourcepath>
184	<classpath>	185	<classpath>
		186	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
185	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	187	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
186	</classpath>	188	</classpath>
187	</javadoc>	189	</javadoc>

Lines 48-54 Link Here

(-)antlr/build.xml (-1 / +1 lines)
48	<include name="openide*.jar" />	48	<include name="openide*.jar" />
49	</fileset>	49	</fileset>
50	<pathelement location="../java/netbeans/modules/java.jar"/>	50	<pathelement location="../java/netbeans/modules/java.jar"/>
51	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	51	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
52	</classpath>	52	</classpath>
53	</javac>	53	</javac>
54	</target>	54	</target>

Lines 37-43 Link Here

(-)apisupport/build.xml (-1 / +1 lines)
37	</fileset>	37	</fileset>
38	<!--<pathelement location="../core/netbeans/lib/core.jar"/>-->	38	<!--<pathelement location="../core/netbeans/lib/core.jar"/>-->
39	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>	39	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
40	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	40	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
41	</classpath>	41	</classpath>
42	<exclude name="org/netbeans/modules/apisupport/ant/"/>	42	<exclude name="org/netbeans/modules/apisupport/ant/"/>
43	<exclude name="org/netbeans/modules/apisupport/lite/"/>	43	<exclude name="org/netbeans/modules/apisupport/lite/"/>

Lines 36-42 Link Here

(-)apisupport/lite/build.xml (-1 / +1 lines)
36	<!-- Included by jarpackager, Jikes seems to want it: -->	36	<!-- Included by jarpackager, Jikes seems to want it: -->
37	<pathelement location="../../openidex/netbeans/modules/autoload/openidex.jar"/>	37	<pathelement location="../../openidex/netbeans/modules/autoload/openidex.jar"/>
38	<pathelement location="../../core/netbeans/lib/core.jar"/>	38	<pathelement location="../../core/netbeans/lib/core.jar"/>
39	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	39	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
40	</classpath>	40	</classpath>
41	<include name="org/netbeans/modules/apisupport/lite/"/>	41	<include name="org/netbeans/modules/apisupport/lite/"/>
42	</javac>	42	</javac>




  <target name="compile">
    <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
      <classpath>
        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
      </classpath>
    </javac>
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">

        <fileset dir="../openide/netbeans/lib">
          <include name="openide*.jar" />
        </fileset>
        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
      </classpath>
    </javac>
    <!-- Now just this class can refer to core: -->

        <fileset dir="../openide/netbeans/lib">
          <include name="openide*.jar" />
        </fileset>
        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
	<pathelement location="../core/netbeans/lib/core.jar"/>
      </classpath>
    </javac>

Lines 63-69 Link Here

(-)corba/build.xml (-1 / +1 lines)
63	<!-- Hopefully set up by nbbuild/build.xml: -->	63	<!-- Hopefully set up by nbbuild/build.xml: -->
64	<pathelement location="${jdkhome}/lib/tools.jar"/>	64	<pathelement location="${jdkhome}/lib/tools.jar"/>
65	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	65	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
66	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	66	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
67	</classpath>	67	</classpath>
68	</javac>	68	</javac>
69	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	69	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">





  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
  <property name="binroot" location="../../nbextra"/>
  <property name="xml-apis" value="xml-apis.jar"/>

  <target name="compile">
    <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">    

        </fileset>
        <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
        <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
        <pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
      </classpath>
    </javac>
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">

        </fileset>
        <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
        <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
        <pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
        <pathelement location="libsrc"/>
      </classpath>
    </javac>

Lines 23-29 Link Here

(-)core/execution/build.xml (-2 / +2 lines)
23	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>	23	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
24	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>	24	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
25	<property name="binroot" location="../../../nbextra"/>	25	<property name="binroot" location="../../../nbextra"/>
26	<property name="xmlparser" value="xerces.jar"/>	26	<property name="xml-apis" value="xml-apis.jar"/>
27		27
28	<target name="compile">	28	<target name="compile">
29	<!--	29	<!--
Lines 34-40 Link Here
34	<include name="openide*.jar" />	34	<include name="openide*.jar" />
35	</fileset>	35	</fileset>
36	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	36	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
37	<pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>	37	<pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
38	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>	38	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
39	</classpath>	39	</classpath>
40	</javac>	40	</javac>

Lines 24-30 Link Here

(-)core/ide/build.xml (-2 / +2 lines)
24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>	24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>	25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
26	<property name="binroot" location="../../../nbextra"/>	26	<property name="binroot" location="../../../nbextra"/>
27	<property name="xmlparser" value="xerces.jar"/>	27	<property name="xml-apis" value="xml-apis.jar"/>
28		28
29	<target name="compile">	29	<target name="compile">
30	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	30	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Lines 35-41 Link Here
35	</fileset>	35	</fileset>
36	<pathelement location="../netbeans/lib/core.jar"/>	36	<pathelement location="../netbeans/lib/core.jar"/>
37	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	37	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
38	<pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>	38	<pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
39	<!-- <pathelement location="${binroot}/core/release/lib/ext/jh.jar"/> -->	39	<!-- <pathelement location="${binroot}/core/release/lib/ext/jh.jar"/> -->
40	</classpath>	40	</classpath>
41	</javac>	41	</javac>

Lines 23-29 Link Here

(-)core/javahelp/build.xml (-2 / +2 lines)
23	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>	23	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
24	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>	24	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
25	<property name="binroot" location="../../../nbextra"/>	25	<property name="binroot" location="../../../nbextra"/>
26	<property name="xmlparser" value="xerces.jar"/>	26	<property name="xml-apis" value="xml-apis.jar"/>
27		27
28	<target name="compile">	28	<target name="compile">
29	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	29	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Lines 33-39 Link Here
33	<include name="openide*.jar" />	33	<include name="openide*.jar" />
34	</fileset>	34	</fileset>
35	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	35	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
36	<pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>	36	<pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
37	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>	37	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
38	</classpath>	38	</classpath>
39	</javac>	39	</javac>

Lines 23-29 Link Here

(-)core/naming/build.xml (-1 lines)
23	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>	23	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
24	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>	24	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
25	<property name="binroot" location="../../../nbextra"/>	25	<property name="binroot" location="../../../nbextra"/>
26	<property name="xmlparser" value="xerces.jar"/>
27		26
28	<target name="compile">	27	<target name="compile">
29	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	28	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">

Lines 23-29 Link Here

(-)core/ui/build.xml (-2 / +2 lines)
23	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>	23	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
24	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>	24	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
25	<property name="binroot" location="../../../nbextra"/>	25	<property name="binroot" location="../../../nbextra"/>
26	<property name="xmlparser" value="xerces.jar"/>	26	<property name="xml-apis" value="xml-apis.jar"/>
27		27
28	<target name="compile">	28	<target name="compile">
29	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	29	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Lines 35-41 Link Here
35	</fileset>	35	</fileset>
36	<!--	36	<!--
37	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	37	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
38	<pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>	38	<pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
39	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>	39	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
40	-->	40	-->
41	</classpath>	41	</classpath>

Lines 23-29 Link Here

(-)core/windows/build.xml (-2 / +2 lines)
23	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>	23	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
24	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>	24	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
25	<property name="binroot" location="../../../nbextra"/>	25	<property name="binroot" location="../../../nbextra"/>
26	<property name="xmlparser" value="xerces.jar"/>	26	<property name="xml-apis" value="xml-apis.jar"/>
27		27
28	<target name="compile">	28	<target name="compile">
29	<!--	29	<!--
Lines 34-40 Link Here
34	<include name="openide*.jar" />	34	<include name="openide*.jar" />
35	</fileset>	35	</fileset>
36	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	36	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
37	<pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>	37	<pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
38	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>	38	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
39	</classpath>	39	</classpath>
40	</javac>	40	</javac>

Lines 80-86 Link Here

(-)cpplite/build.xml (-2 / +2 lines)
80	<include name="openide*.jar" />	80	<include name="openide*.jar" />
81	</fileset>	81	</fileset>
82		82
83	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar" />	83	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar" />
84	</classpath>	84	</classpath>
85	</javac>	85	</javac>
86	</target>	86	</target>
Lines 98-104 Link Here
98	<include name="openide*.jar" />	98	<include name="openide*.jar" />
99	</fileset>	99	</fileset>
100		100
101	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar" />	101	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar" />
102	</classpath>	102	</classpath>
103	</javac>	103	</javac>
104	</target>	104	</target>

Lines 38-44 Link Here

(-)editor/build.xml (-1 / +1 lines)
38	<include name="openide*.jar" />	38	<include name="openide*.jar" />
39	</fileset>	39	</fileset>
40	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	40	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
41	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	41	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
42	</classpath>	42	</classpath>
43	</javac>	43	</javac>
44	</target>	44	</target>

Lines 36-42 Link Here

(-)form/build.xml (-1 / +1 lines)
36	<include name="openide*.jar" />	36	<include name="openide*.jar" />
37	</fileset>	37	</fileset>
38	<pathelement location="../java/netbeans/modules/java.jar"/>	38	<pathelement location="../java/netbeans/modules/java.jar"/>
39	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	39	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
40	<pathelement location="tmp"/>	40	<pathelement location="tmp"/>
41	</classpath>	41	</classpath>
42	</javac>	42	</javac>

Lines 51-57 Link Here

(-)java/build.xml (-1 / +1 lines)
51	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	51	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
52	<pathelement location="${binroot}/java/release/modules/ext/javac.jar"/>	52	<pathelement location="${binroot}/java/release/modules/ext/javac.jar"/>
53	<pathelement location="${binroot}/java/release/modules/ext/java-gj.jar"/>	53	<pathelement location="${binroot}/java/release/modules/ext/java-gj.jar"/>
54	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	54	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
55	<!-- Hopefully set up by nbbuild/build.xml: -->	55	<!-- Hopefully set up by nbbuild/build.xml: -->
56	<pathelement location="${jdkhome}/lib/tools.jar"/>	56	<pathelement location="${jdkhome}/lib/tools.jar"/>
57	<!-- JavaMake build tool -->	57	<!-- JavaMake build tool -->

Lines 38-44 Link Here

(-)javacvs/build.xml (-1 / +1 lines)
38	<fileset dir="../openide/netbeans/lib">	38	<fileset dir="../openide/netbeans/lib">
39	<include name="openide*.jar"/>	39	<include name="openide*.jar"/>
40	</fileset>	40	</fileset>
41	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	41	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
42	</classpath>	42	</classpath>
43	</javac>	43	</javac>
44		44

Lines 49-55 Link Here

(-)javadoc/build.xml (-1 / +1 lines)
49	<include name="openide*.jar" />	49	<include name="openide*.jar" />
50	</fileset>	50	</fileset>
51	<pathelement location="../java/netbeans/modules/java.jar"/>	51	<pathelement location="../java/netbeans/modules/java.jar"/>
52	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	52	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
53	</classpath>	53	</classpath>
54	</javac>	54	</javac>
55	</target>	55	</target>





    <property name="binroot" location="${lexer.module.root}/../../nbextra"/>
    <property name="javacchome" location="${binroot}/lexer/compiletime"/>
    <property name="xml-apis" location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
    <property name="build.compiler.debug" value="on"/>

    <property name="lexer.name" value="${g.name}Lexer"/>

             <arg value="${lexer.class}"/>
             <arg value="${constants.class}"/>
             <classpath>
               <pathelement location="${xml-apis}"/>
               <pathelement location="${lexer.module.root}/libsrc"/>
               <pathelement location="${g.root}"/>
             </classpath>

               deprecation="${build.compiler.deprecation}"
               debug="${build.compiler.debug}">
          <classpath>
               <pathelement location="${xml-apis}"/>
               <pathelement location="${lexer.module.root}/libsrc"/>
               <pathelement location="${g.root}"/>
          </classpath>

Lines 38-44 Link Here

(-)mdr/build.xml (-2 / +2 lines)
38	<fileset dir="${nbroot}/openide/netbeans/lib">	38	<fileset dir="${nbroot}/openide/netbeans/lib">
39	<include name="openide*.jar"/>	39	<include name="openide*.jar"/>
40	</fileset>	40	</fileset>
41	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	41	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
42	<pathelement location="${binroot}/scripting/release/modules/ext/djava.jar"/>	42	<pathelement location="${binroot}/scripting/release/modules/ext/djava.jar"/>
43	<pathelement location="jmi/"/>	43	<pathelement location="jmi/"/>
44	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>	44	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
Lines 52-58 Link Here
52	<fileset dir="${nbroot}/openide/netbeans/lib">	52	<fileset dir="${nbroot}/openide/netbeans/lib">
53	<include name="openide*.jar"/>	53	<include name="openide*.jar"/>
54	</fileset>	54	</fileset>
55	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	55	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
56	<pathelement location="${binroot}/scripting/release/modules/ext/djava.jar"/>	56	<pathelement location="${binroot}/scripting/release/modules/ext/djava.jar"/>
57	<pathelement location="jmi/"/>	57	<pathelement location="jmi/"/>
58	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>	58	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>

Lines 32-38 Link Here

(-)mdr/samples/xml/build.xml (-1 / +1 lines)
32	</javac>	32	</javac>
33	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	33	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
34	<classpath>	34	<classpath>
35	<pathelement location="../../../core/netbeans/lib/ext/xerces.jar"/>	35	<pathelement location="../../../core/netbeans/lib/ext/xml-apis.jar"/>
36	<pathelement location="../../../openide/openide-13javac-workaround.jar"/>	36	<pathelement location="../../../openide/openide-13javac-workaround.jar"/>
37	<pathelement location="../../../openidex/netbeans/modules/autoload/openidex.jar"/>	37	<pathelement location="../../../openidex/netbeans/modules/autoload/openidex.jar"/>
38	<pathelement location="../../../openidex/looks/netbeans/modules/autoload/looks.jar"/>	38	<pathelement location="../../../openidex/looks/netbeans/modules/autoload/looks.jar"/>




        <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>        
	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
<!--    <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/> -->
        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
      </classpath>
    </javac>
    <!-- Hack. Deprecated class. -->

      <classpath>
        <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>        
	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
      </classpath>
-->      
    </javac>

        <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
        <pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
<!--    <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/> -->
        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
      </classpath>
    </javac>
    <postprocess file="compatkit-work/org/openide/util/actions/SystemAction.class"

        <pathelement location="src"/>
      </sourcepath>
      <classpath>
        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
        <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
      </classpath>
      <link href="${jdk-docs-location}"

    <delete dir="examplemodulereload"/>
  </target>

    <target  name="standalone-fs" depends="standalone-fs-prepare" description="Creates zip file suitable for download. Zip file contains all jars necessary + xml-apis.jar and xerces.jarjar for using standalone filesystems.">
        <zip compress="true" zipfile="standalone/nbfilesystems.zip">
            <fileset dir="standalone">
                <include name="openide-fs.jar"/>
                <include name="openide-util.jar"/>
                <include name="README-FS.txt"/>
            </fileset>
            <fileset dir="${binroot}/core/release/lib/ext" includes="xml-apis.jar"/>
            <fileset dir="${binroot}/core/release/lib/ext" includes="xerces.jar"/>
        </zip>
    </target>

    <target  name="standalone-fs-light" depends="standalone-fs-prepare" description="Creates zip file suitable for download. Zip file contains all jars necessary for using standalone filesystems. Without xml-apis.jar and xerces.jar.">
        <zip compress="true" zipfile="standalone/nbfilesystems-light.zip">
            <fileset dir="standalone">
                <include name="openide-fs.jar"/>

Lines 33-39 Link Here

(-)openidex/build.xml (-1 / +1 lines)
33	<fileset dir="../openide/netbeans/lib">	33	<fileset dir="../openide/netbeans/lib">
34	<include name="openide*.jar" />	34	<include name="openide*.jar" />
35	</fileset>	35	</fileset>
36	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	36	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
37	</classpath>	37	</classpath>
38	</javac>	38	</javac>
39	</target>	39	</target>

Lines 33-39 Link Here

(-)openidex/looks/build.xml (-1 / +1 lines)
33	<fileset dir="../../openide/netbeans/lib">	33	<fileset dir="../../openide/netbeans/lib">
34	<include name="openide*.jar" />	34	<include name="openide*.jar" />
35	</fileset>	35	</fileset>
36	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	36	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
37	</classpath>	37	</classpath>
38	</javac>	38	</javac>
39	</target>	39	</target>

Lines 35-41 Link Here

(-)projects/build.xml (-1 / +1 lines)
35	<pathelement location="../core/netbeans/lib/core.jar"/>	35	<pathelement location="../core/netbeans/lib/core.jar"/>
36	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	36	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
37	<!-- <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/>-->	37	<!-- <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/>-->
38	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	38	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
39	</classpath>	39	</classpath>
40	</javac>	40	</javac>
41	</target>	41	</target>

Lines 39-45 Link Here

(-)tomcatint/tomcat32/build.xml (-1 / +1 lines)
39	<pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>	39	<pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
40	<pathelement location="${nb_root}/web/core/netbeans/modules/jsp.jar"/>	40	<pathelement location="${nb_root}/web/core/netbeans/modules/jsp.jar"/>
41	<pathelement location="${nb_root}/jarpackager/netbeans/modules/jarpackager.jar"/>	41	<pathelement location="${nb_root}/jarpackager/netbeans/modules/jarpackager.jar"/>
42	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	42	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
43	<fileset dir="${nb_root}/openide/netbeans/lib">	43	<fileset dir="${nb_root}/openide/netbeans/lib">
44	<include name="openide*.jar" />	44	<include name="openide*.jar" />
45	</fileset>	45	</fileset>




     <java classname="org.netbeans.modules.schema2beans.GenBeans" fork="yes">	
     	<classpath>
	  <pathelement path="${binroot}/core/release/lib/ext/crimson.jar" />
          <pathelement path="${binroot}/core/release/lib/ext/xml-apis.jar" />
	  <pathelement path="${nb_root}/logger/netbeans/lib/ext/logger.jar" />
	  <pathelement path="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar" />
	  <fileset dir = "${nb_root}/openide">

        <pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
        <pathelement location="${nb_root}/web/core/netbeans/modules/jsp.jar"/>
        <pathelement location="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar"/>
        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
        <fileset dir="${nb_root}/openide/netbeans/lib">
          <include name="openide*.jar" />
        </fileset>

        <pathelement location="${binroot}/web/servletapi23/release/modules/ext/servlet-2.3.jar"/>
        <pathelement location="${binroot}/web/jspparser/release/modules/ext/jasper-compiler.jar"/>
        <pathelement location="${binroot}/web/jspparser/release/modules/ext/jasper-runtime.jar"/>
        <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
      </classpath>
    </javac>
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">

Lines 18-24 Link Here

(-)translatedfiles/build.xml (-1 lines)
18		18
19	<taskdef classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar" name="locjar"/>	19	<taskdef classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar" name="locjar"/>
20	<property location="../../nbextra" name="binroot"/>	20	<property location="../../nbextra" name="binroot"/>
21	<property name="xmlparser" value="xerces.jar"/>
22		21
23	<target name="clean">	22	<target name="clean">
24	<delete dir="netbeans"/>	23	<delete dir="netbeans"/>

Lines 34-40 Link Here

(-)utilities/build.xml (-1 / +1 lines)
34	</fileset>	34	</fileset>
35	<pathelement location="../openidex/netbeans/modules/autoload/openidex.jar"/>	35	<pathelement location="../openidex/netbeans/modules/autoload/openidex.jar"/>
36	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	36	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
37	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	37	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
38	</classpath>	38	</classpath>
39	</javac>	39	</javac>
40	</target>	40	</target>

Lines 37-43 Link Here

(-)vcscore/build.xml (-1 / +1 lines)
37	<include name="openide*.jar" />	37	<include name="openide*.jar" />
38	</fileset>	38	</fileset>
39	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	39	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
40	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	40	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
41	</classpath>	41	</classpath>
42	</javac>	42	</javac>
43	</target>	43	</target>

Lines 49-55 Link Here

(-)vcsgeneric/build.xml (-1 / +1 lines)
49	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>	49	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
50	<pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>	50	<pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
51	<pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>	51	<pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>
52	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	52	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
53	</classpath>	53	</classpath>
54	</javac>	54	</javac>
55	<!-- <ant dir="profiles/pvcs" inheritAll="false" target="compile"/> -->	55	<!-- <ant dir="profiles/pvcs" inheritAll="false" target="compile"/> -->

Lines 46-52 Link Here

(-)vcsgeneric/profiles/clearcase/build.xml (-1 / +1 lines)
46	<pathelement location="${nbroot1}/openidex/netbeans/modules/autoload/openidex.jar"/>	46	<pathelement location="${nbroot1}/openidex/netbeans/modules/autoload/openidex.jar"/>
47	<pathelement location="${nbroot1}/vcscore/netbeans/modules/autoload/vcscore.jar"/>	47	<pathelement location="${nbroot1}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
48	<pathelement location="${nbroot1}/vcsgeneric/netbeans/modules/vcsgen.jar"/>	48	<pathelement location="${nbroot1}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
49	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	49	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
50	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	50	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
51	</classpath>	51	</classpath>
52	</javac>	52	</javac>

Lines 47-53 Link Here

(-)vcsgeneric/profiles/cvsprofiles/build.xml (-1 / +1 lines)
47	<pathelement location="${nbroot1}/vcscore/netbeans/modules/autoload/vcscore.jar"/>	47	<pathelement location="${nbroot1}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
48	<pathelement location="${nbroot1}/vcsgeneric/netbeans/modules/vcsgen.jar"/>	48	<pathelement location="${nbroot1}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
49	<pathelement location="${nbroot1}/diff/netbeans/modules/diff.jar"/>	49	<pathelement location="${nbroot1}/diff/netbeans/modules/diff.jar"/>
50	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	50	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
51	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	51	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
52	</classpath>	52	</classpath>
53	</javac>	53	</javac>

Lines 46-52 Link Here

(-)vcsgeneric/profiles/pvcs/build.xml (-1 / +1 lines)
46	<pathelement location="${nbroot1}/openidex/netbeans/modules/autoload/openidex.jar"/>	46	<pathelement location="${nbroot1}/openidex/netbeans/modules/autoload/openidex.jar"/>
47	<pathelement location="${nbroot1}/vcscore/netbeans/modules/autoload/vcscore.jar"/>	47	<pathelement location="${nbroot1}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
48	<pathelement location="${nbroot1}/vcsgeneric/netbeans/modules/vcsgen.jar"/>	48	<pathelement location="${nbroot1}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
49	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	49	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
50	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	50	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
51	</classpath>	51	</classpath>
52	</javac>	52	</javac>

Lines 46-52 Link Here

(-)vcsgeneric/profiles/vss/build.xml (-1 / +1 lines)
46	<pathelement location="${nbroot1}/openidex/netbeans/modules/autoload/openidex.jar"/>	46	<pathelement location="${nbroot1}/openidex/netbeans/modules/autoload/openidex.jar"/>
47	<pathelement location="${nbroot1}/vcscore/netbeans/modules/autoload/vcscore.jar"/>	47	<pathelement location="${nbroot1}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
48	<pathelement location="${nbroot1}/vcsgeneric/netbeans/modules/vcsgen.jar"/>	48	<pathelement location="${nbroot1}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
49	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	49	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
50	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	50	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
51	</classpath>	51	</classpath>
52	</javac>	52	</javac>

Lines 67-73 Link Here

(-)web/advanced/build.xml (-1 / +1 lines)
67	<pathelement location="${nb_root}/web/jspsyntax/netbeans/modules/eager/jsp-syntax.jar"/>	67	<pathelement location="${nb_root}/web/jspsyntax/netbeans/modules/eager/jsp-syntax.jar"/>
68	<pathelement location="extra/servlet-2.3-filters-api.jar"/>	68	<pathelement location="extra/servlet-2.3-filters-api.jar"/>
69	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>	69	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
70	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	70	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
71	<fileset dir="${nb_root}/openide">	71	<fileset dir="${nb_root}/openide">
72	<include name="netbeans/lib/openide*.jar"/>	72	<include name="netbeans/lib/openide*.jar"/>
73	</fileset>	73	</fileset>

Lines 37-43 Link Here

(-)web/jspparser/build.xml (-1 / +1 lines)
37	<classpath>	37	<classpath>
38	<pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>	38	<pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
39	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	39	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
40	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	40	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
41	<pathelement location="${core_root}/src/"/>	41	<pathelement location="${core_root}/src/"/>
42	<pathelement location="${binroot}/web/servletapi23/release/modules/ext/servlet-2.3.jar"/>	42	<pathelement location="${binroot}/web/servletapi23/release/modules/ext/servlet-2.3.jar"/>
43	<pathelement location="${binroot}/web/jspparser/release/modules/ext/jasper-runtime.jar"/>	43	<pathelement location="${binroot}/web/jspparser/release/modules/ext/jasper-runtime.jar"/>

Lines 117-123 Link Here

(-)web/taglibed/build.xml (-1 / +1 lines)
117	<pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>	117	<pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
118	<pathelement location="${nb_root}/httpserver/servletapi/netbeans/modules/ext/servlet-2.2.jar"/>	118	<pathelement location="${nb_root}/httpserver/servletapi/netbeans/modules/ext/servlet-2.2.jar"/>
119	<pathelement location="${nb_root}/jarpackager/netbeans/modules/jarpackager.jar"/>	119	<pathelement location="${nb_root}/jarpackager/netbeans/modules/jarpackager.jar"/>
120	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	120	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
121	<pathelement location="${f4jroot}/core/release/lib/ext/parser.jar"/>	121	<pathelement location="${f4jroot}/core/release/lib/ext/parser.jar"/>
122	<fileset dir="${nb_root}/openide">	122	<fileset dir="${nb_root}/openide">
123	<include name="netbeans/lib/openide*.jar"/>	123	<include name="netbeans/lib/openide*.jar"/>




# Must always be numeric (numbers separated by '.', e.g. 1.11.3).
# See http://openide.netbeans.org/versioning-policy.html for more.


## libs

# JAXP
libs.jaxp.specification.version=1.1
libs.jaxp.implementation.version=1.1.2

# Apache Xalan
libs.xalan.specification.version=${libs.jaxp.specification.version}
libs.xalan.implementation.version=2.3.1


# common module spec.version
xml.common=0.6



# XML Core
xml.core.specification.version=${xml.common}

# JAXP
xml.jaxp.specification.version=1.1
xml.jaxp.implementation.version=1.1.2

# Apache Xalan
xml.xalan.specification.version=${xml.jaxp.specification.version}
xml.xalan.implementation.version=2.3.1

# CSS Support
xml.css.specification.version=${xml.common}




    <property name="binroot" location="${nbroot}/../nbextra"/>
    <property name="nbext_root" location="${nbroot}/nbbuild"/>

    <property name="xml-apis" location="${binroot}/core/release/lib/ext/xml-apis.jar" />

    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
    <property name="homepage.base" value="xml.netbeans.org"/>

    <property name="storepass" value="?"/>
    <property name="nbm_alias" value="nb_ide"/>
    <property name="release" value="dev"/>
    <property name="jaxp-transform" value="${binroot}/xml/libs/xalan/release/modules/autoload/ext/jaxp-transform-1.1.2.jar"/>
    <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
    <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>

                <fileset dir="${nbroot}/openide/netbeans/lib">
                    <include name="openide*.jar"/>
                </fileset>
                <pathelement location="${xml-apis}"/> <!-- JAXP and SAX dependency -->
                <pathelement location="${jaxp-transform}"/>
            </classpath>
        </javac>
    </target>

                <fileset dir="${nbroot}/openide/netbeans/lib">
                    <include name="openide*.jar"/>
                </fileset>
                <pathelement location="${xml-apis}"/> <!-- JAXP and SAX dependency -->
                <pathelement location="${jaxp-transform}"/>
            </classpath>                       
            
          <link href="${jdk-docs-location}"

Lines 64-70 Link Here

(-)xml/catalog/build.xml (-1 / +1 lines)
64	</fileset>	64	</fileset>
65	<pathelement location="${binroot}/core/release/lib/ext/sax.jar"/>	65	<pathelement location="${binroot}/core/release/lib/ext/sax.jar"/>
66	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/> <!-- actually needed by dead code -->	66	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/> <!-- actually needed by dead code -->
67	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/> <!-- is covered by above -->	67	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/> <!-- is covered by above -->
68	<pathelement location="${binroot}/xml/catalog/release/modules/ext/resolver-1_1_nb.jar"/>	68	<pathelement location="${binroot}/xml/catalog/release/modules/ext/resolver-1_1_nb.jar"/>
69	<pathelement location="${core_root}/src/"/>	69	<pathelement location="${core_root}/src/"/>
70	<pathelement location="${api_root}/src/"/>	70	<pathelement location="${api_root}/src/"/>




Microsystems, Inc. All Rights Reserved.
-->

<project name="libs/jaxp" default="netbeans" basedir=".">

    <property name="libs_root" location="../.."/>

    <property name="nbroot" location="${libs_root}/.."/>
    <property name="binroot" location="${nbroot}/../nbextra"/>
    <property name="nbext_root" location="${nbroot}/nbbuild"/>

    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
    <property name="homepage.base" value="libs.netbeans.org"/>
    <property name="dist.base" value="http://www.netbeans.org/download/nbms/"/>
    <property name="storepass" value="?"/>
    <property name="nbm_alias" value="nb_ide"/>
    <property name="release" value="dev"/>

        <property name="buildnumber" value="${DSTAMP}${TSTAMP}"/>
        <echo message="buildnumber = ${buildnumber}"/>

        <property file="${libs_root}/spec-vers.properties"/>
        <filter token="JAXP_SPEC_VERS_SUBST" value="${libs.jaxp.specification.version}"/>
        <filter token="JAXP_IMPL_VERS_SUBST" value="${libs.jaxp.implementation.version}"/>
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
    </target>


    </target>

    <target name="netbeans" depends="jars,release">
        <copy todir="${libs_root}/netbeans">
            <fileset dir="netbeans"/>
        </copy>
        <genlist targetname="nbm" outputfiledir="${nbext_root}/netbeans"/>


    <target name="nbm" depends="netbeans">
        <delete dir="Info"/>
        <makenbm file="${libs_root}/jaxp-${release}.nbm"
                 topdir="."
                 module="netbeans/modules/autoload/jaxp.jar"
                 homepage="http://${homepage.base}/jaxp/"
                 distribution="${dist.base}/jaxp-${release}.nbm">
            <license file="${license.file}"/>
            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>

            </fileset>
        </delete>
        <delete file="manifest-subst.mf"/>
        <delete file="${libs_root}/jaxp-${release}.nbm"/>
        <delete dir="netbeans"/>
        <delete dir="Info"/>
    </target>

Lines 3-6 Link Here

(-)xml/libs/jaxp/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3	3	OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3
4	OpenIDE-Module-Specification-Version: @JAXP_SPEC_VERS_SUBST@	4	OpenIDE-Module-Specification-Version: @JAXP_SPEC_VERS_SUBST@
5	OpenIDE-Module-Implementation-Version: @JAXP_IMPL_VERS_SUBST@	5	OpenIDE-Module-Implementation-Version: @JAXP_IMPL_VERS_SUBST@
6	OpenIDE-Module-Module-Dependencies: org.netbeans.libs.xalan/1	6	OpenIDE-Module-Requires: javax.xml.transform.TransformerFactory

Lines 11-16 Link Here

(-)xml/libs/jaxp/src/org/netbeans/libs/jaxp/Bundle.properties (-1 / +1 lines)
11		11
12	## xml/core/jaxp/manifest.mf	12	## xml/core/jaxp/manifest.mf
13	OpenIDE-Module-Name=Full JAXP API	13	OpenIDE-Module-Name=Full JAXP API
14	OpenIDE-Module-Display-Category=XML	14	OpenIDE-Module-Display-Category=Libraries
15	OpenIDE-Module-Short-Description=The module ensure full JAXP 1.1 implementation will be available.	15	OpenIDE-Module-Short-Description=The module ensure full JAXP 1.1 implementation will be available.
16	OpenIDE-Module-Long-Description=The module ensure full JAXP 1.1 implementation will be available. Extends NetBeans JAXP/parsers support and JAXP/transform is accessible.	16	OpenIDE-Module-Long-Description=The module ensure full JAXP 1.1 implementation will be available. Extends NetBeans JAXP/parsers support and JAXP/transform is accessible.




Microsystems, Inc. All Rights Reserved.
-->

<project name="libs/xalan" default="netbeans" basedir=".">

    <property name="libs_root" location="../.."/>

    <property name="nbroot" location="${libs_root}/.."/>
    <property name="binroot" location="${nbroot}/../nbextra"/>
    <property name="nbext_root" location="${nbroot}/nbbuild"/>

    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
    <property name="homepage.base" value="libs.netbeans.org"/>
    <property name="dist.base" value="http://www.netbeans.org/download/nbms/"/>
    <property name="storepass" value="?"/>
    <property name="nbm_alias" value="nb_ide"/>
    <property name="release" value="dev"/>

        <property name="buildnumber" value="${DSTAMP}${TSTAMP}"/>
        <echo message="buildnumber = ${buildnumber}"/>

        <property file="${libs_root}/spec-vers.properties"/>
        <filter token="XALAN_SPEC_VERS_SUBST" value="${libs.xalan.specification.version}"/>
        <filter token="XALAN_IMPL_VERS_SUBST" value="${libs.xalan.implementation.version}"/>
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
    </target>



    <target name="release">
        <copy todir="netbeans">
            <fileset dir="${binroot}/libs/xalan/release"/>
        </copy>
    </target>

    <target name="netbeans" depends="jars,release">
        <copy todir="${libs_root}/netbeans">
            <fileset dir="netbeans"/>
        </copy>
        <genlist targetname="nbm" outputfiledir="${nbext_root}/netbeans"/>


    <target name="nbm" depends="netbeans">
        <delete dir="Info"/>
        <makenbm file="${libs_root}/xalan-${release}.nbm"
                 topdir="."
                 module="netbeans/modules/autoload/xalan.jar"
                 homepage="http://${homepage.base}/xalan/"
                 distribution="${dist.base}/xalan-${release}.nbm">
            <license file="${license.file}"/>
            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>

            </fileset>
        </delete>
        <delete file="manifest-subst.mf"/>
        <delete file="${libs_root}/xalan-${release}.nbm"/>
        <delete dir="netbeans"/>
        <delete dir="Info"/>
    </target>

Lines 3-6 Link Here

(-)xml/libs/xalan/manifest.mf (-1 / +2 lines)
3	OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3	3	OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3
4	OpenIDE-Module-Specification-Version: @XALAN_SPEC_VERS_SUBST@	4	OpenIDE-Module-Specification-Version: @XALAN_SPEC_VERS_SUBST@
5	OpenIDE-Module-Implementation-Version: @XALAN_IMPL_VERS_SUBST@	5	OpenIDE-Module-Implementation-Version: @XALAN_IMPL_VERS_SUBST@
6	Class-Path: ext/jaxp-transform-1.1.2.jar ext/xalan-2.3.1.jar	6	OpenIDE-Module-Provides: javax.xml.transform.TransformerFactory
		7	Class-Path: ext/xalan-2.3.1.jar

Lines 11-16 Link Here

(-)xml/libs/xalan/src/org/netbeans/libs/xalan/Bundle.properties (-1 / +1 lines)
11		11
12	## xml/core/xalan/manifest.mf	12	## xml/core/xalan/manifest.mf
13	OpenIDE-Module-Name=Xalan Integration	13	OpenIDE-Module-Name=Xalan Integration
14	OpenIDE-Module-Display-Category=XML	14	OpenIDE-Module-Display-Category=Libraries
15	OpenIDE-Module-Short-Description=The module bundles Apache Xalan 2.3.1 (XSLT stylesheet processor).	15	OpenIDE-Module-Short-Description=The module bundles Apache Xalan 2.3.1 (XSLT stylesheet processor).
16	OpenIDE-Module-Long-Description=The module bundles Apache Xalan 2.3.1 (XSLT stylesheet processor), i.e. JAXP/transform 1.1 API implementation.	16	OpenIDE-Module-Long-Description=The module bundles Apache Xalan 2.3.1 (XSLT stylesheet processor), i.e. JAXP/transform 1.1 API implementation.

Lines 69-75 Link Here

(-)xml/text-edit/build.xml (-1 / +1 lines)
69	<pathelement location="${nbroot}/editor/netbeans/modules/editor.jar"/>	69	<pathelement location="${nbroot}/editor/netbeans/modules/editor.jar"/>
70	<pathelement location="${binroot}/core/release/lib/ext/dom.jar"/>	70	<pathelement location="${binroot}/core/release/lib/ext/dom.jar"/>
71	<pathelement location="${binroot}/core/release/lib/ext/sax.jar"/>	71	<pathelement location="${binroot}/core/release/lib/ext/sax.jar"/>
72	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/> <!-- same as above -->	72	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/> <!-- same as above -->
73	<pathelement location="${tax_lib_root}/src/"/>	73	<pathelement location="${tax_lib_root}/src/"/>
74	<pathelement location="${core_root}/src/"/>	74	<pathelement location="${core_root}/src/"/>
75	<pathelement location="${api_root}/src/"/>	75	<pathelement location="${api_root}/src/"/>




    <property name="binroot" location="${nbroot}/../nbextra"/>
    <property name="nbext_root" location="${nbroot}/nbbuild"/>

    <property name="xml-apis" location="${binroot}/core/release/lib/ext/xml-apis.jar" />
    <property name="jaxp-transform" value="${binroot}/xml/libs/xalan/release/modules/autoload/ext/jaxp-transform-1.1.2.jar"/>

    <property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
    <property name="homepage.base" value="xml.netbeans.org"/>

        <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="JAXP_SPEC_VERS_SUBST" value="${xml.jaxp.specification.version}"/>
        <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
    </target>


                <fileset dir="${nbroot}/openide/netbeans/lib">
                    <include name="openide*.jar"/>
                </fileset>
                <pathelement location="${xml-apis}"/> <!-- JAXP and SAX dependency -->
                <pathelement location="${core_root}/src/"/>
                <pathelement location="${tax_lib_root}/src/"/>
                <pathelement location="${jaxp-transform}"/> <!-- JAXP/transform API -->
                <pathelement location="${api_root}/src/"/>
                <!--Servlet API-->
                <pathelement location="${binroot}/httpserver/servletapi/release/modules/ext/servlet-2.2.jar" />
                <!--TransformServlet: HttpServerSettings-->
<!--                <pathelement location="${nbroot}/httpserver/netbeans/modules/httpserver.jar" />-->
            </classpath>
        </javac>
    </target>

Lines 8-14 Link Here

(-)xml/tools/manifest.mf (-1 / +1 lines)
8	OpenIDE-Module-Module-Dependencies:	8	OpenIDE-Module-Module-Dependencies:
9	org.netbeans.api.xml/1 > @API_SPEC_VERS_SUBST@,	9	org.netbeans.api.xml/1 > @API_SPEC_VERS_SUBST@,
10	org.netbeans.modules.xml.core/1 > @CORE_SPEC_VERS_SUBST@,	10	org.netbeans.modules.xml.core/1 > @CORE_SPEC_VERS_SUBST@,
11	org.netbeans.libs.jaxp/1 > @JAXP_SPEC_VERS_SUBST@,	11	org.netbeans.libs.jaxp/1,
12	org.netbeans.modules.servletapi/1	12	org.netbeans.modules.servletapi/1
13	OpenIDE-Module-Requires: org.openide.util.HttpServer$Impl	13	OpenIDE-Module-Requires: org.openide.util.HttpServer$Impl
14	Class-Path: docs/xml-tools.jar	14	Class-Path: docs/xml-tools.jar

Lines 14-16 Link Here

(-)xml/tools/src/org/netbeans/modules/xml/tools/resources/Bundle.properties (+3 lines)
14	OpenIDE-Module-Display-Category=XML	14	OpenIDE-Module-Display-Category=XML
15	OpenIDE-Module-Short-Description=The module contains various actions, generators and tools.	15	OpenIDE-Module-Short-Description=The module contains various actions, generators and tools.
16	OpenIDE-Module-Long-Description=The module contains various actions, generators and tools. Especially action to generate simple DTD from XML document, or wizard which generate SAX handler implementation according to selected DTD document.	16	OpenIDE-Module-Long-Description=The module contains various actions, generators and tools. Especially action to generate simple DTD from XML document, or wizard which generate SAX handler implementation according to selected DTD document.
		17
		18	## mf-layer.xml
		19	Mount/java/org-netbeans-modules-xml-tools-resources-xml_apis.xml=Standard XML APIs (JAXP, DOM, SAX) Library




                    <attr name="hint.originalPublicID" stringvalue="-//XML Module//DTD SAX Bindings 1.0//EN"/>
                </file>
            </folder>
        </folder> <!-- entities -->
    </folder> <!-- xml -->

    <folder name="Mount">
        <folder name="java">
            <file name="org-netbeans-modules-xml-tools-resources-xml_apis.xml">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.tools.resources.Bundle" />
                <![CDATA[
                    <!DOCTYPE Library PUBLIC "-//NetBeans IDE//DTD JavaLibrary//EN" "http://www.netbeans.org/dtds/JavaLibrary-1_0.dtd">

                    <Library>
                        <Archive name="lib/ext/xml-apis.jar"/>
                    </Library>
                ]]>
              </file>
          </folder> <!-- java -->
    </folder> <!-- Mount -->

    <folder name="Shortcuts">
        <file name="F6.instance">

Lines 127-132 Link Here

(-)xml/tree-edit/src/org/netbeans/modules/xml/tree/nodes/AbstractParentNode.java (+1 lines)
127	property = new NVTProperty (this);	127	property = new NVTProperty (this);
128	property.setValue ("superClass", NodeViewType.class); // NOI18N	128	property.setValue ("superClass", NodeViewType.class); // NOI18N
129	property.setValue ("noneServiceClass", NO_NODE_VIEW_TYPE); // NOI18N	129	property.setValue ("noneServiceClass", NO_NODE_VIEW_TYPE); // NOI18N
		130	property.setValue ("helpID", AbstractParentNode.class.getName() + "[NodeViewType]");
130		131
131	property.setName ("nodeViewType"); // NOI18N	132	property.setName ("nodeViewType"); // NOI18N
132	property.setDisplayName (Util.THIS.getString ("PROP_Node_View_Type"));	133	property.setDisplayName (Util.THIS.getString ("PROP_Node_View_Type"));




        <!-- use junit with already compiled extensions -->
	<pathelement location="src"/>
	<pathelement location="${xtest.extra.home}/lib/junit.jar"/>
	<pathelement location="${xtest.extra.home}/lib/xml-apis.jar"/>
	<pathelement location="${xtest.extra.home}/lib/xalan.jar"/>
	<pathelement location="${xtest.extra.home}/lib/junit-ext.jar"/>
      </classpath>

        <include name="org/netbeans/core/modules/"/>
    </jar>        
    <copy file="${xtest.extra.home}/lib/junit.jar" todir="lib"/>
    <copy file="${xtest.extra.home}/lib/xml-apis.jar" todir="lib"/>
    <copy file="${xtest.extra.home}/lib/xerces.jar" todir="lib"/>
    <copy file="${xtest.extra.home}/lib/xalan.jar" todir="lib"/>
    <copy file="${xtest.extra.home}/lib/xtest-ext.jar" todir="lib"/>

    <delete file="lib/xtest.jar"/>
    <delete file="lib/junit-ext.jar"/>
    <delete file="lib/junit.jar"/>
    <delete file="lib/xml-apis.jar"/>
    <delete file="lib/xerces.jar"/>
    <delete file="lib/xalan.jar"/>
    <delete file="lib/xtest-ext.jar"/>

Lines 27-32 Link Here

(-)xtest/dist_build.xml (+1 lines)
27	<available file="lib/xtest.jar"/>	27	<available file="lib/xtest.jar"/>
28	<available file="lib/junit-ext.jar"/>	28	<available file="lib/junit-ext.jar"/>
29	<available file="lib/junit.jar"/>	29	<available file="lib/junit.jar"/>
		30	<available file="lib/xml-apis.jar"/>
30	<available file="lib/xerces.jar"/>	31	<available file="lib/xerces.jar"/>
31	<available file="lib/xalan.jar"/>	32	<available file="lib/xalan.jar"/>
32	<available file="lib/xtest-ext.jar"/>	33	<available file="lib/xtest-ext.jar"/>

Return to bug 23055

Lines 27-33 Link Here

(-)autoupdate/build.xml (-3 / +3 lines)
27	<target name="compile">	27	<target name="compile">
28	<javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	28	<javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
29	<classpath>	29	<classpath>
30	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	30	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
31	</classpath>	31	</classpath>
32	</javac>	32	</javac>
33	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	33	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Lines 38-44 Link Here
38	<fileset dir="../openide/netbeans/lib">	38	<fileset dir="../openide/netbeans/lib">
39	<include name="openide*.jar" />	39	<include name="openide*.jar" />
40	</fileset>	40	</fileset>
41	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	41	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
42	</classpath>	42	</classpath>
43	</javac>	43	</javac>
44	<!-- Now just this class can refer to core: -->	44	<!-- Now just this class can refer to core: -->
Lines 49-55 Link Here
49	<fileset dir="../openide/netbeans/lib">	49	<fileset dir="../openide/netbeans/lib">
50	<include name="openide*.jar" />	50	<include name="openide*.jar" />
51	</fileset>	51	</fileset>
52	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	52	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
53	<pathelement location="../core/netbeans/lib/core.jar"/>	53	<pathelement location="../core/netbeans/lib/core.jar"/>
54	</classpath>	54	</classpath>
55	</javac>	55	</javac>

Lines 16-22 Link Here

(-)core/build.xml (-3 / +3 lines)
16		16
17	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>	17	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
18	<property name="binroot" location="../../nbextra"/>	18	<property name="binroot" location="../../nbextra"/>
19	<property name="xmlparser" value="xerces.jar"/>	19	<property name="xml-apis" value="xml-apis.jar"/>
20		20
21	<target name="compile">	21	<target name="compile">
22	<javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	22	<javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Lines 27-33 Link Here
27	</fileset>	27	</fileset>
28	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	28	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
29	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	29	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
30	<pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>	30	<pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
31	</classpath>	31	</classpath>
32	</javac>	32	</javac>
33	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	33	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Lines 38-44 Link Here
38	</fileset>	38	</fileset>
39	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	39	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
40	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	40	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
41	<pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>	41	<pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
42	<pathelement location="libsrc"/>	42	<pathelement location="libsrc"/>
43	</classpath>	43	</classpath>
44	</javac>	44	</javac>

Lines 23-29 Link Here

(-)core/compiler/build.xml (-2 / +2 lines)
23	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>	23	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../../nbbuild/nbantext.jar"/>
24	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>	24	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../../nbbuild/nbantext.jar"/>
25	<property name="binroot" location="../../../nbextra"/>	25	<property name="binroot" location="../../../nbextra"/>
26	<property name="xmlparser" value="xerces.jar"/>	26	<property name="xml-apis" value="xml-apis.jar"/>
27		27
28	<target name="compile">	28	<target name="compile">
29	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	29	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Lines 33-39 Link Here
33	<include name="openide*.jar" />	33	<include name="openide*.jar" />
34	</fileset>	34	</fileset>
35	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	35	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
36	<pathelement location="${binroot}/core/release/lib/ext/${xmlparser}"/>	36	<pathelement location="${binroot}/core/release/lib/ext/${xml-apis}"/>
37	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>	37	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
38	<pathelement location="../src"/>	38	<pathelement location="../src"/>
39	</classpath>	39	</classpath>

Lines 35-41 Link Here

(-)i18n/build.xml (-2 / +2 lines)
35	<pathelement location="../core/netbeans/lib/core.jar"/>	35	<pathelement location="../core/netbeans/lib/core.jar"/>
36	<pathelement location="../properties/netbeans/modules/properties.jar"/>	36	<pathelement location="../properties/netbeans/modules/properties.jar"/>
37	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	37	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
38	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	38	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
39	</classpath>	39	</classpath>
40	</javac>	40	</javac>
41	<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 48-54 Link Here
48	<pathelement location="../properties/netbeans/modules/properties.jar"/>	48	<pathelement location="../properties/netbeans/modules/properties.jar"/>
49	<pathelement location="../form/netbeans/modules/form.jar"/>	49	<pathelement location="../form/netbeans/modules/form.jar"/>
50	<pathelement location="../java/netbeans/modules/java.jar"/>	50	<pathelement location="../java/netbeans/modules/java.jar"/>
51	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	51	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
52	</classpath>	52	</classpath>
53	</javac>	53	</javac>
54		54

Lines 26-32 Link Here

(-)lexer/libsrc/org/netbeans/modules/lexer/javacc/javaccLangBuild.xml (-3 / +3 lines)
26		26
27	<property name="binroot" location="${lexer.module.root}/../../nbextra"/>	27	<property name="binroot" location="${lexer.module.root}/../../nbextra"/>
28	<property name="javacchome" location="${binroot}/lexer/compiletime"/>	28	<property name="javacchome" location="${binroot}/lexer/compiletime"/>
29	<property name="xmlparser" location="${binroot}/core/release/lib/ext/xerces.jar"/>	29	<property name="xml-apis" location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
30	<property name="build.compiler.debug" value="on"/>	30	<property name="build.compiler.debug" value="on"/>
31		31
32	<property name="lexer.name" value="${g.name}Lexer"/>	32	<property name="lexer.name" value="${g.name}Lexer"/>
Lines 119-125 Link Here
119	<arg value="${lexer.class}"/>	119	<arg value="${lexer.class}"/>
120	<arg value="${constants.class}"/>	120	<arg value="${constants.class}"/>
121	<classpath>	121	<classpath>
122	<pathelement location="${xmlparser}"/>	122	<pathelement location="${xml-apis}"/>
123	<pathelement location="${lexer.module.root}/libsrc"/>	123	<pathelement location="${lexer.module.root}/libsrc"/>
124	<pathelement location="${g.root}"/>	124	<pathelement location="${g.root}"/>
125	</classpath>	125	</classpath>
Lines 136-142 Link Here
136	deprecation="${build.compiler.deprecation}"	136	deprecation="${build.compiler.deprecation}"
137	debug="${build.compiler.debug}">	137	debug="${build.compiler.debug}">
138	<classpath>	138	<classpath>
139	<pathelement location="${xmlparser}"/>	139	<pathelement location="${xml-apis}"/>
140	<pathelement location="${lexer.module.root}/libsrc"/>	140	<pathelement location="${lexer.module.root}/libsrc"/>
141	<pathelement location="${g.root}"/>	141	<pathelement location="${g.root}"/>
142	</classpath>	142	</classpath>

Lines 130-136 Link Here

(-)monitor/build.xml (-2 / +2 lines)
130	<pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>	130	<pathelement location="${nb_root}/openide/netbeans/lib/openide.jar"/>
131	<pathelement location="${nb_root}/httpserver/netbeans/modules/httpserver.jar"/>	131	<pathelement location="${nb_root}/httpserver/netbeans/modules/httpserver.jar"/>
132	<pathelement location="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar"/>	132	<pathelement location="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar"/>
133	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	133	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
134	<pathelement location="${servlet22}"/>	134	<pathelement location="${servlet22}"/>
135	</classpath>	135	</classpath>
136	</javac>	136	</javac>
Lines 144-150 Link Here
144	excludes="/SCCS/, /CVS/">	144	excludes="/SCCS/, /CVS/">
145		145
146	<classpath>	146	<classpath>
147	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	147	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
148	<pathelement location="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar"/>	148	<pathelement location="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar"/>
149	<pathelement location="${servlet23}"/>	149	<pathelement location="${servlet23}"/>
150	</classpath>	150	</classpath>

Lines 42-47 Link Here

(-)nbbuild/build.xml (+2 lines)
42	<pathelement location="${binroot}/core/release/lib/ext/sax.jar"/>	42	<pathelement location="${binroot}/core/release/lib/ext/sax.jar"/>
43	<pathelement location="${binroot}/core/release/lib/ext/dom.jar"/>	43	<pathelement location="${binroot}/core/release/lib/ext/dom.jar"/>
44	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	44	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
		45	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
45	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/> <!-- XML serializer -->	46	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/> <!-- XML serializer -->
46	<pathelement location="${binroot}/nbbuild/lib/jhall.jar"/>	47	<pathelement location="${binroot}/nbbuild/lib/jhall.jar"/>
47	<pathelement location="${binroot}/xml/catalog/release/modules/ext/resolver-1_1_nb.jar"/>	48	<pathelement location="${binroot}/xml/catalog/release/modules/ext/resolver-1_1_nb.jar"/>
Lines 1103-1108 Link Here
1103	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	1104	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
1104	<!-- For running inside IDE, to pick up ant.jar -->	1105	<!-- For running inside IDE, to pick up ant.jar -->
1105	<pathelement location="${binroot}/nbbuild/lib/ant.jar"/>	1106	<pathelement location="${binroot}/nbbuild/lib/ant.jar"/>
		1107	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
1106	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	1108	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
1107	<pathelement location="${binroot}/nbbuild/lib/jhall.jar"/>	1109	<pathelement location="${binroot}/nbbuild/lib/jhall.jar"/>
1108	</classpath>	1110	</classpath>

Lines 45-51 Link Here

(-)openide/build.xml (-7 / +8 lines)
45	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	45	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
46	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	46	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
47	<!-- <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/> -->	47	<!-- <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/> -->
48	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	48	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
49	</classpath>	49	</classpath>
50	</javac>	50	</javac>
51	<!-- Hack. Deprecated class. -->	51	<!-- Hack. Deprecated class. -->
Lines 75-81 Link Here
75	<classpath>	75	<classpath>
76	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	76	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
77	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	77	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
78	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	78	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
79	</classpath>	79	</classpath>
80	-->	80	-->
81	</javac>	81	</javac>
Lines 96-102 Link Here
96	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	96	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
97	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	97	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
98	<!-- <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/> -->	98	<!-- <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/> -->
99	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	99	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
100	</classpath>	100	</classpath>
101	</javac>	101	</javac>
102	<postprocess file="compatkit-work/org/openide/util/actions/SystemAction.class"	102	<postprocess file="compatkit-work/org/openide/util/actions/SystemAction.class"
Lines 510-516 Link Here
510	<pathelement location="src"/>	510	<pathelement location="src"/>
511	</sourcepath>	511	</sourcepath>
512	<classpath>	512	<classpath>
513	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	513	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
514	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	514	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
515	</classpath>	515	</classpath>
516	<link href="${jdk-docs-location}"	516	<link href="${jdk-docs-location}"
Lines 818-835 Link Here
818	<delete dir="examplemodulereload"/>	818	<delete dir="examplemodulereload"/>
819	</target>	819	</target>
820		820
821	<target name="standalone-fs" depends="standalone-fs-prepare" description="Creates zip file suitable for download. Zip file contains all jars necessary + xerces.jar for using standalone filesystems.">	821	<target name="standalone-fs" depends="standalone-fs-prepare" description="Creates zip file suitable for download. Zip file contains all jars necessary + xml-apis.jar and xerces.jarjar for using standalone filesystems.">
822	<zip compress="true" zipfile="standalone/nbfilesystems.zip">	822	<zip compress="true" zipfile="standalone/nbfilesystems.zip">
823	<fileset dir="standalone">	823	<fileset dir="standalone">
824	<include name="openide-fs.jar"/>	824	<include name="openide-fs.jar"/>
825	<include name="openide-util.jar"/>	825	<include name="openide-util.jar"/>
826	<include name="README-FS.txt"/>	826	<include name="README-FS.txt"/>
827	</fileset>	827	</fileset>
828	<fileset dir="${binroot}/core/release/lib/ext" includes="xerces.jar"/>	828	<fileset dir="${binroot}/core/release/lib/ext" includes="xml-apis.jar"/>
		829	<fileset dir="${binroot}/core/release/lib/ext" includes="xerces.jar"/>
829	</zip>	830	</zip>
830	</target>	831	</target>
831		832
832	<target name="standalone-fs-light" depends="standalone-fs-prepare" description="Creates zip file suitable for download. Zip file contains all jars necessary for using standalone filesystems. Without xerces.jar.">	833	<target name="standalone-fs-light" depends="standalone-fs-prepare" description="Creates zip file suitable for download. Zip file contains all jars necessary for using standalone filesystems. Without xml-apis.jar and xerces.jar.">
833	<zip compress="true" zipfile="standalone/nbfilesystems-light.zip">	834	<zip compress="true" zipfile="standalone/nbfilesystems-light.zip">
834	<fileset dir="standalone">	835	<fileset dir="standalone">
835	<include name="openide-fs.jar"/>	836	<include name="openide-fs.jar"/>

Lines 46-52 Link Here

(-)tomcatint/tomcat40/build.xml (-3 / +3 lines)
46	<java classname="org.netbeans.modules.schema2beans.GenBeans" fork="yes">	46	<java classname="org.netbeans.modules.schema2beans.GenBeans" fork="yes">
47	<classpath>	47	<classpath>
48	<pathelement path="${binroot}/core/release/lib/ext/crimson.jar" />	48	<pathelement path="${binroot}/core/release/lib/ext/crimson.jar" />
49	<pathelement path="${binroot}/core/release/lib/ext/xerces.jar" />	49	<pathelement path="${binroot}/core/release/lib/ext/xml-apis.jar" />
50	<pathelement path="${nb_root}/logger/netbeans/lib/ext/logger.jar" />	50	<pathelement path="${nb_root}/logger/netbeans/lib/ext/logger.jar" />
51	<pathelement path="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar" />	51	<pathelement path="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar" />
52	<fileset dir = "${nb_root}/openide">	52	<fileset dir = "${nb_root}/openide">
Lines 75-81 Link Here
75	<pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>	75	<pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>
76	<pathelement location="${nb_root}/web/core/netbeans/modules/jsp.jar"/>	76	<pathelement location="${nb_root}/web/core/netbeans/modules/jsp.jar"/>
77	<pathelement location="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar"/>	77	<pathelement location="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar"/>
78	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	78	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
79	<fileset dir="${nb_root}/openide/netbeans/lib">	79	<fileset dir="${nb_root}/openide/netbeans/lib">
80	<include name="openide*.jar" />	80	<include name="openide*.jar" />
81	</fileset>	81	</fileset>
Lines 88-94 Link Here
88	<pathelement location="${binroot}/web/servletapi23/release/modules/ext/servlet-2.3.jar"/>	88	<pathelement location="${binroot}/web/servletapi23/release/modules/ext/servlet-2.3.jar"/>
89	<pathelement location="${binroot}/web/jspparser/release/modules/ext/jasper-compiler.jar"/>	89	<pathelement location="${binroot}/web/jspparser/release/modules/ext/jasper-compiler.jar"/>
90	<pathelement location="${binroot}/web/jspparser/release/modules/ext/jasper-runtime.jar"/>	90	<pathelement location="${binroot}/web/jspparser/release/modules/ext/jasper-runtime.jar"/>
91	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	91	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
92	</classpath>	92	</classpath>
93	</javac>	93	</javac>
94	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	94	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">

Lines 61-67 Link Here

(-)web/core/build.xml (-2 / +2 lines)
61	<java classname="org.netbeans.modules.schema2beans.GenBeans" fork="yes">	61	<java classname="org.netbeans.modules.schema2beans.GenBeans" fork="yes">
62	<classpath>	62	<classpath>
63	<pathelement path="${binroot}/core/release/lib/ext/crimson.jar" />	63	<pathelement path="${binroot}/core/release/lib/ext/crimson.jar" />
64	<pathelement path="${binroot}/core/release/lib/ext/xerces.jar" />	64	<pathelement path="${binroot}/core/release/lib/ext/xml-apis.jar" />
65	<pathelement path="${nb_root}/logger/netbeans/lib/ext/logger.jar" />	65	<pathelement path="${nb_root}/logger/netbeans/lib/ext/logger.jar" />
66	<pathelement path="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar" />	66	<pathelement path="${nb_root}/schema2beans/netbeans/modules/schema2beans.jar" />
67	<fileset dir = "${nb_root}/openide">	67	<fileset dir = "${nb_root}/openide">
Lines 80-86 Link Here
80	<classpath>	80	<classpath>
81	<pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>	81	<pathelement location="${nb_root}/openide/openide-13javac-workaround.jar"/>
82	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	82	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
83	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	83	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
84	<pathelement location="${nb_root}/openidex/netbeans/modules/autoload/openidex.jar"/>	84	<pathelement location="${nb_root}/openidex/netbeans/modules/autoload/openidex.jar"/>
85	<pathelement location="${nb_root}/html/netbeans/modules/html.jar"/>	85	<pathelement location="${nb_root}/html/netbeans/modules/html.jar"/>
86	<pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>	86	<pathelement location="${nb_root}/java/netbeans/modules/java.jar"/>

Lines 14-19 Link Here

(-)xml/spec-vers.properties (-8 / +12 lines)
14	# Must always be numeric (numbers separated by '.', e.g. 1.11.3).	14	# Must always be numeric (numbers separated by '.', e.g. 1.11.3).
15	# See http://openide.netbeans.org/versioning-policy.html for more.	15	# See http://openide.netbeans.org/versioning-policy.html for more.
16		16
		17
		18	## libs
		19
		20	# JAXP
		21	libs.jaxp.specification.version=1.1
		22	libs.jaxp.implementation.version=1.1.2
		23
		24	# Apache Xalan
		25	libs.xalan.specification.version=${libs.jaxp.specification.version}
		26	libs.xalan.implementation.version=2.3.1
		27
		28
17	# common module spec.version	29	# common module spec.version
18	xml.common=0.6	30	xml.common=0.6
19		31
Lines 28-41 Link Here
28		40
29	# XML Core	41	# XML Core
30	xml.core.specification.version=${xml.common}	42	xml.core.specification.version=${xml.common}
31
32	# JAXP
33	xml.jaxp.specification.version=1.1
34	xml.jaxp.implementation.version=1.1.2
35
36	# Apache Xalan
37	xml.xalan.specification.version=${xml.jaxp.specification.version}
38	xml.xalan.implementation.version=2.3.1
39		43
40	# CSS Support	44	# CSS Support
41	xml.css.specification.version=${xml.common}	45	xml.css.specification.version=${xml.common}

Lines 20-26 Link Here

(-)xml/api/build.xml (-6 / +3 lines)
20	<property name="binroot" location="${nbroot}/../nbextra"/>	20	<property name="binroot" location="${nbroot}/../nbextra"/>
21	<property name="nbext_root" location="${nbroot}/nbbuild"/>	21	<property name="nbext_root" location="${nbroot}/nbbuild"/>
22		22
23	<property name="parserimpl" location="${binroot}/core/release/lib/ext/xerces.jar" />	23	<property name="xml-apis" location="${binroot}/core/release/lib/ext/xml-apis.jar" />
24		24
25	<property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>	25	<property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
26	<property name="homepage.base" value="xml.netbeans.org"/>	26	<property name="homepage.base" value="xml.netbeans.org"/>
Lines 28-34 Link Here
28	<property name="storepass" value="?"/>	28	<property name="storepass" value="?"/>
29	<property name="nbm_alias" value="nb_ide"/>	29	<property name="nbm_alias" value="nb_ide"/>
30	<property name="release" value="dev"/>	30	<property name="release" value="dev"/>
31	<property name="jaxp-transform" value="${binroot}/xml/libs/xalan/release/modules/autoload/ext/jaxp-transform-1.1.2.jar"/>
32	<taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>	31	<taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext_root}/nbantext.jar"/>
33	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>	32	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext_root}/nbantext.jar"/>
34	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>	33	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext_root}/nbantext.jar"/>
Lines 55-62 Link Here
55	<fileset dir="${nbroot}/openide/netbeans/lib">	54	<fileset dir="${nbroot}/openide/netbeans/lib">
56	<include name="openide*.jar"/>	55	<include name="openide*.jar"/>
57	</fileset>	56	</fileset>
58	<pathelement location="${parserimpl}"/> <!-- JAXP and SAX dependency -->	57	<pathelement location="${xml-apis}"/> <!-- JAXP and SAX dependency -->
59	<pathelement location="${jaxp-transform}"/>
60	</classpath>	58	</classpath>
61	</javac>	59	</javac>
62	</target>	60	</target>
Lines 142-149 Link Here
142	<fileset dir="${nbroot}/openide/netbeans/lib">	140	<fileset dir="${nbroot}/openide/netbeans/lib">
143	<include name="openide*.jar"/>	141	<include name="openide*.jar"/>
144	</fileset>	142	</fileset>
145	<pathelement location="${parserimpl}"/> <!-- JAXP and SAX dependency -->	143	<pathelement location="${xml-apis}"/> <!-- JAXP and SAX dependency -->
146	<pathelement location="${jaxp-transform}"/>
147	</classpath>	144	</classpath>
148		145
149	<link href="${jdk-docs-location}"	146	<link href="${jdk-docs-location}"

Lines 12-28 Link Here

(-)xml/libs/jaxp/build.xml (-12 / +12 lines)
12	Microsystems, Inc. All Rights Reserved.	12	Microsystems, Inc. All Rights Reserved.
13	-->	13	-->
14		14
15	<project name="xml/libs/jaxp" default="netbeans" basedir=".">	15	<project name="libs/jaxp" default="netbeans" basedir=".">
16		16
17	<property name="xml_root" location="../.."/>	17	<property name="libs_root" location="../.."/>
18		18
19	<property name="nbroot" location="${xml_root}/.."/>	19	<property name="nbroot" location="${libs_root}/.."/>
20	<property name="binroot" location="${nbroot}/../nbextra"/>	20	<property name="binroot" location="${nbroot}/../nbextra"/>
21	<property name="nbext_root" location="${nbroot}/nbbuild"/>	21	<property name="nbext_root" location="${nbroot}/nbbuild"/>
22		22
23	<property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>	23	<property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
24	<property name="homepage.base" value="xml.netbeans.org"/>	24	<property name="homepage.base" value="libs.netbeans.org"/>
25	<property name="dist.base" value="http://www.netbeans.org/download/nbms/40/xml"/>	25	<property name="dist.base" value="http://www.netbeans.org/download/nbms/"/>
26	<property name="storepass" value="?"/>	26	<property name="storepass" value="?"/>
27	<property name="nbm_alias" value="nb_ide"/>	27	<property name="nbm_alias" value="nb_ide"/>
28	<property name="release" value="dev"/>	28	<property name="release" value="dev"/>
Lines 39-47 Link Here
39	<property name="buildnumber" value="${DSTAMP}${TSTAMP}"/>	39	<property name="buildnumber" value="${DSTAMP}${TSTAMP}"/>
40	<echo message="buildnumber = ${buildnumber}"/>	40	<echo message="buildnumber = ${buildnumber}"/>
41		41
42	<property file="${xml_root}/spec-vers.properties"/>	42	<property file="${libs_root}/spec-vers.properties"/>
43	<filter token="JAXP_SPEC_VERS_SUBST" value="${xml.jaxp.specification.version}"/>	43	<filter token="JAXP_SPEC_VERS_SUBST" value="${libs.jaxp.specification.version}"/>
44	<filter token="JAXP_IMPL_VERS_SUBST" value="${xml.jaxp.implementation.version}"/>	44	<filter token="JAXP_IMPL_VERS_SUBST" value="${libs.jaxp.implementation.version}"/>
45	<filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>	45	<filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
46	</target>	46	</target>
47		47
Lines 67-73 Link Here
67	</target>	67	</target>
68		68
69	<target name="netbeans" depends="jars,release">	69	<target name="netbeans" depends="jars,release">
70	<copy todir="${xml_root}/netbeans">	70	<copy todir="${libs_root}/netbeans">
71	<fileset dir="netbeans"/>	71	<fileset dir="netbeans"/>
72	</copy>	72	</copy>
73	<genlist targetname="nbm" outputfiledir="${nbext_root}/netbeans"/>	73	<genlist targetname="nbm" outputfiledir="${nbext_root}/netbeans"/>
Lines 75-84 Link Here
75		75
76	<target name="nbm" depends="netbeans">	76	<target name="nbm" depends="netbeans">
77	<delete dir="Info"/>	77	<delete dir="Info"/>
78	<makenbm file="${xml_root}/jaxp-${release}.nbm"	78	<makenbm file="${libs_root}/jaxp-${release}.nbm"
79	topdir="."	79	topdir="."
80	module="netbeans/modules/autoload/jaxp.jar"	80	module="netbeans/modules/autoload/jaxp.jar"
81	homepage="http://${homepage.base}/libs/jaxp/"	81	homepage="http://${homepage.base}/jaxp/"
82	distribution="${dist.base}/jaxp-${release}.nbm">	82	distribution="${dist.base}/jaxp-${release}.nbm">
83	<license file="${license.file}"/>	83	<license file="${license.file}"/>
84	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>	84	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
Lines 92-98 Link Here
92	</fileset>	92	</fileset>
93	</delete>	93	</delete>
94	<delete file="manifest-subst.mf"/>	94	<delete file="manifest-subst.mf"/>
95	<delete file="${xml_root}/jaxp-${release}.nbm"/>	95	<delete file="${libs_root}/jaxp-${release}.nbm"/>
96	<delete dir="netbeans"/>	96	<delete dir="netbeans"/>
97	<delete dir="Info"/>	97	<delete dir="Info"/>
98	</target>	98	</target>

Lines 12-28 Link Here

(-)xml/libs/xalan/build.xml (-13 / +13 lines)
12	Microsystems, Inc. All Rights Reserved.	12	Microsystems, Inc. All Rights Reserved.
13	-->	13	-->
14		14
15	<project name="xml/libs/xalan" default="netbeans" basedir=".">	15	<project name="libs/xalan" default="netbeans" basedir=".">
16		16
17	<property name="xml_root" location="../.."/>	17	<property name="libs_root" location="../.."/>
18		18
19	<property name="nbroot" location="${xml_root}/.."/>	19	<property name="nbroot" location="${libs_root}/.."/>
20	<property name="binroot" location="${nbroot}/../nbextra"/>	20	<property name="binroot" location="${nbroot}/../nbextra"/>
21	<property name="nbext_root" location="${nbroot}/nbbuild"/>	21	<property name="nbext_root" location="${nbroot}/nbbuild"/>
22		22
23	<property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>	23	<property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
24	<property name="homepage.base" value="xml.netbeans.org"/>	24	<property name="homepage.base" value="libs.netbeans.org"/>
25	<property name="dist.base" value="http://www.netbeans.org/download/nbms/40/xml"/>	25	<property name="dist.base" value="http://www.netbeans.org/download/nbms/"/>
26	<property name="storepass" value="?"/>	26	<property name="storepass" value="?"/>
27	<property name="nbm_alias" value="nb_ide"/>	27	<property name="nbm_alias" value="nb_ide"/>
28	<property name="release" value="dev"/>	28	<property name="release" value="dev"/>
Lines 39-47 Link Here
39	<property name="buildnumber" value="${DSTAMP}${TSTAMP}"/>	39	<property name="buildnumber" value="${DSTAMP}${TSTAMP}"/>
40	<echo message="buildnumber = ${buildnumber}"/>	40	<echo message="buildnumber = ${buildnumber}"/>
41		41
42	<property file="${xml_root}/spec-vers.properties"/>	42	<property file="${libs_root}/spec-vers.properties"/>
43	<filter token="XALAN_SPEC_VERS_SUBST" value="${xml.xalan.specification.version}"/>	43	<filter token="XALAN_SPEC_VERS_SUBST" value="${libs.xalan.specification.version}"/>
44	<filter token="XALAN_IMPL_VERS_SUBST" value="${xml.xalan.implementation.version}"/>	44	<filter token="XALAN_IMPL_VERS_SUBST" value="${libs.xalan.implementation.version}"/>
45	<filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>	45	<filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
46	</target>	46	</target>
47		47
Lines 65-76 Link Here
65		65
66	<target name="release">	66	<target name="release">
67	<copy todir="netbeans">	67	<copy todir="netbeans">
68	<fileset dir="${binroot}/xml/libs/xalan/release"/>	68	<fileset dir="${binroot}/libs/xalan/release"/>
69	</copy>	69	</copy>
70	</target>	70	</target>
71		71
72	<target name="netbeans" depends="jars,release">	72	<target name="netbeans" depends="jars,release">
73	<copy todir="${xml_root}/netbeans">	73	<copy todir="${libs_root}/netbeans">
74	<fileset dir="netbeans"/>	74	<fileset dir="netbeans"/>
75	</copy>	75	</copy>
76	<genlist targetname="nbm" outputfiledir="${nbext_root}/netbeans"/>	76	<genlist targetname="nbm" outputfiledir="${nbext_root}/netbeans"/>
Lines 78-87 Link Here
78		78
79	<target name="nbm" depends="netbeans">	79	<target name="nbm" depends="netbeans">
80	<delete dir="Info"/>	80	<delete dir="Info"/>
81	<makenbm file="${xml_root}/xalan-${release}.nbm"	81	<makenbm file="${libs_root}/xalan-${release}.nbm"
82	topdir="."	82	topdir="."
83	module="netbeans/modules/autoload/xalan.jar"	83	module="netbeans/modules/autoload/xalan.jar"
84	homepage="http://${homepage.base}/libs/xalan/"	84	homepage="http://${homepage.base}/xalan/"
85	distribution="${dist.base}/xalan-${release}.nbm">	85	distribution="${dist.base}/xalan-${release}.nbm">
86	<license file="${license.file}"/>	86	<license file="${license.file}"/>
87	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>	87	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
Lines 95-101 Link Here
95	</fileset>	95	</fileset>
96	</delete>	96	</delete>
97	<delete file="manifest-subst.mf"/>	97	<delete file="manifest-subst.mf"/>
98	<delete file="${xml_root}/xalan-${release}.nbm"/>	98	<delete file="${libs_root}/xalan-${release}.nbm"/>
99	<delete dir="netbeans"/>	99	<delete dir="netbeans"/>
100	<delete dir="Info"/>	100	<delete dir="Info"/>
101	</target>	101	</target>

Lines 24-31 Link Here

(-)xml/tools/build.xml (-7 / +2 lines)
24	<property name="binroot" location="${nbroot}/../nbextra"/>	24	<property name="binroot" location="${nbroot}/../nbextra"/>
25	<property name="nbext_root" location="${nbroot}/nbbuild"/>	25	<property name="nbext_root" location="${nbroot}/nbbuild"/>
26		26
27	<property name="parserimpl" value="${binroot}/xml/tax/release/modules/ext/xerces2.jar"/> <!-- parser implementation used internally by module -->	27	<property name="xml-apis" location="${binroot}/core/release/lib/ext/xml-apis.jar" />
28	<property name="jaxp-transform" value="${binroot}/xml/libs/xalan/release/modules/autoload/ext/jaxp-transform-1.1.2.jar"/>
29		28
30	<property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>	29	<property name="license.file" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
31	<property name="homepage.base" value="xml.netbeans.org"/>	30	<property name="homepage.base" value="xml.netbeans.org"/>
Lines 52-58 Link Here
52	<filter token="API_SPEC_VERS_SUBST" value="${xml.api.specification.version}"/>	51	<filter token="API_SPEC_VERS_SUBST" value="${xml.api.specification.version}"/>
53	<filter token="TOOLS_SPEC_VERS_SUBST" value="${xml.tools.specification.version}"/>	52	<filter token="TOOLS_SPEC_VERS_SUBST" value="${xml.tools.specification.version}"/>
54	<filter token="CORE_SPEC_VERS_SUBST" value="${xml.core.specification.version}"/>	53	<filter token="CORE_SPEC_VERS_SUBST" value="${xml.core.specification.version}"/>
55	<filter token="JAXP_SPEC_VERS_SUBST" value="${xml.jaxp.specification.version}"/>
56	<filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>	54	<filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
57	</target>	55	</target>
58		56
Lines 67-81 Link Here
67	<fileset dir="${nbroot}/openide/netbeans/lib">	65	<fileset dir="${nbroot}/openide/netbeans/lib">
68	<include name="openide*.jar"/>	66	<include name="openide*.jar"/>
69	</fileset>	67	</fileset>
70	<pathelement location="${parserimpl}"/> <!-- JAXP and SAX dependency -->	68	<pathelement location="${xml-apis}"/> <!-- JAXP and SAX dependency -->
71	<pathelement location="${core_root}/src/"/>	69	<pathelement location="${core_root}/src/"/>
72	<pathelement location="${tax_lib_root}/src/"/>	70	<pathelement location="${tax_lib_root}/src/"/>
73	<pathelement location="${jaxp-transform}"/> <!-- JAXP/transform API -->
74	<pathelement location="${api_root}/src/"/>	71	<pathelement location="${api_root}/src/"/>
75	<!--Servlet API-->	72	<!--Servlet API-->
76	<pathelement location="${binroot}/httpserver/servletapi/release/modules/ext/servlet-2.2.jar" />	73	<pathelement location="${binroot}/httpserver/servletapi/release/modules/ext/servlet-2.2.jar" />
77	<!--TransformServlet: HttpServerSettings-->
78	<!-- <pathelement location="${nbroot}/httpserver/netbeans/modules/httpserver.jar" />-->
79	</classpath>	74	</classpath>
80	</javac>	75	</javac>
81	</target>	76	</target>

Lines 130-137 Link Here

(-)xml/tools/src/org/netbeans/modules/xml/tools/resources/mf-layer.xml (-2 / +17 lines)
130	<attr name="hint.originalPublicID" stringvalue="-//XML Module//DTD SAX Bindings 1.0//EN"/>	130	<attr name="hint.originalPublicID" stringvalue="-//XML Module//DTD SAX Bindings 1.0//EN"/>
131	</file>	131	</file>
132	</folder>	132	</folder>
133	</folder>	133	</folder> <!-- entities -->
134	</folder>	134	</folder> <!-- xml -->
		135
		136	<folder name="Mount">
		137	<folder name="java">
		138	<file name="org-netbeans-modules-xml-tools-resources-xml_apis.xml">
		139	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.tools.resources.Bundle" />
		140	<![CDATA[
		141	<!DOCTYPE Library PUBLIC "-//NetBeans IDE//DTD JavaLibrary//EN" "http://www.netbeans.org/dtds/JavaLibrary-1_0.dtd">
		142
		143	<Library>
		144	<Archive name="lib/ext/xml-apis.jar"/>
		145	</Library>
		146	]]>
		147	</file>
		148	</folder> <!-- java -->
		149	</folder> <!-- Mount -->
135		150
136	<folder name="Shortcuts">	151	<folder name="Shortcuts">
137	<file name="F6.instance">	152	<file name="F6.instance">

Lines 45-51 Link Here

(-)xtest/build.xml (-1 / +3 lines)
45	<!-- use junit with already compiled extensions -->	45	<!-- use junit with already compiled extensions -->
46	<pathelement location="src"/>	46	<pathelement location="src"/>
47	<pathelement location="${xtest.extra.home}/lib/junit.jar"/>	47	<pathelement location="${xtest.extra.home}/lib/junit.jar"/>
48	<pathelement location="${xtest.extra.home}/lib/xerces.jar"/>	48	<pathelement location="${xtest.extra.home}/lib/xml-apis.jar"/>
49	<pathelement location="${xtest.extra.home}/lib/xalan.jar"/>	49	<pathelement location="${xtest.extra.home}/lib/xalan.jar"/>
50	<pathelement location="${xtest.extra.home}/lib/junit-ext.jar"/>	50	<pathelement location="${xtest.extra.home}/lib/junit-ext.jar"/>
51	</classpath>	51	</classpath>
Lines 73-78 Link Here
73	<include name="org/netbeans/core/modules/"/>	73	<include name="org/netbeans/core/modules/"/>
74	</jar>	74	</jar>
75	<copy file="${xtest.extra.home}/lib/junit.jar" todir="lib"/>	75	<copy file="${xtest.extra.home}/lib/junit.jar" todir="lib"/>
		76	<copy file="${xtest.extra.home}/lib/xml-apis.jar" todir="lib"/>
76	<copy file="${xtest.extra.home}/lib/xerces.jar" todir="lib"/>	77	<copy file="${xtest.extra.home}/lib/xerces.jar" todir="lib"/>
77	<copy file="${xtest.extra.home}/lib/xalan.jar" todir="lib"/>	78	<copy file="${xtest.extra.home}/lib/xalan.jar" todir="lib"/>
78	<copy file="${xtest.extra.home}/lib/xtest-ext.jar" todir="lib"/>	79	<copy file="${xtest.extra.home}/lib/xtest-ext.jar" todir="lib"/>
Lines 105-110 Link Here
105	<delete file="lib/xtest.jar"/>	106	<delete file="lib/xtest.jar"/>
106	<delete file="lib/junit-ext.jar"/>	107	<delete file="lib/junit-ext.jar"/>
107	<delete file="lib/junit.jar"/>	108	<delete file="lib/junit.jar"/>
		109	<delete file="lib/xml-apis.jar"/>
108	<delete file="lib/xerces.jar"/>	110	<delete file="lib/xerces.jar"/>
109	<delete file="lib/xalan.jar"/>	111	<delete file="lib/xalan.jar"/>
110	<delete file="lib/xtest-ext.jar"/>	112	<delete file="lib/xtest-ext.jar"/>