1.1 --- a/build.xml	Wed Jun 17 15:11:07 2009 +0200
     1.2 +++ b/build.xml	Thu Jun 18 17:48:58 2009 +0200
     1.3 @@ -8,11 +8,27 @@
     1.4          <antcall target="applet"/>
     1.5          <antcall target="deprecated7"/>
     1.6      </target>
     1.7 +
     1.8      <!-- basic parameters -->
     1.9 +    <pathconvert property="gensrc">
    1.10 +        <path><dirset dir="../build"><include name="*/gensrc"/></dirset></path>
    1.11 +    </pathconvert>
    1.12 +    <pathconvert property="javacompiler">
    1.13 +        <path><dirset dir="../build"><include name="*/langtools/build/classes"/></dirset></path>
    1.14 +    </pathconvert>
    1.15 +    <fail message="You need to provide location of JDK's generated sources via -Dgensrc=...">
    1.16 +        <condition><not><available file="${gensrc}"/></not></condition>
    1.17 +    </fail>
    1.18 +    <fail message="Javacompiler build is missing">
    1.19 +        <condition><not><available file="${javacompiler}"/></not></condition>
    1.20 +    </fail>
    1.21      <path id="src.path">
    1.22          <pathelement location="src/share/classes"/>
    1.23 +        <pathelement location="${gensrc}"/>
    1.24          <pathelement location="src/windows/classes"/>
    1.25 +        <!--
    1.26          <pathelement location="src/solaris/classes"/>
    1.27 +        -->
    1.28      </path>
    1.29      <property name="build.dir" location="build/modularize"/>
    1.30  
    1.31 @@ -47,19 +63,36 @@
    1.32          </or>
    1.33      </selector>
    1.34  
    1.35 -    <selector id="corba">
    1.36 -        <or>
    1.37 -            <filename name="org/omg/**"/>
    1.38 -            <filename name="com/sun/corba/**"/>
    1.39 -        </or>
    1.40 -    </selector>
    1.41 -    
    1.42      <selector id="base">
    1.43 -        <none>
    1.44 +        <!--
    1.45              <selector refid="applet"/>
    1.46              <selector refid="beans"/>
    1.47 -            <selector refid="corba"/>
    1.48 +            <selector refid="client"/>
    1.49 +            <selector refid="enterprise"/>
    1.50              <selector refid="deprecated7"/>
    1.51 +            -->
    1.52 +            <!-- exclude files that need pre-processing like
    1.53 +                java/nio/ByteBufferAs-X-Buffer.java
    1.54 +            -->
    1.55 +
    1.56 +        <none>
    1.57 +            <filename name="**/*-*"/>
    1.58 +            <filename name="java/dyn/**"/>
    1.59 +            <filename name="sun/dyn/**"/>
    1.60 +            <filename name="javax/management/remote/rmi/RMIConnector*"/>
    1.61 +            <filename name="sun/tracing/**"/>
    1.62 +            <filename name="com/sun/tracing/**"/>
    1.63 +            <filename name="com/sun/java/swing/plaf/gtk/**"/>
    1.64 +            
    1.65 +<!--            <filename name="javax/management/**"/> -->
    1.66 +<!--            <filename name="sun/nio/fs/**"/> -->
    1.67 +<!--            <filename name="com/sun/jmx/**"/> -->
    1.68 +
    1.69 +            <!-- exclude corba related stuff -->
    1.70 +            <filename name="com/sun/jndi/cosnaming/**"/>
    1.71 +            <filename name="com/sun/jndi/toolkit/corba/**"/>
    1.72 +
    1.73 +            <filename name="com/sun/script/javascript/**"/>
    1.74          </none>
    1.75      </selector>
    1.76  
    1.77 @@ -82,25 +115,12 @@
    1.78              <param name="module" value="beans"/>
    1.79          </antcall>
    1.80      </target>
    1.81 -    
    1.82  
    1.83 -    <!-- as I am currently unable to build JDK myself, I'll start
    1.84 -      the modularization by extracting the base module from an existing
    1.85 -      classes
    1.86 -    -->
    1.87 +
    1.88      <target name="base">
    1.89 -        <property name="rt.jar" location="${java.home}/lib/rt.jar"/>
    1.90 -        <fail message="Cannot find rt.jar, specify with -Drt.jar=...">
    1.91 -            <condition><not><available file="${rt.jar}"/></not></condition>
    1.92 -        </fail>
    1.93 -
    1.94 -        <mkdir dir="${build.dir}/rt"/>
    1.95 -        <unzip src="${rt.jar}" dest="${build.dir}/rt"/>
    1.96 -        <jar file="${build.dir}/base.jar" compress="false">
    1.97 -            <fileset dir="${build.dir}/rt">
    1.98 -                <selector refid="base"/>
    1.99 -            </fileset>
   1.100 -        </jar>
   1.101 +        <antcall target="-compile-one-module">
   1.102 +            <param name="module" value="base"/>
   1.103 +        </antcall>
   1.104      </target>
   1.105  
   1.106      <!-- shared routine to compile one of the modules -->
   1.107 @@ -114,10 +134,13 @@
   1.108              bootclasspath="${build.dir}/base.jar"
   1.109              sourcepath=""
   1.110              destdir="${build.dir}/classes/${module}"
   1.111 -            classpath="${module.cp}"
   1.112              includejavaruntime="false"
   1.113              includeantruntime="false"
   1.114          >
   1.115 +            <classpath>
   1.116 +                <path path="${module.cp}"/>
   1.117 +                <pathelement location="${javacompiler}"/>
   1.118 +            </classpath>
   1.119              <src refid="src.path"/>
   1.120              <selector refid="${module}"/>
   1.121          </javac>

     2.1 --- a/src/share/classes/sun/dc/DuctusRenderingEngine.java	Wed Jun 17 15:11:07 2009 +0200
     2.2 +++ b/src/share/classes/sun/dc/DuctusRenderingEngine.java	Thu Jun 18 17:48:58 2009 +0200
     2.3 @@ -84,7 +84,7 @@
     2.4                                      float dashphase)
     2.5      {
     2.6          FillAdapter filler = new FillAdapter();
     2.7 -        PathStroker stroker = new PathStroker(filler);
     2.8 +        PathStroker stroker = null;//TBD: temporary: new PathStroker(filler);
     2.9          PathDasher dasher = null;
    2.10  
    2.11          try {
    2.12 @@ -126,7 +126,7 @@
    2.13                           boolean antialias,
    2.14                           PathConsumer2D sr)
    2.15      {
    2.16 -        PathStroker stroker = new PathStroker(sr);
    2.17 +        PathStroker stroker = null; //TBD: temporary: new PathStroker(sr);
    2.18          PathConsumer consumer = stroker;
    2.19  
    2.20          float matrix[] = null;
    2.21 @@ -632,7 +632,7 @@
    2.22              System.err.println("DuctusRenderingEngine.getAATileGenerator: "+e);
    2.23          }
    2.24  
    2.25 -        return r;
    2.26 +        return null; //TBD: temporary: return r;
    2.27      }
    2.28  
    2.29      private void feedConsumer(PathConsumer consumer, PathIterator pi) {

     3.1 --- a/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java	Wed Jun 17 15:11:07 2009 +0200
     3.2 +++ b/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java	Thu Jun 18 17:48:58 2009 +0200
     3.3 @@ -76,7 +76,7 @@
     3.4      }
     3.5  
     3.6      public Selector wakeup() {
     3.7 -        pollWrapper.interrupt();
     3.8 +// TBD: temporary        pollWrapper.interrupt();
     3.9          return this;
    3.10      }
    3.11  
    3.12 @@ -117,10 +117,10 @@
    3.13          int numKeysUpdated = 0;
    3.14          // Skip zeroth entry; it is for interrupts only
    3.15          for (int i=channelOffset; i<totalChannels; i++) {
    3.16 -            int rOps = pollWrapper.getReventOps(i);
    3.17 +            int rOps = 0; //TBD: temporary: pollWrapper.getReventOps(i);
    3.18              if (rOps != 0) {
    3.19                  SelectionKeyImpl sk = channelArray[i];
    3.20 -                pollWrapper.putReventOps(i, 0);
    3.21 +                //TBD: temporary: pollWrapper.putReventOps(i, 0);
    3.22                  if (selectedKeys.contains(sk)) {
    3.23                      if (sk.channel.translateAndSetReadyOps(rOps, sk)) {
    3.24                          numKeysUpdated++;
    3.25 @@ -145,7 +145,7 @@
    3.26              // Check to see if the array is large enough
    3.27              if (channelArray.length == totalChannels) {
    3.28                  // Make a larger array
    3.29 -                int newSize = pollWrapper.totalChannels * 2;
    3.30 +                int newSize = 0; //TBD: temporary: pollWrapper.totalChannels * 2;
    3.31                  SelectionKeyImpl temp[] = new SelectionKeyImpl[newSize];
    3.32                  // Copy over
    3.33                  for (int i=channelOffset; i<totalChannels; i++)
    3.34 @@ -156,7 +156,7 @@
    3.35              }
    3.36              channelArray[totalChannels] = ski;
    3.37              ski.setIndex(totalChannels);
    3.38 -            pollWrapper.addEntry(ski.channel);
    3.39 +            //TBD: temporary: pollWrapper.addEntry(ski.channel);
    3.40              totalChannels++;
    3.41              keys.add(ski);
    3.42          }
    3.43 @@ -174,16 +174,16 @@
    3.44              SelectionKeyImpl endChannel = channelArray[totalChannels-1];
    3.45              channelArray[i] = endChannel;
    3.46              endChannel.setIndex(i);
    3.47 -            pollWrapper.release(i);
    3.48 -            PollArrayWrapper.replaceEntry(pollWrapper, totalChannels - 1,
    3.49 -                                          pollWrapper, i);
    3.50 +            //TBD: temporary: pollWrapper.release(i);
    3.51 +            //TBD: temporary: PollArrayWrapper.replaceEntry(pollWrapper, totalChannels - 1,
    3.52 +            //TBD: temporary:                               pollWrapper, i);
    3.53          } else {
    3.54 -            pollWrapper.release(i);
    3.55 +            //TBD: temporary: pollWrapper.release(i);
    3.56          }
    3.57          // Destroy the last one
    3.58          channelArray[totalChannels-1] = null;
    3.59          totalChannels--;
    3.60 -        pollWrapper.totalChannels--;
    3.61 +        //TBD: temporary: pollWrapper.totalChannels--;
    3.62          ski.setIndex(-1);
    3.63          // Remove the key from keys and selectedKeys
    3.64          keys.remove(ski);

     4.1 --- a/src/share/classes/sun/rmi/rmic/RMIGenerator.java	Wed Jun 17 15:11:07 2009 +0200
     4.2 +++ b/src/share/classes/sun/rmi/rmic/RMIGenerator.java	Thu Jun 18 17:48:58 2009 +0200
     4.3 @@ -46,7 +46,6 @@
     4.4  import sun.tools.java.ClassNotFound;
     4.5  import sun.tools.java.ClassFile;
     4.6  import sun.tools.java.MemberDefinition;
     4.7 -import com.sun.corba.se.impl.util.Utility;
     4.8  
     4.9  /**
    4.10   * A Generator object will generate the Java source code of the stub
    4.11 @@ -202,7 +201,7 @@
    4.12  
    4.13          if (outputName.endsWith("_Skel")) {
    4.14              String classNameStr = className.getName().toString();
    4.15 -            File temp = new File(packageDir, Utility.tieName(classNameStr) + ".class");
    4.16 +            File temp = new File(packageDir, ""/*TBD: calls to Corba: Utility.tieName(classNameStr) + ".class"*/);
    4.17              if (temp.exists()) {
    4.18  
    4.19                  // Found a tie. Is IIOP generation also being done?

     5.1 --- a/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java	Wed Jun 17 15:11:07 2009 +0200
     5.2 +++ b/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java	Thu Jun 18 17:48:58 2009 +0200
     5.3 @@ -382,9 +382,10 @@
     5.4                  if (reasonCode == null) {
     5.5                      reasonCode = CRLReason.UNSPECIFIED;
     5.6                  }
     5.7 -                Throwable t = new CertificateRevokedException
     5.8 -                    (entry.getRevocationDate(), reasonCode,
     5.9 -                     crl.getIssuerX500Principal(), entry.getExtensions());
    5.10 +                Throwable t = null;
    5.11 +                //TBD: temporary: new CertificateRevokedException
    5.12 +                //TBD: temporary:     (entry.getRevocationDate(), reasonCode,
    5.13 +                //TBD: temporary:      crl.getIssuerX500Principal(), entry.getExtensions());
    5.14                  throw new CertPathValidatorException(t.getMessage(), t,
    5.15                      null, -1, BasicReason.REVOKED);
    5.16              }

     6.1 --- a/src/share/classes/sun/security/provider/certpath/OCSPChecker.java	Wed Jun 17 15:11:07 2009 +0200
     6.2 +++ b/src/share/classes/sun/security/provider/certpath/OCSPChecker.java	Thu Jun 18 17:48:58 2009 +0200
     6.3 @@ -382,11 +382,12 @@
     6.4              }
     6.5  
     6.6              if (certOCSPStatus == OCSPResponse.CERT_STATUS_REVOKED) {
     6.7 -                Throwable t = new CertificateRevokedException(
     6.8 -                        ocspResponse.getRevocationTime(),
     6.9 -                        ocspResponse.getRevocationReason(),
    6.10 -                        responderCert.getSubjectX500Principal(),
    6.11 -                        ocspResponse.getSingleExtensions());
    6.12 +                Throwable t = null;
    6.13 +//TBD: temporary:                 new CertificateRevokedException(
    6.14 +//TBD: temporary:                         ocspResponse.getRevocationTime(),
    6.15 +//TBD: temporary:                         ocspResponse.getRevocationReason(),
    6.16 +//TBD: temporary:                         responderCert.getSubjectX500Principal(),
    6.17 +//TBD: temporary:                         ocspResponse.getSingleExtensions());
    6.18                  throw new CertPathValidatorException(t.getMessage(), t,
    6.19                          null, -1, BasicReason.REVOKED);
    6.20