6856630: Restructure jaxp/jaxws repositories

Mon, 21 Sep 2009 13:57:02 -0700

author
ohair
date
Mon, 21 Sep 2009 13:57:02 -0700
changeset 85
ae2bec597586
parent 84
d79f0d601c2b
child 86
77708e68db52

6856630: Restructure jaxp/jaxws repositories
Reviewed-by: darcy, tbell

.hgignore file | annotate | diff | comparison | revisions
README file | annotate | diff | comparison | revisions
build-defs.xml file | annotate | diff | comparison | revisions
build-drop-template.xml file | annotate | diff | comparison | revisions
build.properties file | annotate | diff | comparison | revisions
build.xml file | annotate | diff | comparison | revisions
jaxws.properties file | annotate | diff | comparison | revisions
make/Makefile file | annotate | diff | comparison | revisions
make/build.properties file | annotate | diff | comparison | revisions
make/build.xml file | annotate | diff | comparison | revisions
make/jprt.properties file | annotate | diff | comparison | revisions
make/tools/StripProperties/StripProperties.java file | annotate | diff | comparison | revisions
make/tools/StripProperties/StripPropertiesTask.java file | annotate | diff | comparison | revisions
nbproject/findbugs.settings file | annotate | diff | comparison | revisions
nbproject/project.xml file | annotate | diff | comparison | revisions
nbproject/sqe.properties file | annotate | diff | comparison | revisions
patches/jaxws_src/README file | annotate | diff | comparison | revisions
     1.1 --- a/.hgignore	Thu Sep 17 13:46:52 2009 -0700
     1.2 +++ b/.hgignore	Mon Sep 21 13:57:02 2009 -0700
     1.3 @@ -1,3 +1,5 @@
     1.4  ^build/
     1.5  ^dist/
     1.6 +^drop/
     1.7 +^webrev/
     1.8  ^nbproject/private/
     2.1 --- a/README	Thu Sep 17 13:46:52 2009 -0700
     2.2 +++ b/README	Mon Sep 21 13:57:02 2009 -0700
     2.3 @@ -1,14 +1,25 @@
     2.4  README:
     2.5 -  This file should be located at the top of the jaxws Mercurial repository.
     2.6 +  
     2.7 +  This file should be located at the top of the Mercurial repository.
     2.8  
     2.9    See http://openjdk.java.net/ for more information about the OpenJDK.
    2.10  
    2.11    See ../README-builds.html for complete details on build machine requirements.
    2.12  
    2.13  Simple Build Instructions:
    2.14 -
    2.15 +  This repository can be loaded as a NetBeans project, built with ant, or
    2.16 +  built with GNU make, e.g.
    2.17 +    ant
    2.18 +       -OR-
    2.19      cd make && gnumake
    2.20       
    2.21 -  The files that will be imported into the jdk build will be in the "dist"
    2.22 -  directory.
    2.23 +  The built files that will be imported into the jdk build will be in the 
    2.24 +  "dist" directory.
    2.25 +  Help information is available by running "ant -projecthelp" or "make help".
    2.26  
    2.27 +Drop Repository:
    2.28 +  This repository builds sources from a created "drop" source directory.
    2.29 +  These files will normally be copied from a shared directory area or
    2.30 +  downloaded from a public website.
    2.31 +  See the ant build script (build.xml) for more details.
    2.32 +
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/build-defs.xml	Mon Sep 21 13:57:02 2009 -0700
     3.3 @@ -0,0 +1,138 @@
     3.4 +<?xml version="1.0"?>
     3.5 +<!--
     3.6 + Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
     3.7 + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8 +
     3.9 + This code is free software; you can redistribute it and/or modify it
    3.10 + under the terms of the GNU General Public License version 2 only, as
    3.11 + published by the Free Software Foundation.  Sun designates this
    3.12 + particular file as subject to the "Classpath" exception as provided
    3.13 + by Sun in the LICENSE file that accompanied this code.
    3.14 +
    3.15 + This code is distributed in the hope that it will be useful, but WITHOUT
    3.16 + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.17 + FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    3.18 + version 2 for more details (a copy is included in the LICENSE file that
    3.19 + accompanied this code).
    3.20 +
    3.21 + You should have received a copy of the GNU General Public License version
    3.22 + 2 along with this work; if not, write to the Free Software Foundation,
    3.23 + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    3.24 +
    3.25 + Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    3.26 + CA 95054 USA or visit www.sun.com if you need additional information or
    3.27 + have any questions.
    3.28 +-->
    3.29 +
    3.30 +<project name="jaxws_defs" default="all" basedir=".">
    3.31 +     
    3.32 +    <!-- Specific build properties. -->
    3.33 +    <property file="jaxws.properties"/>
    3.34 +
    3.35 +    <!-- Where generated xml files will stay. -->
    3.36 +    <property name="xml.gen.dir" value="${build.dir}/xml_generated"/>
    3.37 +    <property name="xml.template" value="build-drop-template.xml"/>
    3.38 +
    3.39 +    <!--  ############### -->
    3.40 +    <!--  Begin Macrodefs -->
    3.41 +
    3.42 +    <!-- Copies template file, replaces @DROP@ pattern, and imports it. -->
    3.43 +    <macrodef name="drop-import">
    3.44 +        <attribute name="name"/>
    3.45 +        <sequential>
    3.46 +            <property name="xml.gen.@{name}" value="${xml.gen.dir}/build-drop-@{name}.xml"/>
    3.47 +            <mkdir dir="${xml.gen.dir}"/>
    3.48 +            <copy file="${xml.template}" tofile="${xml.gen.@{name}}"/>
    3.49 +            <replace file="${xml.gen.@{name}}" token="@DROP@" value="@{name}"/>
    3.50 +            <import file="${xml.gen.@{name}}"/>
    3.51 +        </sequential>
    3.52 +    </macrodef>
    3.53 +
    3.54 +    <!--  End of Macrodefs -->
    3.55 +    <!--  ############### -->
    3.56 +
    3.57 +    <!-- Create xml file and import it for these drops. -->
    3.58 +    <drop-import name="jaxws_src"/>
    3.59 +    <drop-import name="jaf_src"/>
    3.60 +    <!-- <drop-import name="jaxws_tests"/> -->
    3.61 +
    3.62 +    <!-- Special build area preparation. -->
    3.63 +    <target name="-drop-build-prep" depends="init, -init-src-dirs">
    3.64 +        <mkdir dir="${build.classes.dir}"/>
    3.65 +        <copy todir="${build.classes.dir}">
    3.66 +            <fileset dir="${primary.src.dir}"
    3.67 +                     includes="**/*.xsd, **/*.default"
    3.68 +                     excludes="**/*.java, **/*.package.html, **/*.properties"/>
    3.69 +        </copy>
    3.70 +        <mkdir dir="${build.classes.dir}/META-INF/services"/>
    3.71 +        <copy todir="${build.classes.dir}/META-INF/services"
    3.72 +              file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory"/>
    3.73 +        <copy todir="${build.classes.dir}/META-INF/services"
    3.74 +              file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin"/>
    3.75 +        <mkdir dir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime"/>
    3.76 +        <copy todir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime">
    3.77 +            <fileset dir="${primary.src.dir}/com/sun/tools/internal/xjc/runtime"
    3.78 +                     includes="**/*.java"
    3.79 +                     excludes="**/*.package.html"/>
    3.80 +        </copy>
    3.81 +    </target>
    3.82 +
    3.83 +    <!-- Try to get drop sources, set property use.orig.src.dir if no drops. -->
    3.84 +    <target name="-set-props"
    3.85 +	    depends="init,
    3.86 +                     jaxws_src-update,
    3.87 +                     jaf_src-update">
    3.88 +        <condition property="use.orig.src.dir">
    3.89 +            <and>
    3.90 +                <available file="${orig.src.dir}" type="dir"/>
    3.91 +                <not>
    3.92 +                    <and>
    3.93 +                        <available file="${jaxws_src.src.dir}" type="dir"/>
    3.94 +                        <available file="${jaf_src.src.dir}"   type="dir"/>
    3.95 +                    </and>
    3.96 +                </not>
    3.97 +            </and>
    3.98 +        </condition>
    3.99 +    </target>
   3.100 +
   3.101 +    <!-- Set up source to use orig.src.dir, if use.orig.src.dir defined. -->
   3.102 +    <target name="-use-orig" depends="-set-props" if="use.orig.src.dir">
   3.103 +        <property name="primary.src.dir" value="${orig.src.dir}"/>
   3.104 +        <path id="src.dir.id">
   3.105 +            <pathelement path="${primary.src.dir}"/>
   3.106 +        </path>
   3.107 +    </target>
   3.108 +
   3.109 +    <!-- Set up source to use drop.dir, if use.orig.src.dir not defined. -->
   3.110 +    <target name="-use-drop" depends="-set-props" unless="use.orig.src.dir">
   3.111 +        <property name="primary.src.dir" value="${jaxws_src.src.dir}"/>
   3.112 +        <path id="src.dir.id">
   3.113 +            <pathelement path="${primary.src.dir}"/>
   3.114 +            <pathelement path="${jaf_src.src.dir}"/>
   3.115 +        </path>
   3.116 +    </target>
   3.117 +
   3.118 +    <!-- Source directory selection. -->
   3.119 +    <target name="-init-src-dirs"
   3.120 +	    depends="init, -use-orig, -use-drop">
   3.121 +        <echo message="Using primary.src.dir=${primary.src.dir}"/>
   3.122 +        <pathconvert property="src.list.id" refid="src.dir.id"/>
   3.123 +        <echo message="Using src.dir.id=${src.list.id}"/>
   3.124 +    </target>
   3.125 +
   3.126 +    <!-- Create orig src.zip. -->
   3.127 +    <target name="-orig-src-zip" depends="init, -set-props" if="use.orig.src.dir">
   3.128 +        <zip file="${dist.src.zip}" basedir="${primary.src.dir}"/>
   3.129 +    </target>
   3.130 +
   3.131 +    <!-- Create drop src.zip. -->
   3.132 +    <target name="-drop-src-zip" depends="init, -set-props" unless="use.orig.src.dir">
   3.133 +        <zip file="${dist.src.zip}" basedir="${primary.src.dir}"/>
   3.134 +        <zip file="${dist.src.zip}" basedir="${jaf_src.src.dir}" update="true"/>
   3.135 +    </target>
   3.136 +
   3.137 +    <!-- Create src.zip. -->
   3.138 +    <target name="-dist-src-zip" depends="init, -orig-src-zip, -drop-src-zip">
   3.139 +    </target>
   3.140 +    
   3.141 +</project>
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/build-drop-template.xml	Mon Sep 21 13:57:02 2009 -0700
     4.3 @@ -0,0 +1,131 @@
     4.4 +<?xml version="1.0"?>
     4.5 +<!--
     4.6 + Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
     4.7 + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8 +
     4.9 + This code is free software; you can redistribute it and/or modify it
    4.10 + under the terms of the GNU General Public License version 2 only, as
    4.11 + published by the Free Software Foundation.  Sun designates this
    4.12 + particular file as subject to the "Classpath" exception as provided
    4.13 + by Sun in the LICENSE file that accompanied this code.
    4.14 +
    4.15 + This code is distributed in the hope that it will be useful, but WITHOUT
    4.16 + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    4.17 + FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    4.18 + version 2 for more details (a copy is included in the LICENSE file that
    4.19 + accompanied this code).
    4.20 +
    4.21 + You should have received a copy of the GNU General Public License version
    4.22 + 2 along with this work; if not, write to the Free Software Foundation,
    4.23 + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    4.24 +
    4.25 + Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    4.26 + CA 95054 USA or visit www.sun.com if you need additional information or
    4.27 + have any questions.
    4.28 +-->
    4.29 +
    4.30 +<project name="@DROP@-drop" default="all" basedir=".">
    4.31 +
    4.32 +    <!-- Locations of master drop bundles. -->
    4.33 +    <property name="@DROP@.master.bundle.copy"
    4.34 +              value="${@DROP@.master.bundle.dir}/${@DROP@.bundle.name}"/>
    4.35 +    <property name="@DROP@.master.bundle.url"
    4.36 +              value="${@DROP@.master.bundle.url.base}/${@DROP@.bundle.name}"/>
    4.37 +
    4.38 +    <!-- Location where the copied bundle lands. -->
    4.39 +    <property name="@DROP@.bundle.copy"
    4.40 +              value="${drop.dir}/bundles/${@DROP@.bundle.name}"/>
    4.41 +
    4.42 +    <!-- Root of exploded area. -->
    4.43 +    <property name="@DROP@.root.dir" value="${drop.dir}/@DROP@"/>
    4.44 +    <property name="@DROP@.src.dir" value="${@DROP@.root.dir}/src"/>
    4.45 +
    4.46 +    <!-- To see if the drop areas are ready. (ignoring bundles) -->
    4.47 +    <target name="-@DROP@-ready">
    4.48 +        <condition property="@DROP@.ready">
    4.49 +            <and>
    4.50 +                <available file="${@DROP@.root.dir}" type="dir"/>
    4.51 +                <available file="${@DROP@.root.dir}/PATCHED" type="file"/>
    4.52 +            </and>
    4.53 +        </condition>
    4.54 +    </target>
    4.55 +
    4.56 +    <!-- Copy over bundles from some shared master area. -->
    4.57 +    <condition property="@DROP@.master.bundle.copy.exists">
    4.58 +        <available file="${@DROP@.master.bundle.copy}" type="file"/>
    4.59 +    </condition>
    4.60 +    <target name="-@DROP@-copy-bundle"
    4.61 +	    depends="init, -@DROP@-ready"
    4.62 +            if="@DROP@.master.bundle.copy.exists"
    4.63 +            unless="@DROP@.ready">
    4.64 +        <echo message="Copying from ${@DROP@.master.bundle.copy}"/>
    4.65 +        <dirname property="@DROP@.bundle.dirname" file="${@DROP@.bundle.copy}"/>
    4.66 +        <mkdir dir="${@DROP@.bundle.dirname}"/>
    4.67 +        <delete file="${@DROP@.bundle.copy}.temp"/>
    4.68 +        <delete file="${@DROP@.bundle.copy}"/>
    4.69 +        <copy file="${@DROP@.master.bundle.copy}" tofile="${@DROP@.bundle.copy}.temp"/>
    4.70 +        <move file="${@DROP@.bundle.copy}.temp" tofile="${@DROP@.bundle.copy}"/>
    4.71 +        <property name="@DROP@.master.bundle.found" value="true"/>
    4.72 +    </target>
    4.73 +
    4.74 +    <!-- Determine if the master url download should be used. -->
    4.75 +    <target name="-@DROP@-url-should-be-used" unless="@DROP@.url.should.be.used">
    4.76 +        <condition property="@DROP@.url.should.be.used">
    4.77 +            <and>
    4.78 +                <http url="${@DROP@.master.bundle.url.base}"/>
    4.79 +                <not>
    4.80 +                    <isset property="@DROP@.master.bundle.copy.exists"/>
    4.81 +                </not>
    4.82 +            </and>
    4.83 +        </condition>
    4.84 +    </target>
    4.85 +
    4.86 +    <!-- Download bundles from a url. -->
    4.87 +    <target name="-@DROP@-url-bundle"
    4.88 +	    depends="init, -@DROP@-ready, -@DROP@-url-should-be-used"
    4.89 +            if="@DROP@.url.should.be.used"
    4.90 +            unless="@DROP@.ready">
    4.91 +        <echo message="Downloading from ${@DROP@.master.bundle.url}"/>
    4.92 +        <dirname property="@DROP@.bundle.dirname" file="${@DROP@.bundle.copy}"/>
    4.93 +        <mkdir dir="${@DROP@.bundle.dirname}"/>
    4.94 +        <delete file="${@DROP@.bundle.copy}.temp"/>
    4.95 +        <delete file="${@DROP@.bundle.copy}"/>
    4.96 +        <get src="${@DROP@.master.bundle.url}" dest="${@DROP@.bundle.copy}.temp"/>
    4.97 +        <move file="${@DROP@.bundle.copy}.temp" tofile="${@DROP@.bundle.copy}"/>
    4.98 +        <property name="@DROP@.master.bundle.found" value="true"/>
    4.99 +    </target>
   4.100 +    
   4.101 +    <!-- Fill in the drop zones, but just when needed. -->
   4.102 +    <target name="@DROP@-update"
   4.103 +            depends="init, 
   4.104 +		     -@DROP@-copy-bundle,
   4.105 +		     -@DROP@-url-bundle,
   4.106 +                     -@DROP@-ready"
   4.107 +            if="@DROP@.master.bundle.found"
   4.108 +            unless="@DROP@.ready">
   4.109 +        <delete dir="${@DROP@.root.dir}"/>
   4.110 +        <delete dir="${@DROP@.root.dir}-temp"/>
   4.111 +        <mkdir dir="${@DROP@.root.dir}-temp"/>
   4.112 +        <unzip src="${@DROP@.bundle.copy}" dest="${@DROP@.root.dir}-temp"/>
   4.113 +        <move file="${@DROP@.root.dir}-temp" tofile="${@DROP@.root.dir}"/>
   4.114 +        <touch>
   4.115 +            <fileset dir="${@DROP@.root.dir}"/>
   4.116 +        </touch>
   4.117 +        <condition property="patch.utility" value="gpatch" else="patch">
   4.118 +            <os name="SunOS"/>
   4.119 +        </condition>
   4.120 +        <apply executable="${patch.utility}"
   4.121 +		   dir="${@DROP@.root.dir}"
   4.122 +	           parallel="false"
   4.123 +	           failonerror="true"
   4.124 +	           verbose="true">
   4.125 +            <arg value="-l"/>
   4.126 +            <arg value="-p0"/>
   4.127 +            <arg value="-i"/>
   4.128 +            <filelist dir="${patches.dir}/@DROP@" files="${@DROP@.patch.list}"/>
   4.129 +        </apply>
   4.130 +        <echo file="${@DROP@.root.dir}/PATCHED"
   4.131 +	      message="Patches have been applied."/>
   4.132 +    </target>
   4.133 +
   4.134 +</project>
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/build.properties	Mon Sep 21 13:57:02 2009 -0700
     5.3 @@ -0,0 +1,103 @@
     5.4 +#
     5.5 +# Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
     5.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.7 +#
     5.8 +# This code is free software; you can redistribute it and/or modify it
     5.9 +# under the terms of the GNU General Public License version 2 only, as
    5.10 +# published by the Free Software Foundation.  Sun designates this
    5.11 +# particular file as subject to the "Classpath" exception as provided
    5.12 +# by Sun in the LICENSE file that accompanied this code.
    5.13 +#
    5.14 +# This code is distributed in the hope that it will be useful, but WITHOUT
    5.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    5.16 +# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    5.17 +# version 2 for more details (a copy is included in the LICENSE file that
    5.18 +# accompanied this code).
    5.19 +#
    5.20 +# You should have received a copy of the GNU General Public License version
    5.21 +# 2 along with this work; if not, write to the Free Software Foundation,
    5.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    5.23 +#
    5.24 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    5.25 +# CA 95054 USA or visit www.sun.com if you need additional information or
    5.26 +# have any questions.
    5.27 +#
    5.28 +
    5.29 +# Base locations where bundles are located
    5.30 +slashjava=/java
    5.31 +devtools=${slashjava}/devtools
    5.32 +
    5.33 +# This is the JDK used to build and run the bootstrap version of javac.
    5.34 +# The bootstrap javac is used to compile both boostrap versions of the
    5.35 +# other tools, and product versions of all the tools.
    5.36 +# Override this path as needed, either on the command line or in 
    5.37 +# one of the standard user build.properties files (see build.xml)
    5.38 +javac.jar=${bootstrap.dir}/lib/javac.jar
    5.39 +
    5.40 +# options for the <javac> tasks used to compile the tools
    5.41 +javac.source = 7
    5.42 +javac.target = 7
    5.43 +javac.debug = true
    5.44 +javac.no.jdk.warnings = -XDignore.symbol.file=true
    5.45 +# set the following to -version to verify the versions of javac being used
    5.46 +javac.version.opt = 
    5.47 +# in time, there should be no exceptions to -Xlint:all
    5.48 +#javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial
    5.49 +javac.lint.opts=
    5.50 +
    5.51 +# JVM memory size
    5.52 +javac.memoryInitialSize = 256m
    5.53 +javac.memoryMaximumSize = 512m
    5.54 +
    5.55 +#------------------------------------------------------------
    5.56 +
    5.57 +# Root of output directories
    5.58 +output.dir=.
    5.59 +
    5.60 +# Built files
    5.61 +build.dir=${output.dir}/build
    5.62 +build.classes.dir=${build.dir}/classes
    5.63 +
    5.64 +# Distributed results
    5.65 +dist.dir=${output.dir}/dist
    5.66 +dist.lib.dir=${dist.dir}/lib
    5.67 +dist.classes.jar=${dist.lib.dir}/classes.jar
    5.68 +dist.src.zip=${dist.lib.dir}/src.zip
    5.69 +
    5.70 +# Where all drop sources live
    5.71 +drop.dir=${output.dir}/drop
    5.72 +
    5.73 +# Where patches to drop bundle sources live
    5.74 +patches.dir=patches
    5.75 +
    5.76 +# Original source area
    5.77 +orig.dir=src
    5.78 +orig.src.dir=${orig.dir}/share/classes
    5.79 +
    5.80 +# Sanity information
    5.81 +sanity.info= Sanity Settings:${line.separator}\
    5.82 +  ant.home=${ant.home}${line.separator}\
    5.83 +  ant.version=${ant.version}${line.separator}\
    5.84 +  ant.java.version=${ant.java.version}${line.separator}\
    5.85 +  java.home=${java.home}${line.separator}\
    5.86 +  java.version=${java.version}${line.separator}\
    5.87 +  os.name=${os.name}${line.separator}\
    5.88 +  os.arch=${os.arch}${line.separator}\
    5.89 +  os.version=${os.version}${line.separator}\
    5.90 +  bootstrap.dir=${bootstrap.dir}${line.separator}\
    5.91 +  javac.jar=${javac.jar}${line.separator}\
    5.92 +  javac.memoryInitialSize=${javac.memoryInitialSize}${line.separator}\
    5.93 +  javac.memoryMaximumSize=${javac.memoryMaximumSize}${line.separator}\
    5.94 +  javac.source=${javac.source}${line.separator}\
    5.95 +  javac.debug=${javac.debug}${line.separator}\
    5.96 +  javac.target=${javac.target}${line.separator}\
    5.97 +  javac.version.opt=${javac.version.opt}${line.separator}\
    5.98 +  javac.lint.opts=${javac.lint.opts}${line.separator}\
    5.99 +  javac.no.jdk.warnings=${javac.no.jdk.warnings}${line.separator}\
   5.100 +  output.dir=${output.dir}${line.separator}\
   5.101 +  build.dir=${build.dir}${line.separator}\
   5.102 +  dist.dir=${dist.dir}${line.separator}\
   5.103 +  drop.dir=${drop.dir}${line.separator}\
   5.104 +${line.separator}
   5.105 +
   5.106 +#------------------------------------------------------------
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/build.xml	Mon Sep 21 13:57:02 2009 -0700
     6.3 @@ -0,0 +1,163 @@
     6.4 +<?xml version="1.0"?>
     6.5 +<!--
     6.6 + Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
     6.7 + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8 +
     6.9 + This code is free software; you can redistribute it and/or modify it
    6.10 + under the terms of the GNU General Public License version 2 only, as
    6.11 + published by the Free Software Foundation.  Sun designates this
    6.12 + particular file as subject to the "Classpath" exception as provided
    6.13 + by Sun in the LICENSE file that accompanied this code.
    6.14 +
    6.15 + This code is distributed in the hope that it will be useful, but WITHOUT
    6.16 + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    6.17 + FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    6.18 + version 2 for more details (a copy is included in the LICENSE file that
    6.19 + accompanied this code).
    6.20 +
    6.21 + You should have received a copy of the GNU General Public License version
    6.22 + 2 along with this work; if not, write to the Free Software Foundation,
    6.23 + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    6.24 +
    6.25 + Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    6.26 + CA 95054 USA or visit www.sun.com if you need additional information or
    6.27 + have any questions.
    6.28 +-->
    6.29 +
    6.30 +<project name="jaxws" default="all" basedir=".">
    6.31 +   
    6.32 +    <!-- For 'ant -p' or 'ant -projecthelp' -->
    6.33 +    
    6.34 +    <description>
    6.35 +    Ant build script for the ${ant.project.name} part of the jdk.
    6.36 +
    6.37 +    Input Properties: (see build.properties for the ant defaults)
    6.38 +      bootstrap.dir        - dir with lib/javac.jar, added to javac bootclasspath
    6.39 +      javac.debug          - true or false for debug classfiles
    6.40 +      javac.target         - classfile version target
    6.41 +      javac.source         - source version
    6.42 +    </description>
    6.43 +
    6.44 +    <!-- Mac is special, need to downgrade these before build.properties. -->
    6.45 +    <condition property="javac.source" value="1.5">
    6.46 +        <os family="mac"/>
    6.47 +    </condition>
    6.48 +    <condition property="javac.target" value="1.5">
    6.49 +        <os family="mac"/>
    6.50 +    </condition>
    6.51 +
    6.52 +    <!-- Project build properties. -->
    6.53 +    <property file="build.properties"/>
    6.54 +
    6.55 +    <!-- Get shared targets. -->
    6.56 +    <import file="build-defs.xml"/>
    6.57 +
    6.58 +    <!-- Initialization of directories needed for build. -->
    6.59 +    <target name="init">
    6.60 +        <mkdir dir="${build.dir}"/>
    6.61 +        <mkdir dir="${build.classes.dir}"/>
    6.62 +        <mkdir dir="${dist.dir}"/>
    6.63 +        <mkdir dir="${dist.lib.dir}"/>
    6.64 +    </target>
    6.65 +    
    6.66 +    <!-- Sanity checks and settings -->
    6.67 +    <target name="sanity"
    6.68 +	    depends="-javac-jar-exists"
    6.69 +            description="Display settings of configuration values">
    6.70 +        <echo message="${sanity.info}"/>
    6.71 +    </target>
    6.72 +
    6.73 +     <!-- Check for bootstrap javac.jar file, warn if missing. -->
    6.74 +    <condition property="javac.jar.exists">
    6.75 +        <available file="${javac.jar}" type="file"/>
    6.76 +    </condition>
    6.77 +    <target name="-javac-jar-exists"
    6.78 +            unless="javac.jar.exists">
    6.79 +        <echo message="WARNING: Cannot find ${javac.jar}"/>
    6.80 +    </target>
    6.81 +
    6.82 +    <!-- Creation of distribution files to jdk build process. -->
    6.83 +    <target name="dist"
    6.84 +	    depends="init, -init-src-dirs, build, -dist-classes-jar, -dist-src-zip"
    6.85 +            description="Create all built distribution files.">
    6.86 +    </target>
    6.87 +    <target name="-dist-classes-jar-uptodate"
    6.88 +	    depends="init, -init-src-dirs">
    6.89 +        <condition property="dist.classes.jar.uptodate">
    6.90 +            <and>
    6.91 +                <available file="${dist.classes.jar}" type="file"/>
    6.92 +                <uptodate targetfile="${dist.classes.jar}">
    6.93 +                    <srcfiles dir="${build.classes.dir}" includes="**"/>
    6.94 +                </uptodate>
    6.95 +            </and>
    6.96 +        </condition>
    6.97 +    </target>
    6.98 +    <target name="-dist-classes-jar"
    6.99 +	    depends="init, -init-src-dirs, -dist-classes-jar-uptodate"
   6.100 +            unless="dist.classes.jar.uptodate">
   6.101 +        <delete file="${dist.classes.jar}"/>
   6.102 +        <jar file="${dist.classes.jar}" basedir="${build.classes.dir}"/>
   6.103 +    </target>
   6.104 +
   6.105 +    <target name="-build-prep"
   6.106 +	    depends="init, -init-src-dirs, -drop-build-prep">
   6.107 +    </target>
   6.108 +
   6.109 +    <!-- Build (compilation) of sources to class files. -->
   6.110 +    <target name="build"
   6.111 +	    depends="init, -init-src-dirs, -build-prep">
   6.112 +        <javac fork="true"
   6.113 +             destdir="${build.classes.dir}"
   6.114 +             memoryInitialSize="${javac.memoryInitialSize}"
   6.115 +             memoryMaximumSize="${javac.memoryMaximumSize}"
   6.116 +             source="${javac.source}"
   6.117 +	     debug="${javac.debug}"
   6.118 +             target="${javac.target}">
   6.119 +            <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
   6.120 +            <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
   6.121 +            <src refid="src.dir.id"/>
   6.122 +        </javac>
   6.123 +    </target>
   6.124 +
   6.125 +    <!-- Test. (FIXME: Need to know how to run tests.) -->
   6.126 +    <target name="test"
   6.127 +	    depends="init, -init-src-dirs, dist">
   6.128 +        <echo message="FIXME: How do you run the tests"/>
   6.129 +    </target>
   6.130 +    
   6.131 +    <!-- Populate source area if needed. -->
   6.132 +    <target name="source"
   6.133 +            depends="init, -init-src-dirs"
   6.134 +            description="Populate all source file directories">
   6.135 +    </target>
   6.136 +
   6.137 +    <!-- Clean up compiled files. -->
   6.138 +    <target name="clean"
   6.139 +            description="Delete all generated files">
   6.140 +        <delete dir="${build.dir}"/>
   6.141 +        <delete dir="${dist.dir}"/>
   6.142 +    </target>
   6.143 +
   6.144 +    <!-- Clean up compiled files and all imported source files. -->
   6.145 +    <target name="clobber"
   6.146 +	    depends="clean"
   6.147 +            description="Delete all generated files, including imported sources">
   6.148 +        <delete dir="${drop.dir}"/>
   6.149 +    </target>
   6.150 +
   6.151 +    <target name="-banner">
   6.152 +        <echo message="+---------------------------------------+"/>
   6.153 +        <echo message="+ Starting ant project ${ant.project.name} +"/>
   6.154 +        <echo message="+---------------------------------------+"/>
   6.155 +    </target>
   6.156 +   
   6.157 +    <!-- Do everything but test. -->
   6.158 +    <target name="all"
   6.159 +	    depends="-banner, sanity, dist"
   6.160 +            description="Build everything.">
   6.161 +        <echo message="+---------------------------------------+"/>
   6.162 +        <echo message="+ Finishing ant project ${ant.project.name}"/>
   6.163 +        <echo message="+---------------------------------------+"/>
   6.164 +    </target>
   6.165 +
   6.166 +</project>
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/jaxws.properties	Mon Sep 21 13:57:02 2009 -0700
     7.3 @@ -0,0 +1,40 @@
     7.4 +#
     7.5 +# Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
     7.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.7 +#
     7.8 +# This code is free software; you can redistribute it and/or modify it
     7.9 +# under the terms of the GNU General Public License version 2 only, as
    7.10 +# published by the Free Software Foundation.  Sun designates this
    7.11 +# particular file as subject to the "Classpath" exception as provided
    7.12 +# by Sun in the LICENSE file that accompanied this code.
    7.13 +#
    7.14 +# This code is distributed in the hope that it will be useful, but WITHOUT
    7.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    7.16 +# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    7.17 +# version 2 for more details (a copy is included in the LICENSE file that
    7.18 +# accompanied this code).
    7.19 +#
    7.20 +# You should have received a copy of the GNU General Public License version
    7.21 +# 2 along with this work; if not, write to the Free Software Foundation,
    7.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    7.23 +#
    7.24 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    7.25 +# CA 95054 USA or visit www.sun.com if you need additional information or
    7.26 +# have any questions.
    7.27 +#
    7.28 +
    7.29 +drops.master.copy.base=${devtools}/share/jdk7-drops
    7.30 +drops.master.url.base=http://kenai.com/projects/jdk7-drops/downloads/download
    7.31 +
    7.32 +jaxws_src.bundle.name=jdk7-jaxws-2009_08_28.zip
    7.33 +jaxws_src.master.bundle.dir=${drops.master.copy.base}
    7.34 +#jaxws_src.bundle.url.base=https://jaxws.dev.java.net/files/documents/913/142147
    7.35 +jaxws_src.master.bundle.url.base=${drops.master.url.base}
    7.36 +
    7.37 +jaf_src.bundle.name=jdk7-jaf-2009_08_28.zip
    7.38 +jaf_src.master.bundle.dir=${drops.master.copy.base}
    7.39 +jaf_src.master.bundle.url.base=${drops.master.url.base}
    7.40 +
    7.41 +jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip
    7.42 +jaxws_tests.master.bundle.dir=${drops.master.copy.base}
    7.43 +jaxws_tests.master.bundle.url.base=${drops.master.url.base}
     8.1 --- a/make/Makefile	Thu Sep 17 13:46:52 2009 -0700
     8.2 +++ b/make/Makefile	Mon Sep 21 13:57:02 2009 -0700
     8.3 @@ -23,7 +23,7 @@
     8.4  # have any questions.
     8.5  #
     8.6  
     8.7 -# Makefile for jaxws: wrapper around Ant build.xml file
     8.8 +# Makefile wrapper around Ant build.xml file
     8.9  
    8.10  #
    8.11  # On Solaris, the 'make' utility from Sun will not work with these makefiles.
    8.12 @@ -41,38 +41,12 @@
    8.13    ANT_OPTIONS += -verbose
    8.14  endif
    8.15  
    8.16 -ifdef JDK_VERSION
    8.17 -  ANT_OPTIONS += -Djdk.version=$(JDK_VERSION)
    8.18 -endif 
    8.19 -
    8.20 -ifdef FULL_VERSION
    8.21 -  ANT_OPTIONS += -Dfull.version='$(FULL_VERSION)' # will contain spaces
    8.22 -endif 
    8.23 -
    8.24 -ifdef MILESTONE
    8.25 -  ANT_OPTIONS += -Dmilestone=$(MILESTONE)
    8.26 -endif
    8.27 -
    8.28 -ifdef BUILD_NUMBER
    8.29 -  ANT_OPTIONS += -Dbuild.number=$(BUILD_NUMBER)
    8.30 -else
    8.31 -  ifdef JDK_BUILD_NUMBER
    8.32 -    ANT_OPTIONS += -Dbuild.number=$(JDK_BUILD_NUMBER)
    8.33 -  endif
    8.34 -endif
    8.35 -
    8.36 -ifeq ($(VARIANT), DBG)
    8.37 -  ANT_OPTIONS += -Djavac.debug=true
    8.38 -else
    8.39 -  ifeq ($(VARIANT), OPT)
    8.40 +ifeq ($(VARIANT), OPT)
    8.41 +  ifneq ($(DEBUG_CLASSFILES), true)
    8.42      ANT_OPTIONS += -Djavac.debug=false
    8.43    endif
    8.44  endif
    8.45  
    8.46 -ifeq ($(DEBUG_CLASSFILES), true)
    8.47 -  ANT_OPTIONS += -Djavac.debug=true
    8.48 -endif
    8.49 -
    8.50  # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
    8.51  # and the somewhat misnamed CLASS_VERSION (-target NN)
    8.52  ifdef TARGET_CLASS_VERSION
    8.53 @@ -91,24 +65,53 @@
    8.54    endif
    8.55  endif 
    8.56  
    8.57 -ifdef ALT_BOOTDIR
    8.58 -  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
    8.59 +# Figure out the platform we are using
    8.60 +_SYSTEM_UNAME := $(shell uname)
    8.61 +_PLATFORM_KIND = unix
    8.62 +ifeq ($(_SYSTEM_UNAME), Windows_NT)
    8.63 +  _PLATFORM_KIND = windows
    8.64  endif
    8.65 +ifneq (,$(findstring CYGWIN,$(_SYSTEM_UNAME)))
    8.66 +  _PLATFORM_KIND = windows
    8.67 +endif
    8.68 +
    8.69 +# Where is /java in case we need it
    8.70 +ifdef ALT_SLASH_JAVA
    8.71 +  _SLASHJAVA = $(ALT_SLASH_JAVA)
    8.72 +else
    8.73 +  ifeq ($(_PLATFORM_KIND), windows)
    8.74 +    _SLASHJAVA=J:/
    8.75 +  else
    8.76 +    _SLASHJAVA=/java
    8.77 +  endif
    8.78 +endif
    8.79 +
    8.80 +# Where is /java/devtools in case we need it
    8.81 +ifdef ALT_JDK_DEVTOOLS_DIR
    8.82 +  _DEVTOOLS = $(ALT_JDK_DEVTOOLS_DIR)
    8.83 +else
    8.84 +  _DEVTOOLS = $(_SLASHJAVA)/devtools
    8.85 +endif
    8.86 +
    8.87 +# Add in path to devtools
    8.88 +ANT_OPTIONS += -Ddevtools=$(_DEVTOOLS)
    8.89  
    8.90  ifdef ALT_OUTPUTDIR
    8.91    OUTPUTDIR = $(ALT_OUTPUTDIR)
    8.92 -  ANT_OPTIONS += -Dbuild.dir=$(ALT_OUTPUTDIR)/build
    8.93 -  ANT_OPTIONS += -Ddist.dir=$(ALT_OUTPUTDIR)/dist
    8.94 +  ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR)
    8.95  else
    8.96    OUTPUTDIR = ..
    8.97  endif
    8.98  
    8.99  ifdef ALT_LANGTOOLS_DIST
   8.100 +  ifdef ALT_BOOTDIR
   8.101 +    ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
   8.102 +  endif
   8.103    ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
   8.104 -endif
   8.105 -
   8.106 -ifdef FINDBUGS_HOME
   8.107 -  ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
   8.108 +else
   8.109 +  ifdef ALT_JDK_IMPORT_PATH
   8.110 +    ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH)
   8.111 +  endif
   8.112  endif
   8.113  
   8.114  ifdef ANT_HOME
   8.115 @@ -124,18 +127,59 @@
   8.116  endif
   8.117  
   8.118  # Default target and expected 'do everything' target
   8.119 -all: build
   8.120 -
   8.121 -# Standard make clobber target
   8.122 -clobber: clean
   8.123 +default: all
   8.124  
   8.125  # All ant targets of interest
   8.126 -ANT_TARGETS = build clean sanity # for now
   8.127 +ANT_TARGETS = all source build dist clobber clean sanity
   8.128  
   8.129  # Create a make target for each
   8.130  $(ANT_TARGETS):
   8.131 -	$(ANT_JAVA_HOME) $(ANT) -version
   8.132 -	$(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
   8.133 +	cd .. && $(ANT_JAVA_HOME) $(ANT) -version
   8.134 +	cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
   8.135 +
   8.136 +# Help target
   8.137 +define helpenvline
   8.138 +@echo "    $1";echo "        $2"
   8.139 +endef
   8.140 +help:
   8.141 +	@echo "----------------------------------------------------------"
   8.142 +	@echo " "
   8.143 +	@echo "Help information for this Makefile:"
   8.144 +	@echo " "
   8.145 +	@echo "  Targets (see ant project information for descriptions):"
   8.146 +	@echo "    $(ANT_TARGETS)"
   8.147 +	@echo " "
   8.148 +	@echo "  Environment or command line variables (all optional):"
   8.149 +	$(call helpenvline, ALT_BOOTDIR,\
   8.150 +	       "JAVA_HOME to use when running ant")
   8.151 +	$(call helpenvline, ALT_LANGTOOLS_DIST,\
   8.152 +	       "path to langtools repository dist directory")
   8.153 +	$(call helpenvline, ALT_OUTPUTDIR,\
   8.154 +	       "path to root of output")
   8.155 +	$(call helpenvline, DEBUG_CLASSFILES,\
   8.156 +	       "if set makes sure ant property javac.debug is true")
   8.157 +	$(call helpenvline, JAVAC_SOURCE_ARG,\
   8.158 +	       "if SOURCE_LANGUAGE_VERSION not set uses this to set ant property javac.source")
   8.159 +	$(call helpenvline, JAVAC_TARGET_ARG,\
   8.160 +	       "if TARGET_CLASS_VERSION not set uses this to set ant property javac.target")
   8.161 +	$(call helpenvline, SOURCE_LANGUAGE_VERSION,\
   8.162 +	       "if set uses this to set ant property javac.source")
   8.163 +	$(call helpenvline, QUIET,\
   8.164 +	       "if set will pass -quiet to ant")
   8.165 +	$(call helpenvline, TARGET_CLASS_VERSION,\
   8.166 +	       "JAVA_HOME to use when running ant")
   8.167 +	$(call helpenvline, VARIANT,\
   8.168 +	       "if set to OPT means optimized build will set javac.debug to false")
   8.169 +	$(call helpenvline, VERBOSE,\
   8.170 +	       "if set will pass -verbose to ant")
   8.171 +	@echo " "
   8.172 +	@echo "----------------------------------------------------------"
   8.173 +	@echo " "
   8.174 +	@echo "Ant project file help information:"
   8.175 +	@echo " "
   8.176 +	@$(ANT_JAVA_HOME) cd .. && $(ANT) $(ANT_OPTIONS) -p
   8.177 +	@echo " "
   8.178 +	@echo "----------------------------------------------------------"
   8.179  
   8.180  # Targets for Sun's internal JPRT build system
   8.181  JPRT_ARCHIVE_BUNDLE=$(OUTPUTDIR)/jprt.zip
   8.182 @@ -145,5 +189,5 @@
   8.183  	   zip -q -r $(JPRT_ARCHIVE_BUNDLE) . )
   8.184  
   8.185  # Declare these phony (not filenames)
   8.186 -.PHONY: $(ANT_TARGETS) all clobber \
   8.187 +.PHONY: $(ANT_TARGETS) \
   8.188  	jprt_build_product jprt_build_debug jprt_build_fastdebug
     9.1 --- a/make/build.properties	Thu Sep 17 13:46:52 2009 -0700
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,46 +0,0 @@
     9.4 -#
     9.5 -# Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
     9.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     9.7 -#
     9.8 -# This code is free software; you can redistribute it and/or modify it
     9.9 -# under the terms of the GNU General Public License version 2 only, as
    9.10 -# published by the Free Software Foundation.  Sun designates this
    9.11 -# particular file as subject to the "Classpath" exception as provided
    9.12 -# by Sun in the LICENSE file that accompanied this code.
    9.13 -#
    9.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
    9.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    9.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    9.17 -# version 2 for more details (a copy is included in the LICENSE file that
    9.18 -# accompanied this code).
    9.19 -#
    9.20 -# You should have received a copy of the GNU General Public License version
    9.21 -# 2 along with this work; if not, write to the Free Software Foundation,
    9.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    9.23 -#
    9.24 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    9.25 -# CA 95054 USA or visit www.sun.com if you need additional information or
    9.26 -# have any questions.
    9.27 -#
    9.28 -
    9.29 -# This is the JDK used to build and run the bootstrap version of javac.
    9.30 -# The bootstrap javac is used to compile both boostrap versions of the
    9.31 -# other tools, and product versions of all the tools.
    9.32 -# Override this path as needed, either on the command line or in 
    9.33 -# one of the standard user build.properties files (see build.xml)
    9.34 -
    9.35 -# options for the <javac> tasks used to compile the tools
    9.36 -javac.source = 7
    9.37 -javac.target = 7
    9.38 -javac.debug = true
    9.39 -javac.no.jdk.warnings = -XDignore.symbol.file=true
    9.40 -# set the following to -version to verify the versions of javac being used
    9.41 -javac.version.opt = 
    9.42 -# in time, there should be no exceptions to -Xlint:all
    9.43 -javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror
    9.44 -
    9.45 -# JVM memory size
    9.46 -javac.memoryInitialSize = 128m
    9.47 -javac.memoryMaximumSize = 256m
    9.48 -
    9.49 -#------------------------------------------------------------
    10.1 --- a/make/build.xml	Thu Sep 17 13:46:52 2009 -0700
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,131 +0,0 @@
    10.4 -<?xml version="1.0"?>
    10.5 -<!--
    10.6 - Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
    10.7 - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.8 -
    10.9 - This code is free software; you can redistribute it and/or modify it
   10.10 - under the terms of the GNU General Public License version 2 only, as
   10.11 - published by the Free Software Foundation.  Sun designates this
   10.12 - particular file as subject to the "Classpath" exception as provided
   10.13 - by Sun in the LICENSE file that accompanied this code.
   10.14 -
   10.15 - This code is distributed in the hope that it will be useful, but WITHOUT
   10.16 - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   10.17 - FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   10.18 - version 2 for more details (a copy is included in the LICENSE file that
   10.19 - accompanied this code).
   10.20 -
   10.21 - You should have received a copy of the GNU General Public License version
   10.22 - 2 along with this work; if not, write to the Free Software Foundation,
   10.23 - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   10.24 -
   10.25 - Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   10.26 - CA 95054 USA or visit www.sun.com if you need additional information or
   10.27 - have any questions.
   10.28 --->
   10.29 -
   10.30 -<!--
   10.31 - This is the main build file for the jaxws workspace.
   10.32 - -->
   10.33 -
   10.34 -<project name="jaxws" default="all" basedir=".">
   10.35 -
   10.36 -    <!-- Convenient shorthands for standard locations within the workspace. -->
   10.37 -    <property file="build.properties"/>
   10.38 -    <property name="topdir" value=".."/>
   10.39 -    <property name="build.dir" location="${topdir}/build"/>
   10.40 -    <property name="build.classes.dir" location="${build.dir}/classes"/>
   10.41 -    <property name="build.gensrc.dir" location="${build.dir}/gensrc"/>
   10.42 -    <property name="build.toolclasses.dir" location="${build.dir}/toolclasses"/>
   10.43 -    <property name="dist.dir" location="${topdir}/dist"/>
   10.44 -    <property name="dist.lib.dir" location="${dist.dir}/lib"/>
   10.45 -    <property name="make.dir" location="${topdir}/make"/>
   10.46 -    <property name="make.tools.dir" location="${make.dir}/tools"/>
   10.47 -    <property name="src.dir" location="${topdir}/src"/>
   10.48 -    <property name="src.classes.dir" location="${src.dir}/share/classes"/>
   10.49 -    <property environment="env"/>
   10.50 -
   10.51 -    <target name="build" depends="banner, build-classes, build-tools, build-binaries">
   10.52 -	<mkdir dir="${dist.lib.dir}"/>
   10.53 -	<jar file="${dist.lib.dir}/classes.jar" basedir="${build.classes.dir}"/>
   10.54 -	<zip file="${dist.lib.dir}/src.zip" basedir="${src.classes.dir}"/>
   10.55 -    </target>
   10.56 -
   10.57 -    <!-- Debug information -->
   10.58 -    <target name="sanity"
   10.59 -        description="display settings of configuration values">
   10.60 -        <echo level="info">ant.home = ${ant.home}</echo>
   10.61 -        <echo level="info">java.home = ${env.JAVA_HOME}</echo>
   10.62 -        <echo level="info">bootstrap.dir = ${bootstrap.dir}</echo>
   10.63 -    </target>
   10.64 -
   10.65 -    <target name="build-tools" depends="-defs-pstrip">
   10.66 -        <mkdir dir="${build.dir}"/>
   10.67 -        <mkdir dir="${build.classes.dir}"/>
   10.68 -	    <pstrip srcdir="${src.classes.dir}"
   10.69 -                    destdir="${build.classes.dir}"
   10.70 -		    includes="**/*.properties"/>
   10.71 -    </target>
   10.72 -
   10.73 -    <target name="build-binaries">
   10.74 -        <mkdir dir="${build.dir}"/>
   10.75 -        <mkdir dir="${build.classes.dir}"/>
   10.76 -            <copy todir="${build.classes.dir}">
   10.77 -                 <fileset dir="${src.classes.dir}"
   10.78 -                     includes="**/*.xsd, **/*.default"
   10.79 -                     excludes="**/*.java, **/*.package.html, **/*.properties"/>
   10.80 -            </copy>
   10.81 -        <mkdir dir="${build.classes.dir}/META-INF/services"/>
   10.82 -            <copy todir="${build.classes.dir}/META-INF/services"
   10.83 -                  file="${src.classes.dir}/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory"/>
   10.84 -            <copy todir="${build.classes.dir}/META-INF/services"
   10.85 -                  file="${src.classes.dir}/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin"/>
   10.86 - 	    <!-- copy jaxb sources files required for jaxb tool time -->	
   10.87 -           <mkdir dir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime"/>
   10.88 -            <copy todir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime">
   10.89 -                 <fileset dir="${src.classes.dir}/com/sun/tools/internal/xjc/runtime"
   10.90 -                     includes="**/*.java"
   10.91 -                     excludes="**/*.package.html"/>
   10.92 -            </copy>
   10.93 -    </target>
   10.94 -
   10.95 -    <target name="-defs-pstrip">
   10.96 -      <mkdir dir="${build.toolclasses.dir}"/>
   10.97 -      <javac srcdir="${make.tools.dir}/StripProperties"
   10.98 -		destdir="${build.toolclasses.dir}/"
   10.99 -		classpath="${ant.home}/lib/ant.jar"/>
  10.100 -      <taskdef name="pstrip"
  10.101 -		 classname="StripPropertiesTask"
  10.102 -		 classpath="${build.toolclasses.dir}/"/>
  10.103 -    </target>
  10.104 -
  10.105 -    <target name="build-classes" depends="sanity">
  10.106 -      <mkdir dir="${build.dir}"/>
  10.107 -      <mkdir dir="${build.classes.dir}"/>
  10.108 -      <javac fork="true"
  10.109 -             srcdir="${src.classes.dir}"
  10.110 -             destdir="${build.classes.dir}"
  10.111 -             memoryInitialSize="${javac.memoryInitialSize}"
  10.112 -             memoryMaximumSize="${javac.memoryMaximumSize}"
  10.113 -             source="${javac.source}"
  10.114 -	     debug="${javac.debug}"
  10.115 -             target="${javac.target}"
  10.116 -             excludes="com/sun/tools/internal/txw2/**">
  10.117 -         <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
  10.118 -         <compilerarg line="${javac.version.opt}"/>
  10.119 -         <compilerarg line="${javac.no.jdk.warnings}"/>
  10.120 -      </javac>
  10.121 -    </target>
  10.122 -
  10.123 -    <target name="clean" description="Delete all generated files">
  10.124 -	<delete dir="${build.dir}"/>
  10.125 -	<delete dir="${dist.dir}"/>
  10.126 -    </target>
  10.127 -
  10.128 -    <target name="banner">
  10.129 -      <echo>+---------------------------------------+</echo>
  10.130 -      <echo>+    Building JAX-WS Component          +</echo>
  10.131 -      <echo>+---------------------------------------+</echo>
  10.132 -    </target>
  10.133 -
  10.134 -</project>
    11.1 --- a/make/jprt.properties	Thu Sep 17 13:46:52 2009 -0700
    11.2 +++ b/make/jprt.properties	Mon Sep 21 13:57:02 2009 -0700
    11.3 @@ -1,5 +1,5 @@
    11.4  #
    11.5 -# Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
    11.6 +# Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
    11.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    11.8  #
    11.9  # This code is free software; you can redistribute it and/or modify it
   11.10 @@ -34,8 +34,8 @@
   11.11  solaris_x64_5.10,\
   11.12  linux_i586_2.6,\
   11.13  linux_x64_2.6,\
   11.14 -windows_i586,\
   11.15 -windows_x64
   11.16 +windows_i586_5.0,\
   11.17 +windows_x64_5.2
   11.18  
   11.19  # The different build flavors we want
   11.20  jprt.build.flavors=product,fastdebug
   11.21 @@ -49,7 +49,6 @@
   11.22  # Standard list of jprt test targets for this workspace
   11.23  jprt.test.targets=
   11.24  
   11.25 -# Directories needed to build
   11.26 -jprt.bundle.src.dirs=make src
   11.27 +# Directories needing to exclude from source bundles
   11.28  jprt.bundle.exclude.src.dirs=build dist
   11.29  
    12.1 --- a/make/tools/StripProperties/StripProperties.java	Thu Sep 17 13:46:52 2009 -0700
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,329 +0,0 @@
    12.4 -/*
    12.5 - * Copyright 2001 Sun Microsystems, Inc.  All Rights Reserved.
    12.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.7 - *
    12.8 - * This code is free software; you can redistribute it and/or modify it
    12.9 - * under the terms of the GNU General Public License version 2 only, as
   12.10 - * published by the Free Software Foundation.  Sun designates this
   12.11 - * particular file as subject to the "Classpath" exception as provided
   12.12 - * by Sun in the LICENSE file that accompanied this code.
   12.13 - *
   12.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
   12.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   12.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   12.17 - * version 2 for more details (a copy is included in the LICENSE file that
   12.18 - * accompanied this code).
   12.19 - *
   12.20 - * You should have received a copy of the GNU General Public License version
   12.21 - * 2 along with this work; if not, write to the Free Software Foundation,
   12.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   12.23 - *
   12.24 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   12.25 - * CA 95054 USA or visit www.sun.com if you need additional information or
   12.26 - * have any questions.
   12.27 - */
   12.28 -
   12.29 -import java.io.BufferedInputStream;
   12.30 -import java.io.BufferedWriter;
   12.31 -import java.io.FileInputStream;
   12.32 -import java.io.FileNotFoundException;
   12.33 -import java.io.FileOutputStream;
   12.34 -import java.io.OutputStream;
   12.35 -import java.io.OutputStreamWriter;
   12.36 -import java.io.IOException;
   12.37 -import java.io.InputStream;
   12.38 -import java.util.ArrayList;
   12.39 -import java.util.Enumeration;
   12.40 -import java.util.List;
   12.41 -import java.util.Properties;
   12.42 -
   12.43 -/**
   12.44 - * Reads a properties file from standard input and writes an equivalent
   12.45 - * properties file without comments to standard output.
   12.46 - */
   12.47 -public class StripProperties {
   12.48 -
   12.49 -    public static void main(String[] args) {
   12.50 -        StripProperties sp = new StripProperties();
   12.51 -        boolean ok = sp.run(args);
   12.52 -        if ( !ok ) {
   12.53 -            System.exit(1);
   12.54 -        }
   12.55 -    }
   12.56 -
   12.57 -    static interface Log {
   12.58 -        void info(String msg);
   12.59 -        void verbose(String msg);
   12.60 -        void error(String msg, Exception e);
   12.61 -    }
   12.62 -
   12.63 -    private String propfiles[];
   12.64 -    private String outfiles[] ;
   12.65 -    private int stripCount = 0;
   12.66 -    private boolean quiet = false;
   12.67 -    private Log log;
   12.68 -
   12.69 -    public void setLog(Log log) {
   12.70 -        this.log = log;
   12.71 -    }
   12.72 -
   12.73 -    private boolean parseOptions(String args[]) {
   12.74 -        boolean ok = true;
   12.75 -        if ( stripCount > 0 ) {
   12.76 -            String new_propfiles[] = new String[stripCount + args.length];
   12.77 -            String new_outfiles[]  = new String[stripCount + args.length];
   12.78 -            System.arraycopy(propfiles, 0, new_propfiles, 0, stripCount);
   12.79 -            System.arraycopy(outfiles, 0, new_outfiles, 0, stripCount);
   12.80 -            propfiles = new_propfiles;
   12.81 -            outfiles  = new_outfiles;
   12.82 -        } else {
   12.83 -            propfiles = new String[args.length];
   12.84 -            outfiles  = new String[args.length];
   12.85 -        }
   12.86 -
   12.87 -        for ( int i = 0; i < args.length ; i++ ) {
   12.88 -            if ( "-strip".equals(args[i]) && i+2 < args.length ) {
   12.89 -                propfiles[stripCount] = args[++i];
   12.90 -                outfiles[stripCount]    = args[++i];
   12.91 -                stripCount++;
   12.92 -            } else if ( "-optionsfile".equals(args[i]) && i+1 < args.length ) {
   12.93 -                String filename = args[++i];
   12.94 -                FileInputStream finput = null;
   12.95 -                byte contents[] = null;
   12.96 -                try {
   12.97 -                    finput = new FileInputStream(filename);
   12.98 -                    int byteCount = finput.available();
   12.99 -                    if ( byteCount <= 0 ) {
  12.100 -                        log.error("The -optionsfile file is empty", null);
  12.101 -                        ok = false;
  12.102 -                    } else {
  12.103 -                        contents = new byte[byteCount];
  12.104 -                        int bytesRead = finput.read(contents);
  12.105 -                        if ( byteCount != bytesRead ) {
  12.106 -                            log.error("Cannot read all of -optionsfile file", null);
  12.107 -                            ok = false;
  12.108 -                        }
  12.109 -                    }
  12.110 -                } catch ( IOException e ) {
  12.111 -                    log.error("cannot open " + filename, e);
  12.112 -                    ok = false;
  12.113 -                }
  12.114 -                if ( finput != null ) {
  12.115 -                    try {
  12.116 -                        finput.close();
  12.117 -                    } catch ( IOException e ) {
  12.118 -                        ok = false;
  12.119 -                        log.error("cannot close " + filename, e);
  12.120 -                    }
  12.121 -                }
  12.122 -                if ( ok = true && contents != null ) {
  12.123 -                    String tokens[] = (new String(contents)).split("\\s+");
  12.124 -                    if ( tokens.length > 0 ) {
  12.125 -                        ok = parseOptions(tokens);
  12.126 -                    }
  12.127 -                }
  12.128 -                if ( !ok ) {
  12.129 -                    break;
  12.130 -                }
  12.131 -        } else if ( "-quiet".equals(args[i]) ) {
  12.132 -                quiet = true;
  12.133 -        } else {
  12.134 -                log.error("argument error", null);
  12.135 -                ok = false;
  12.136 -        }
  12.137 -        }
  12.138 -        return ok;
  12.139 -    }
  12.140 -
  12.141 -    private boolean stripFiles(String propertiesPath, String outputPath) {
  12.142 -        boolean ok = true;
  12.143 -        Properties prop = new Properties();
  12.144 -        InputStream in = null;
  12.145 -        try {
  12.146 -                in = new BufferedInputStream(new FileInputStream(propertiesPath));
  12.147 -                prop.load(in);
  12.148 -        } catch ( FileNotFoundException e ) {
  12.149 -                log.error("Cannot access file " + propertiesPath, e);
  12.150 -                ok = false;
  12.151 -        } catch ( IOException e ) {
  12.152 -                log.error("IO exception processing file " + propertiesPath, e);
  12.153 -                ok = false;
  12.154 -        }
  12.155 -        if ( in != null ) {
  12.156 -                try {
  12.157 -                    in.close();
  12.158 -                } catch ( IOException e ) {
  12.159 -                    log.error("IO exception closing file " + propertiesPath, e);
  12.160 -                    ok = false;
  12.161 -                }
  12.162 -        }
  12.163 -
  12.164 -        OutputStream out = null;
  12.165 -        try {
  12.166 -                out = new FileOutputStream(outputPath);
  12.167 -                storeProperties(prop, out);
  12.168 -                out.flush();
  12.169 -        } catch ( IOException e ) {
  12.170 -                log.error("IO exception processing file " + outputPath, e);
  12.171 -                e.printStackTrace();
  12.172 -                ok = false;
  12.173 -        }
  12.174 -        if ( out != null ) {
  12.175 -           try {
  12.176 -                    out.close();
  12.177 -           } catch ( IOException e ) {
  12.178 -                    log.error("IO exception closing file " + outputPath, e);
  12.179 -                    ok = false;
  12.180 -           }
  12.181 -        }
  12.182 -        return ok;
  12.183 -    }
  12.184 -
  12.185 -    /**
  12.186 -     * Strip the properties filenames supplied, replacing their contents.
  12.187 -     * @param args Names of properties files to process and replace contents
  12.188 -     */
  12.189 -    public boolean run(String args[]) {
  12.190 -        if (log == null) {
  12.191 -            log = new Log() {
  12.192 -                public void error(String msg, Exception e) {
  12.193 -                    System.err.println("ERROR: StripProperties: " + msg);
  12.194 -                    if ( e != null ) {
  12.195 -                        System.err.println("EXCEPTION: " + e.toString());
  12.196 -                        e.printStackTrace();
  12.197 -                    }
  12.198 -                }
  12.199 -                public void info(String msg) {
  12.200 -                    System.out.println(msg);
  12.201 -                }
  12.202 -                public void verbose(String msg) {
  12.203 -                    if (!quiet)
  12.204 -                        System.out.println(msg);
  12.205 -                }
  12.206 -            };
  12.207 -        }
  12.208 -
  12.209 -        boolean ok = true;
  12.210 -        ok = parseOptions(args);
  12.211 -        if ( ok && stripCount == 0 ) {
  12.212 -                log.error("options parsed but no files to compile", null);
  12.213 -                ok = false;
  12.214 -        }
  12.215 -        /* Need at least one file. */
  12.216 -        if ( !ok ) {
  12.217 -            //usage(log);
  12.218 -        } else {
  12.219 -            /* Process files */
  12.220 -            for ( int i = 0; i < stripCount && ok ; i++ ) {
  12.221 -                    ok = stripFiles(propfiles[i], outfiles[i]);
  12.222 -            }
  12.223 -        }
  12.224 -        return ok;
  12.225 -    }
  12.226 -
  12.227 -    // --- code below here is adapted from java.util.Properties ---
  12.228 -
  12.229 -    private static final String specialSaveChars = "=: \t\r\n\f#!";
  12.230 -
  12.231 -    /*
  12.232 -     * Converts unicodes to encoded &#92;uxxxx
  12.233 -     * and writes out any of the characters in specialSaveChars
  12.234 -     * with a preceding slash
  12.235 -     */
  12.236 -    private static String saveConvert(String theString, boolean escapeSpace) {
  12.237 -        int len = theString.length();
  12.238 -        StringBuffer outBuffer = new StringBuffer(len*2);
  12.239 -
  12.240 -        for(int x=0; x<len; x++) {
  12.241 -            char aChar = theString.charAt(x);
  12.242 -            switch(aChar) {
  12.243 -                case ' ':
  12.244 -                    if (x == 0 || escapeSpace) {
  12.245 -                        outBuffer.append('\\');
  12.246 -                    }
  12.247 -                    outBuffer.append(' ');
  12.248 -                    break;
  12.249 -                case '\\':
  12.250 -                    outBuffer.append('\\');
  12.251 -                    outBuffer.append('\\');
  12.252 -                    break;
  12.253 -                case '\t':
  12.254 -                    outBuffer.append('\\');
  12.255 -                    outBuffer.append('t');
  12.256 -                    break;
  12.257 -                case '\n':
  12.258 -                    outBuffer.append('\\');
  12.259 -                    outBuffer.append('n');
  12.260 -                    break;
  12.261 -                case '\r':
  12.262 -                    outBuffer.append('\\');
  12.263 -                    outBuffer.append('r');
  12.264 -                    break;
  12.265 -                case '\f':
  12.266 -                    outBuffer.append('\\');
  12.267 -                    outBuffer.append('f');
  12.268 -                    break;
  12.269 -                default:
  12.270 -                    if ((aChar < 0x0020) || (aChar == 0x007e) || (aChar > 0x00ff)) {
  12.271 -                        outBuffer.append('\\');
  12.272 -                        outBuffer.append('u');
  12.273 -                        outBuffer.append(toHex((aChar >> 12) & 0xF));
  12.274 -                        outBuffer.append(toHex((aChar >>  8) & 0xF));
  12.275 -                        outBuffer.append(toHex((aChar >>  4) & 0xF));
  12.276 -                        outBuffer.append(toHex( aChar        & 0xF));
  12.277 -                    } else {
  12.278 -                        if (specialSaveChars.indexOf(aChar) != -1) {
  12.279 -                            outBuffer.append('\\');
  12.280 -                        }
  12.281 -                        outBuffer.append(aChar);
  12.282 -                    }
  12.283 -            }
  12.284 -        }
  12.285 -        return outBuffer.toString();
  12.286 -    }
  12.287 -
  12.288 -    /**
  12.289 -     * Writes the content of <code>properties</code> to <code>out</code>.
  12.290 -     * The format is that of Properties.store with the following modifications:
  12.291 -     * <ul>
  12.292 -     * <li>No header or date is written
  12.293 -     * <li>Latin-1 characters are written as single bytes, not escape sequences
  12.294 -     * <li>Line breaks are indicated by a single \n independent of platform
  12.295 -     * <ul>
  12.296 -     */
  12.297 -    private static void storeProperties(Properties properties, OutputStream out)
  12.298 -    throws IOException {
  12.299 -        BufferedWriter awriter;
  12.300 -        awriter = new BufferedWriter(new OutputStreamWriter(out, "8859_1"));
  12.301 -        for (Enumeration e = properties.keys(); e.hasMoreElements();) {
  12.302 -            String key = (String)e.nextElement();
  12.303 -            String val = (String)properties.get(key);
  12.304 -            key = saveConvert(key, true);
  12.305 -
  12.306 -            /* No need to escape embedded and trailing spaces for value, hence
  12.307 -             * pass false to flag.
  12.308 -             */
  12.309 -            val = saveConvert(val, false);
  12.310 -            writeln(awriter, key + "=" + val);
  12.311 -        }
  12.312 -        awriter.flush();
  12.313 -    }
  12.314 -
  12.315 -    private static void writeln(BufferedWriter bw, String s) throws IOException {
  12.316 -        bw.write(s);
  12.317 -        bw.write("\n");
  12.318 -    }
  12.319 -
  12.320 -    /**
  12.321 -     * Convert a nibble to a hex character
  12.322 -     * @param   nibble  the nibble to convert.
  12.323 -     */
  12.324 -    private static char toHex(int nibble) {
  12.325 -        return hexDigit[(nibble & 0xF)];
  12.326 -    }
  12.327 -
  12.328 -    /** A table of hex digits */
  12.329 -    private static final char[] hexDigit = {
  12.330 -        '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'
  12.331 -    };
  12.332 -}
    13.1 --- a/make/tools/StripProperties/StripPropertiesTask.java	Thu Sep 17 13:46:52 2009 -0700
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,87 +0,0 @@
    13.4 -/*
    13.5 - * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
    13.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.7 - *
    13.8 - * This code is free software; you can redistribute it and/or modify it
    13.9 - * under the terms of the GNU General Public License version 2 only, as
   13.10 - * published by the Free Software Foundation.  Sun designates this
   13.11 - * particular file as subject to the "Classpath" exception as provided
   13.12 - * by Sun in the LICENSE file that accompanied this code.
   13.13 - *
   13.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
   13.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   13.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   13.17 - * version 2 for more details (a copy is included in the LICENSE file that
   13.18 - * accompanied this code).
   13.19 - *
   13.20 - * You should have received a copy of the GNU General Public License version
   13.21 - * 2 along with this work; if not, write to the Free Software Foundation,
   13.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   13.23 - *
   13.24 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   13.25 - * CA 95054 USA or visit www.sun.com if you need additional information or
   13.26 - * have any questions.
   13.27 - */
   13.28 -
   13.29 -import java.io.File;
   13.30 -import java.util.ArrayList;
   13.31 -import java.util.List;
   13.32 -
   13.33 -import org.apache.tools.ant.BuildException;
   13.34 -import org.apache.tools.ant.DirectoryScanner;
   13.35 -import org.apache.tools.ant.Project;
   13.36 -import org.apache.tools.ant.taskdefs.MatchingTask;
   13.37 -
   13.38 -public class StripPropertiesTask extends MatchingTask {
   13.39 -    public void setSrcDir(File srcDir) {
   13.40 -        this.srcDir = srcDir;
   13.41 -    }
   13.42 -
   13.43 -    public void setDestDir(File destDir) {
   13.44 -        this.destDir = destDir;
   13.45 -    }
   13.46 -
   13.47 -    public void execute() {
   13.48 -        StripProperties.Log log = new StripProperties.Log() {
   13.49 -            public void error(String msg, Exception e) {
   13.50 -                log(msg, Project.MSG_ERR);
   13.51 -            }
   13.52 -            public void info(String msg) {
   13.53 -                log(msg, Project.MSG_INFO);
   13.54 -            }
   13.55 -            public void verbose(String msg) {
   13.56 -                log(msg, Project.MSG_VERBOSE);
   13.57 -            }
   13.58 -        };
   13.59 -        List<String> mainOpts = new ArrayList<String>();
   13.60 -        int count = 0;
   13.61 -        DirectoryScanner s = getDirectoryScanner(srcDir);
   13.62 -        for (String path: s.getIncludedFiles()) {
   13.63 -            if (path.endsWith(".properties")) {
   13.64 -                File srcFile = new File(srcDir, path);
   13.65 -                File destFile = new File(destDir, path);
   13.66 -                // Arguably, the comparison in the next line should be ">", not ">="
   13.67 -                // but that assumes the resolution of the last modified time is fine
   13.68 -                // grained enough; in practice, it is better to use ">=".
   13.69 -                if (destFile.exists() && destFile.lastModified() >= srcFile.lastModified())
   13.70 -                    continue;
   13.71 -                destFile.getParentFile().mkdirs();
   13.72 -                mainOpts.add("-strip");
   13.73 -                mainOpts.add(srcFile.getPath());
   13.74 -                mainOpts.add(destFile.getPath());
   13.75 -                count++;
   13.76 -            }
   13.77 -        }
   13.78 -        if (mainOpts.size() > 0) {
   13.79 -            log("Generating " + count + " resource files to " + destDir, Project.MSG_INFO);
   13.80 -            StripProperties sp = new StripProperties();
   13.81 -            sp.setLog(log);
   13.82 -            boolean ok = sp.run((String[])mainOpts.toArray(new String[mainOpts.size()]));
   13.83 -            if (!ok)
   13.84 -                throw new BuildException("StripProperties failed.");
   13.85 -        }
   13.86 -    }
   13.87 -
   13.88 -    private File srcDir;
   13.89 -    private File destDir;
   13.90 -}
    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/nbproject/findbugs.settings	Mon Sep 21 13:57:02 2009 -0700
    14.3 @@ -0,0 +1,72 @@
    14.4 +#FindBugs User Preferences
    14.5 +#Tue Jun 30 18:33:11 PDT 2009
    14.6 +detectorAbnormalFinallyBlockReturn=AbnormalFinallyBlockReturn|false
    14.7 +detectorAbstractClassEmptyMethods=AbstractClassEmptyMethods|false
    14.8 +detectorAbstractOverriddenMethod=AbstractOverriddenMethod|false
    14.9 +detectorArrayBasedCollections=ArrayBasedCollections|false
   14.10 +detectorArrayWrappedCallByReference=ArrayWrappedCallByReference|false
   14.11 +detectorBloatedAssignmentScope=BloatedAssignmentScope|false
   14.12 +detectorBloatedSynchronizedBlock=BloatedSynchronizedBlock|false
   14.13 +detectorClassEnvy=ClassEnvy|false
   14.14 +detectorCollectStatistics=CollectStatistics|false
   14.15 +detectorConfusingAutoboxedOverloading=ConfusingAutoboxedOverloading|false
   14.16 +detectorConstantListIndex=ConstantListIndex|false
   14.17 +detectorCopiedOverriddenMethod=CopiedOverriddenMethod|false
   14.18 +detectorCustomBuiltXML=CustomBuiltXML|false
   14.19 +detectorCyclomaticComplexity=CyclomaticComplexity|false
   14.20 +detectorDateComparison=DateComparison|false
   14.21 +detectorDeclaredRuntimeException=DeclaredRuntimeException|false
   14.22 +detectorDeletingWhileIterating=DeletingWhileIterating|false
   14.23 +detectorDubiousListCollection=DubiousListCollection|false
   14.24 +detectorFieldCouldBeLocal=FieldCouldBeLocal|false
   14.25 +detectorFinalParameters=FinalParameters|false
   14.26 +detectorFloatingPointLoops=FloatingPointLoops|false
   14.27 +detectorInefficientStringBuffering=InefficientStringBuffering|false
   14.28 +detectorInheritanceTypeChecking=InheritanceTypeChecking|false
   14.29 +detectorJDBCVendorReliance=JDBCVendorReliance|false
   14.30 +detectorListIndexedIterating=ListIndexedIterating|false
   14.31 +detectorLiteralStringComparison=LiteralStringComparison|false
   14.32 +detectorLocalSynchronizedCollection=LocalSynchronizedCollection|false
   14.33 +detectorLostExceptionStackTrace=LostExceptionStackTrace|false
   14.34 +detectorManualArrayCopy=ManualArrayCopy|false
   14.35 +detectorMethodReturnsConstant=MethodReturnsConstant|false
   14.36 +detectorNeedlessAutoboxing=NeedlessAutoboxing|false
   14.37 +detectorNeedlessCustomSerialization=NeedlessCustomSerialization|false
   14.38 +detectorNeedlessInstanceRetrieval=NeedlessInstanceRetrieval|false
   14.39 +detectorNeedlessMemberCollectionSynchronization=NeedlessMemberCollectionSynchronization|false
   14.40 +detectorNonCollectionMethodUse=NonCollectionMethodUse|false
   14.41 +detectorNonOwnedSynchronization=NonOwnedSynchronization|false
   14.42 +detectorNonRecycleableTaglibs=NonRecycleableTaglibs|false
   14.43 +detectorOrphanedDOMNode=OrphanedDOMNode|false
   14.44 +detectorOverlyConcreteParameter=OverlyConcreteParameter|false
   14.45 +detectorParallelLists=ParallelLists|false
   14.46 +detectorPartiallyConstructedObjectAccess=PartiallyConstructedObjectAccess|false
   14.47 +detectorPossibleIncompleteSerialization=PossibleIncompleteSerialization|false
   14.48 +detectorPossibleMemoryBloat=PossibleMemoryBloat|false
   14.49 +detectorPossiblyRedundantMethodCalls=PossiblyRedundantMethodCalls|false
   14.50 +detectorSQLInLoop=SQLInLoop|false
   14.51 +detectorSection508Compliance=Section508Compliance|false
   14.52 +detectorSillynessPotPourri=SillynessPotPourri|false
   14.53 +detectorSloppyClassReflection=SloppyClassReflection|false
   14.54 +detectorSluggishGui=SluggishGui|false
   14.55 +detectorSpoiledChildInterfaceImplementor=SpoiledChildInterfaceImplementor|false
   14.56 +detectorSpuriousThreadStates=SpuriousThreadStates|false
   14.57 +detectorStaticArrayCreatedInMethod=StaticArrayCreatedInMethod|false
   14.58 +detectorStaticMethodInstanceInvocation=StaticMethodInstanceInvocation|false
   14.59 +detectorSuspiciousComparatorReturnValues=SuspiciousComparatorReturnValues|false
   14.60 +detectorSuspiciousJDKVersionUse=SuspiciousJDKVersionUse|false
   14.61 +detectorSuspiciousWaitOnConcurrentObject=SuspiciousWaitOnConcurrentObject|false
   14.62 +detectorSyncCollectionIterators=SyncCollectionIterators|false
   14.63 +detectorTailRecursion=TailRecursion|false
   14.64 +detectorUnnecessaryStoreBeforeReturn=UnnecessaryStoreBeforeReturn|false
   14.65 +detectorUnrelatedCollectionContents=UnrelatedCollectionContents|false
   14.66 +detectorUnrelatedReturnValues=UnrelatedReturnValues|false
   14.67 +detectorUseAddAll=UseAddAll|false
   14.68 +detectorUseCharacterParameterizedMethod=UseCharacterParameterizedMethod|false
   14.69 +detectorUseEnumCollections=UseEnumCollections|false
   14.70 +detectorUseSplit=UseSplit|false
   14.71 +detectorUseToArray=UseToArray|false
   14.72 +detector_threshold=2
   14.73 +effort=default
   14.74 +filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false
   14.75 +filter_settings_neg=|
    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/nbproject/project.xml	Mon Sep 21 13:57:02 2009 -0700
    15.3 @@ -0,0 +1,50 @@
    15.4 +<?xml version="1.0" encoding="UTF-8"?>
    15.5 +<project xmlns="http://www.netbeans.org/ns/project/1">
    15.6 +    <type>org.netbeans.modules.ant.freeform</type>
    15.7 +    <configuration>
    15.8 +        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
    15.9 +            <name>jaxws</name>
   15.10 +        </general-data>
   15.11 +        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
   15.12 +            <!-- Do not use Project Properties customizer when editing this file manually. -->
   15.13 +            <name>jaxws</name>
   15.14 +            <properties/>
   15.15 +            <folders>
   15.16 +                <source-folder>
   15.17 +                    <label>jaxws</label>
   15.18 +                    <location>.</location>
   15.19 +                    <encoding>UTF-8</encoding>
   15.20 +                </source-folder>
   15.21 +            </folders>
   15.22 +            <ide-actions>
   15.23 +                <action name="build">
   15.24 +                    <target>build</target>
   15.25 +                </action>
   15.26 +                <action name="clean">
   15.27 +                    <target>clean</target>
   15.28 +                </action>
   15.29 +                <action name="rebuild">
   15.30 +                    <target>clean</target>
   15.31 +                    <target>build</target>
   15.32 +                </action>
   15.33 +            </ide-actions>
   15.34 +            <view>
   15.35 +                <items>
   15.36 +                    <source-file>
   15.37 +                        <location>build.xml</location>
   15.38 +                    </source-file>
   15.39 +                </items>
   15.40 +                <context-menu>
   15.41 +                    <ide-action name="build"/>
   15.42 +                    <ide-action name="rebuild"/>
   15.43 +                    <ide-action name="clean"/>
   15.44 +                </context-menu>
   15.45 +            </view>
   15.46 +            <subprojects/>
   15.47 +        </general-data>
   15.48 +        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/>
   15.49 +        <preferences xmlns="http://www.netbeans.org/ns/auxiliary-configuration-preferences/1">
   15.50 +            <module name="org-netbeans-modules-editor-indent"/>
   15.51 +        </preferences>
   15.52 +    </configuration>
   15.53 +</project>
    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/nbproject/sqe.properties	Mon Sep 21 13:57:02 2009 -0700
    16.3 @@ -0,0 +1,2 @@
    16.4 +#Path to FindbugsSettingsFile (relative)
    16.5 +findbugs.settings.file=findbugs.settings
    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/patches/jaxws_src/README	Mon Sep 21 13:57:02 2009 -0700
    17.3 @@ -0,0 +1,5 @@
    17.4 +
    17.5 +This directory will hold any patches that need to be applied to the drop files.
    17.6 +
    17.7 +The patch order is defined in the ant build script properties.
    17.8 +

mercurial