diff options
| author | tbell <none@none> | 2009-04-20 15:14:39 -0700 |
|---|---|---|
| committer | tbell <none@none> | 2009-04-20 15:14:39 -0700 |
| commit | 26100ef649fd4718cbf9c8c9f0420e68881a742c (patch) | |
| tree | ed747ed306912e7d67de16e5276a70a1ecc51979 /make | |
| parent | 56a0eeda39fdea41c03e4fbc14e77bd484f3d045 (diff) | |
| download | jdk8u_jaxws-26100ef649fd4718cbf9c8c9f0420e68881a742c.tar.gz | |
6831313: update jaxws in OpenJDK7 to 2.1 plus bug fixes from OpenJDK 6
6672868: Package javax.xml.ws.wsaddressing not included in make/docs/CORE_PKGS.gmk
Reviewed-by: darcy
Diffstat (limited to 'make')
| -rw-r--r-- | make/Makefile | 2 | ||||
| -rw-r--r-- | make/build.xml | 9 | ||||
| -rw-r--r-- | make/jprt.properties | 18 |
3 files changed, 20 insertions, 9 deletions
diff --git a/make/Makefile b/make/Makefile index 56696720..3dc17bfa 100644 --- a/make/Makefile +++ b/make/Makefile @@ -1,5 +1,5 @@ # -# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/make/build.xml b/make/build.xml index 9f013e99..5b83e558 100644 --- a/make/build.xml +++ b/make/build.xml @@ -78,6 +78,15 @@ <mkdir dir="${build.classes.dir}/META-INF/services"/> <copy todir="${build.classes.dir}/META-INF/services" file="${src.classes.dir}/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory"/> + <copy todir="${build.classes.dir}/META-INF/services" + file="${src.classes.dir}/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin"/> + <!-- copy jaxb sources files required for jaxb tool time --> + <mkdir dir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime"/> + <copy todir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime"> + <fileset dir="${src.classes.dir}/com/sun/tools/internal/xjc/runtime" + includes="**/*.java" + excludes="**/*.package.html"/> + </copy> </target> <target name="-defs-pstrip"> diff --git a/make/jprt.properties b/make/jprt.properties index 26ffd61a..6e213dd2 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -24,13 +24,13 @@ # # Properties for jprt -jprt.tools.default.release=jdk1.7.0 +jprt.tools.default.release=openjdk6 # Specific platform list jprt.build.platforms=\ -solaris_sparc_5.10,\ -solaris_sparcv9_5.10,\ -solaris_i586_5.10,\ +solaris_sparc_5.8,\ +solaris_sparcv9_5.8,\ +solaris_i586_5.8,\ solaris_x64_5.10,\ linux_i586,\ linux_x64,\ @@ -41,10 +41,12 @@ windows_x64 jprt.build.flavors=product # Explicitly designate what the 32bit match is for the 64bit build -jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10 -jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.10 -jprt.solaris_x64.build.platform.match32=solaris_i586_5.10 -jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.10 +jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.8 +jprt.solaris_sparcv9_5.8.build.platform.match32=solaris_sparc_5.8 +jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.8 +jprt.solaris_x64.build.platform.match32=solaris_i586_5.8 +jprt.solaris_x64_5.8.build.platform.match32=solaris_i586_5.8 +jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.8 # Standard list of jprt test targets for this workspace jprt.test.targets= |