changeset 194:4d95dab736b9

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sun, 31 Oct 2010 14:03:14 -0700
parents 58b554fae85e (current diff) 1320fb3bb588 (diff)
children 082c91533088
files
diffstat 3 files changed, 23 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Aug 14 11:45:03 2010 -0700
+++ b/.hgtags	Sun Oct 31 14:03:14 2010 -0700
@@ -80,3 +80,14 @@
 267386d6b923f724309cab855a555e2d86a15c8f jdk7-b103
 bbc4cce6c20aeca4862804a6e8315a2350d43633 jdk7-b104
 39eb4f3031f4a985664cace00fca3bd1eab1e0aa jdk7-b105
+bc45ccc5bcca6cbe4ea433e279d4a93b06ab38c6 jdk7-b106
+017612ea6af417a5e378619704da01bb3a583bdb jdk7-b107
+b1ca39340238a239ba6d8489ad5315215e1366ca jdk7-b108
+4f626e0d70bda68c76bbd0e89d2bc2407f979736 jdk7-b109
+95ecac35fb11530752bd0404c9bf02bcfb30990e jdk7-b110
+2575ebca96c7fb1b78f6ae025a97321210aba309 jdk7-b111
+8e0f0054817f0f73fb33e80fb1333fb45b1d513d jdk7-b112
+d35c94fd22362f478f75b4bfcd2bef6a83cb9b3f jdk7-b113
+400f494c81c5ec87714b705648afbb3cb680bf73 jdk7-b114
+824cc44bd6eba9abae07cc420f7fe3926c1adbd9 jdk7-b115
+376ac153078dd3b5f6d4a0981feee092c1492c96 jdk7-b116
--- a/jaxws.properties	Sat Aug 14 11:45:03 2010 -0700
+++ b/jaxws.properties	Sun Oct 31 14:03:14 2010 -0700
@@ -25,15 +25,15 @@
 
 drops.master.copy.base=${drops.dir}
 
-jaxws_src.bundle.name=jdk7-jaxws-b100.zip
-jaxws_src.bundle.md5.checksum=e4fea255c6222b118bb1d0d3054d36e1
+jaxws_src.bundle.name= jdk7-jaxws2_2-2010_08_19.zip
+jaxws_src.bundle.md5.checksum=8775ccefd3b4fa2dde5155ec4b7e4ceb
 jaxws_src.master.bundle.dir=${drops.master.copy.base}
-jaxws_src.master.bundle.url.base=https://jax-ws.dev.java.net/files/documents/4202/150896
+jaxws_src.master.bundle.url.base=https://jax-ws.dev.java.net/files/documents/4202/152532
 
-jaf_src.bundle.name=jdk7-jaf-2009_08_28.zip
-jaf_src.bundle.md5.checksum=eb8cb7a4a7f14e211fbe2354878a2472
+jaf_src.bundle.name=jdk7-jaf-2010_08_19.zip
+jaf_src.bundle.md5.checksum=18d15dfd71117daadb332af003d08212
 jaf_src.master.bundle.dir=${drops.master.copy.base}
-jaf_src.master.bundle.url.base=http://kenai.com/projects/jdk7-drops/downloads/download
+jaf_src.master.bundle.url.base=https://jax-ws.dev.java.net/files/documents/4202/152336
 
 #jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip
 #jaxws_tests.master.bundle.dir=${drops.master.copy.base}
--- a/make/jprt.properties	Sat Aug 14 11:45:03 2010 -0700
+++ b/make/jprt.properties	Sun Oct 31 14:03:14 2010 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. 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
@@ -24,31 +24,13 @@
 #
 
 # Properties for jprt
-jprt.tools.default.release=jdk1.7.0
 
-# Specific platform list
-jprt.build.platforms=\
-solaris_sparc_5.10,\
-solaris_sparcv9_5.10,\
-solaris_i586_5.10,\
-solaris_x64_5.10,\
-linux_i586_2.6,\
-linux_x64_2.6,\
-windows_i586_5.0,\
-windows_x64_5.2
+# Use whatever release that the submitted job requests
+jprt.tools.default.release=${jprt.submit.release}
 
-# The different build flavors we want
+# The different build flavors we want, we override here so we just get these 2
 jprt.build.flavors=product,fastdebug
 
-# 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
+# Directories to be excluded from the source bundles
+jprt.bundle.exclude.src.dirs=build dist webrev
 
-# Standard list of jprt test targets for this workspace
-jprt.test.targets=
-
-# Directories needing to exclude from source bundles
-jprt.bundle.exclude.src.dirs=build dist
-