Project

Profile

Help

Revision 34aee363

Added by Michael Kay about 11 years ago

Changes to build file and Version.java for 9.3.0.3 maintenance release; also further fixes for 3116503 Dependency on JDK 1.6

View differences:

latest9.3/build/build-constants.xml
32 32
    -->
33 33
    
34 34
    
35
    <property name="version" value="9.3.0.2"/>
36
    <property name="versionh" value="9-3-0-2"/>
35
    <property name="version" value="9.3.0.3"/>
36
    <property name="versionh" value="9-3-0-3"/>
37 37
    <property name="major.version" value="9.3"/>
38 38
    <property name="major.versionh" value="9-3"/>
39
    <property name="release.date" value="2010-11-23"/>
39
    <property name="release.date" value="2010-12-09"/>
40 40
    
41 41
    <!-- REMEMBER ALSO TO SET THE VERSION IN Version.java -->
42 42
    
latest9.3/build/build-j.xml
408 408
        description="Generate Saxon (all three editions) for the Java platform"/>
409 409
        
410 410
    <target name="release-j" description="Create .ZIP files for release"
411
        depends="j, test-j"
412
        >  <!-- -->
411
        depends="j" 
412
        >  <!-- , test-j -->
413 413
      <mkdir dir="${issue.dir}"/> 
414
      <zip zipfile="${issue.dir}/SaxonHE${versionh}J.zip">
414
      <zip zipfile="${issue.dir}/saxonhe${versionh}j.zip">
415 415
        <fileset dir="${product.dir}/hej"/>
416 416
      </zip>
417
      <zip zipfile="${issue.dir}/SaxonPE${versionh}J.zip">
417
      <zip zipfile="${issue.dir}/saxonpe${versionh}j.zip">
418 418
        <fileset dir="${product.dir}/pej"/>
419 419
      </zip>                     
420
	  <zip zipfile="${issue.dir}/SaxonEE${versionh}J.zip">
420
	  <zip zipfile="${issue.dir}/saxonee${versionh}j.zip">
421 421
        <fileset dir="${product.dir}/eej"/>
422 422
      </zip>                     
423 423
     </target>    
latest9.3/build/build.xml
326 326
        depends="test-j, test-n"/>  	 
327 327
      
328 328
    <target name="release" description="Create .ZIP files for release"
329
        depends="build, resources, release-j, release-n"
330
        >  <!-- add test -->
329
        depends="build, release-source, release-j, release-n"
330
        >  
331
        <!-- add test -->
332
        <!-- omits "resources" for maintenance releases -->
331 333
        
332 334
      <mkdir dir="${issue.dir}"/> 
333 335
      <!-- <zip zipfile="${issue.dir}/saxonhe${versionh}j.zip">
latest9.3/hej/net/sf/saxon/Version.java
6 6

  
7 7
public final class Version {
8 8

  
9
    private static final int[] STRUCTURED_VERSION = {9,3,0,2};
10
    private static final String VERSION = "9.3.0.2";
9
    private static final int[] STRUCTURED_VERSION = {9,3,0,3};
10
    private static final String VERSION = "9.3.0.3";
11 11
    private static final String BUILD = "080500"; //mmddhh
12
    private static final String RELEASE_DATE = "2010-11-23";
12
    private static final String RELEASE_DATE = "2010-12-09";
13 13
    private static final String MAJOR_RELEASE_DATE = "2010-10-30";
14 14

  
15 15
    private Version() {
latest9.3/hej/net/sf/saxon/s9api/DocumentBuilder.java
469 469
     * @return a newly constructed {@link BuildingStreamWriter}, which implements the <code>XMLStreamWriter</code>
470 470
     * interface. If schema validation has been requested for this <code>DocumentBuilder</code>, then the document constructed
471 471
     * using the <code>XMLStreamWriter</code> will be validated as it is written.
472
     * <p>The returned object implements {@link javax.xml.stream.XMLStreamWriter}, but is not declared
473
     * as such to enable the product to load under JDK 1.5. The caller should cast the result.
472 474
     * <p>If the stream of events supplied to the <code>XMLStreamWriter</code> does not constitute
473 475
     * a well formed (and namespace-well-formed) document, the effect is undefined; Saxon may fail
474 476
     * to detect the error, and construct an unusable tree. </p>
475 477
     * @since 9.3
476 478
     */
477 479

  
478
    public BuildingStreamWriter newBuildingStreamWriter() throws SaxonApiException {
480
    public BuildingStreamWriterImpl newBuildingStreamWriter() throws SaxonApiException {
479 481
        PipelineConfiguration pipe = config.makePipelineConfiguration();
480 482
        Builder builder = treeModel.makeBuilder(pipe);
481 483
        builder.setLineNumbering(lineNumbering);
......
540 542
    }
541 543

  
542 544

  
543

  
544
    private static class BuildingStreamWriterImpl extends StreamWriterToReceiver implements BuildingStreamWriter {
545

  
546
        Builder builder;
547

  
548
        public BuildingStreamWriterImpl(Receiver receiver, Builder builder) {
549
            super(receiver);
550
            this.builder = builder;
551
            builder.open();
552
        }
553

  
554
        public XdmNode getDocumentNode() throws SaxonApiException {
555
            try {
556
                builder.close();
557
            } catch (XPathException e) {
558
                throw new SaxonApiException(e);
559
            }
560
            return new XdmNode(builder.getCurrentRoot());
561
        }
562
    }
563

  
564 545
}
565 546

  
566 547
//

Also available in: Unified diff