1.1 --- a/build.xml	Fri Jun 19 13:14:51 2009 +0200
     1.2 +++ b/build.xml	Fri Jun 19 15:33:12 2009 +0200
     1.3 @@ -20,15 +20,33 @@
     1.4      <fail message="You need to provide location of JDK's generated sources via -Dgensrc=...">
     1.5          <condition><not><available file="${gensrc}"/></not></condition>
     1.6      </fail>
     1.7 +
     1.8 +    <target name="merge-sources"
     1.9 +        description="Copies sources from all over the JDK tree into one place"
    1.10 +    >
    1.11 +        <mkdir dir="build/sources"/>
    1.12 +        <copy todir="build/sources">
    1.13 +            <fileset dir="${gensrc}"/>
    1.14 +            <fileset dir="${gensrc}/../impsrc">
    1.15 +                <exclude name="org/relaxng/datatype/**"/>
    1.16 +            </fileset>
    1.17 +            <fileset dir="../jaxp/src/share/classes/">
    1.18 +                <exclude name="org/relaxng/datatype/**"/>
    1.19 +            </fileset>
    1.20 +            <fileset dir="../langtools/src/share/classes/">
    1.21 +                <exclude name="org/relaxng/datatype/**"/>
    1.22 +            </fileset>
    1.23 +            <fileset dir="../jaxws/src/share/classes/">
    1.24 +                <exclude name="org/relaxng/datatype/**"/>
    1.25 +            </fileset>
    1.26 +            <fileset dir="../corba/src/share/classes/"/>
    1.27 +        </copy>
    1.28 +    </target>
    1.29 +
    1.30      <path id="src.path">
    1.31          <pathelement location="src/share/classes"/>
    1.32 -        <pathelement location="${gensrc}"/>
    1.33 -        <pathelement location="${gensrc}/../impsrc"/>
    1.34 +        <pathelement location="build/sources"/>
    1.35          <pathelement location="src/solaris/classes"/>
    1.36 -        <pathelement location="../jaxp/src/share/classes/"/>
    1.37 -        <pathelement location="../langtools/src/share/classes/"/>
    1.38 -        <pathelement location="../jaxws/src/share/classes/"/>
    1.39 -        <pathelement location="../corba/src/share/classes/"/>
    1.40  <!--        <pathelement location="src/windows/classes"/> -->
    1.41      </path>
    1.42      <property name="build.dir" location="build/modularize"/>
    1.43 @@ -82,6 +100,10 @@
    1.44              <filename name="sun/dyn/**"/>
    1.45  
    1.46              <filename name="com/sun/script/javascript/**"/>
    1.47 +            <filename name="sun/dc/**"/>
    1.48 +            <filename name="sun/nio/fs/Solaris**"/>
    1.49 +            <filename name="sun/tracing/**"/>
    1.50 +            <filename name="com/sun/tracing/ProviderFactory*"/>
    1.51          </none>
    1.52      </selector>
    1.53