# HG changeset patch
# User katleman
# Date 1323291755 28800
# Node ID 76e4bc65bb6550bf7de45cb68a4d2a0359e3b51b
# Parent  1891fc51374faa8bdacd2eb357868afbdf7c0b1b# Parent  928d27710dcbb336f3ab3ec3810b191f0c40691d
Merge

diff -r 1891fc51374f -r 76e4bc65bb65 jaxws/build.properties
--- a/jaxws/build.properties	Thu Dec 01 10:33:23 2011 -0800
+++ b/jaxws/build.properties	Wed Dec 07 13:02:35 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, 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
@@ -25,7 +25,7 @@
 
 # Base locations where bundles are located
 slashjava=/java
-drops.dir=${slashjava}/devtools/share/jdk7-drops
+drops.dir=${slashjava}/devtools/share/jdk8-drops
 
 # This is the JDK used to build and run the bootstrap version of javac.
 # The bootstrap javac is used to compile both boostrap versions of the
diff -r 1891fc51374f -r 76e4bc65bb65 jaxws/make/Makefile
--- a/jaxws/make/Makefile	Thu Dec 01 10:33:23 2011 -0800
+++ b/jaxws/make/Makefile	Wed Dec 07 13:02:35 2011 -0800
@@ -99,9 +99,9 @@
   DROPS_DIR = $(ALT_DROPS_DIR)
 else
   ifdef ALT_JDK_DEVTOOLS_DIR
-    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
+    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops
   else
-    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
+    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops
   endif
 endif