Changeset 278 for trunk/openjdk/jaxp


Ignore:
Timestamp:
Mar 26, 2011, 8:39:20 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b22 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/jaxp/LICENSE

    r2 r278  
    326326"CLASSPATH" EXCEPTION TO THE GPL
    327327
    328 Certain source files distributed by Sun Microsystems, Inc.  are subject to
    329 the following clarification and special exception to the GPL, but only where
    330 Sun has expressly included in the particular source file's header the words
    331 "Sun designates this particular file as subject to the "Classpath" exception
    332 as provided by Sun in the LICENSE file that accompanied this code."
     328Certain source files distributed by Oracle America and/or its affiliates are
     329subject to the following clarification and special exception to the GPL, but
     330only where Oracle has expressly included in the particular source file's header
     331the words "Oracle designates this particular file as subject to the "Classpath"
     332exception as provided by Oracle in the LICENSE file that accompanied this code."
    333333
    334334    Linking this library statically or dynamically with other modules is making

  • trunk/openjdk/jaxp/build-defs.xml

    r2 r278  
    11<?xml version="1.0"?>
    22<!--
    3  Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
     3 Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
    44 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55
    66 This code is free software; you can redistribute it and/or modify it
    77 under the terms of the GNU General Public License version 2 only, as
    8  published by the Free Software Foundation.  Sun designates this
     8 published by the Free Software Foundation.  Oracle designates this
    99 particular file as subject to the "Classpath" exception as provided
    10  by Sun in the LICENSE file that accompanied this code.
     10 by Oracle in the LICENSE file that accompanied this code.
    1111
    1212 This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    2020 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2121
    22  Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    23  CA 95054 USA or visit www.sun.com if you need additional information or
    24  have any questions.
     22 Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     23 or visit www.oracle.com if you need additional information or have any
     24 questions.
    2525-->
    2626
    … …  
    5656    <!-- <drop-import name="jaxp_tests"/> -->
    5757
     58    <!-- Fail and print helpful messages if source does not exist. -->
     59    <target name="-src-help">
     60      <fail message="${failed.url.src.message}">
     61        <condition>
     62            <and>
     63                <not>
     64                    <available file="${jaxp_src.src.dir}" type="dir"/>
     65                </not>
     66                <istrue value="${allow.downloads}"/>
     67            </and>
     68        </condition>
     69      </fail>
     70      <fail message="${failed.nourl.src.message}">
     71        <condition>
     72            <not>
     73                <available file="${jaxp_src.src.dir}" type="dir"/>
     74            </not>
     75        </condition>
     76      </fail>
     77    </target>
    5878
    59     <!-- Special build area preparation. -->
    60     <target name="-drop-build-prep" depends="init, -init-src-dirs">
     79    <!-- Special build area setup. -->
     80    <target name="-drop-build-setup" depends="init, -init-src-dirs">
    6181        <mkdir dir="${build.classes.dir}"/>
    6282        <copy todir="${build.classes.dir}">
    … …  
    85105    <!-- Source directory selection. -->
    86106    <target name="-init-src-dirs"
    87             depends="init, -use-drop">
     107            depends="init, -use-drop,-src-help">
    88108        <echo message="Using primary.src.dir=${primary.src.dir}"/>
    89109        <pathconvert property="src.list.id" refid="src.dir.id"/>

  • trunk/openjdk/jaxp/build-drop-template.xml

    r2 r278  
    11<?xml version="1.0"?>
    22<!--
    3  Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
     3 Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
    44 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55
    66 This code is free software; you can redistribute it and/or modify it
    77 under the terms of the GNU General Public License version 2 only, as
    8  published by the Free Software Foundation.  Sun designates this
     8 published by the Free Software Foundation.  Oracle designates this
    99 particular file as subject to the "Classpath" exception as provided
    10  by Sun in the LICENSE file that accompanied this code.
     10 by Oracle in the LICENSE file that accompanied this code.
    1111
    1212 This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    2020 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2121
    22  Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    23  CA 95054 USA or visit www.sun.com if you need additional information or
    24  have any questions.
     22 Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     23 or visit www.oracle.com if you need additional information or have any
     24 questions.
    2525-->
    2626
    … …  
    7676        <condition property="@DROP@.url.should.be.used">
    7777            <and>
     78                <istrue value="${allow.downloads}"/>
    7879                <not>
    7980                    <isset property="@DROP@.master.bundle.copy.exists"/>

  • trunk/openjdk/jaxp/build.properties

    r2 r278  
    11#
    2 # Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
    … …  
    105105${line.separator}
    106106
     107# Failure messages when source cannot be found on the file system
     108failed.nourl.src.message=\
     109ERROR: Cannot find source for project ${ant.project.name}.\
     110${line.separator}${line.separator}\
     111HINT: Try setting drops.dir to indicate where the bundles can be found, \
     112or try setting the ant property allow.downloads=true to download the bundle from the URL.\
     113${line.separator}\
     114e.g. ant -Dallow.downloads=true -OR- ant -Ddrops.dir=some_directory \
     115${line.separator}
     116
     117# Failure message when source cannot be downloaded
     118failed.url.src.message=\
     119ERROR: Cannot find source for project ${ant.project.name}.\
     120${line.separator}${line.separator}\
     121HINT: Try setting drops.dir to indicate where the bundles can be found, \
     122or try checking the URL with your browser.\
     123${line.separator}\
     124e.g. ant -Ddrops.dir=some_directory \
     125${line.separator}
     126
    107127#------------------------------------------------------------

  • trunk/openjdk/jaxp/build.xml

    r2 r278  
    11<?xml version="1.0"?>
    22<!--
    3  Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
     3 Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
    44 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55
    66 This code is free software; you can redistribute it and/or modify it
    77 under the terms of the GNU General Public License version 2 only, as
    8  published by the Free Software Foundation.  Sun designates this
     8 published by the Free Software Foundation.  Oracle designates this
    99 particular file as subject to the "Classpath" exception as provided
    10  by Sun in the LICENSE file that accompanied this code.
     10 by Oracle in the LICENSE file that accompanied this code.
    1111
    1212 This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    2020 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2121
    22  Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    23  CA 95054 USA or visit www.sun.com if you need additional information or
    24  have any questions.
     22 Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     23 or visit www.oracle.com if you need additional information or have any
     24 questions.
    2525-->
    2626
    … …  
    3737      javac.target         - classfile version target
    3838      javac.source         - source version
     39      drops.dir            - directory that holds source drop bundles
     40      allow.download       - permit downloads from public url (default is false)
     41                             (used if bundles not found in drops.dir)
     42
     43      Run 'make help' for help using the Makefile.
    3944    </description>
    4045
    … …  
    107112    </target>
    108113
    109     <target name="-build-prep"
    110             depends="init, -init-src-dirs, -drop-build-prep">
     114    <target name="-build-setup"
     115            depends="init, -init-src-dirs, -drop-build-setup">
    111116    </target>
    112117
    113118    <!-- Build (compilation) of sources to class files. -->
    114119    <target name="build"
    115             depends="init, -init-src-dirs, -build-prep">
     120            depends="compile, -build-setup">
     121    </target>
     122    <target name="compile"
     123            depends="init, -init-src-dirs">
     124        <mkdir dir="${build.classes.dir}"/>
    116125        <javac
    117              includeAntRuntime="false"
    118              classpath="${build.classes.dir}"
     126             includeAntRuntime="false" 
     127             classpath="${build.classes.dir}:${tools.jar}"
    119128             fork="true"
    120129             destdir="${build.classes.dir}"

  • trunk/openjdk/jaxp/jaxp.properties

    r259 r278  
    11#
    2 # Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
    2626drops.master.copy.base=${drops.dir}
    27 drops.master.url.base=http://java.net/downloads/jaxp/OpenJDK6
    2827
    29 jaxp_src.bundle.name=jdk6-jaxp-2010_01_15.zip
    30 jaxp_src.bundle.md5.checksum=8b7e78ef992ffb7f583617dd3036bdb7
     28jaxp_src.bundle.name=jaxp144_01.zip
     29jaxp_src.bundle.md5.checksum=ef7a8b3624ea904bf584bc46d79b5e75
    3130jaxp_src.master.bundle.dir=${drops.master.copy.base}
    32 jaxp_src.master.bundle.url.base=${drops.master.url.base}
     31jaxp_src.master.bundle.url.base=http://download.java.net/jaxp/openjdk/jdk6
    3332
    34 jaxp_tests.bundle.name=jdk6-jaxp-tests-2009_10_27.zip
    35 jaxp_tests.master.bundle.dir=${drops.master.copy.base}
    36 jaxp_tests.master.bundle.url.base=${drops.master.url.base}
     33#jaxp_tests.bundle.name=jaxp-unittests-1_4_4.zip
     34#jaxp_tests.bundle.md5.checksum=51845e38b02920cf5374d0331ab3a4ee
     35#jaxp_tests.master.bundle.dir=${drops.master.copy.base}
     36#jaxp_tests.master.bundle.url.base=https://java.net/downloads/jaxp/jdk7
     37

  • trunk/openjdk/jaxp/make/Makefile

    r72 r278  
    11#
    2 # Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
    … …  
    6464    ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
    6565  endif
     66endif
     67
     68# If downloads are allowed
     69ifeq ($(ALLOW_DOWNLOADS),true)
     70  ANT_OPTIONS += -Dallow.downloads=true
    6671endif
    6772
    … …  
    171176        @echo " "
    172177        @echo "  Environment or command line variables (all optional):"
     178        $(call helpenvline, ALT_DROPS_DIR,\
     179               "Directory that contains the drop source bundles i.e. drops.dir")
    173180        $(call helpenvline, ALT_BOOTDIR,\
    174181               "JAVA_HOME to use when running ant")

  • trunk/openjdk/jaxp/make/jprt.properties

    r2 r278  
    11#
    2 # Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
    … …  
    4141jprt.build.flavors=product,fastdebug
    4242
    43 # Explicitly designate what the 32bit match is for the 64bit build
    44 jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10
    45 jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.10
    46 jprt.solaris_x64.build.platform.match32=solaris_i586_5.10
    47 jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.10
    48 
    4943# Standard list of jprt test targets for this workspace
    5044jprt.test.targets=
Note: See TracChangeset for help on using the changeset viewer.