changeset 259:69bbf8c9e29d

Merge
author andrew
date Thu, 02 Jun 2011 18:58:33 +0100
parents b370c1e83853 (current diff) 6bd683f2d527 (diff)
children e514ae6ec042
files .hgtags jaxws.properties make/Makefile
diffstat 7 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Thu Jun 02 17:39:40 2011 +0100
+++ b/.hgignore	Thu Jun 02 18:58:33 2011 +0100
@@ -4,3 +4,4 @@
 ^drop_included/
 ^webrev/
 /nbproject/private/
+^.hgtip
--- a/.hgtags	Thu Jun 02 17:39:40 2011 +0100
+++ b/.hgtags	Thu Jun 02 18:58:33 2011 +0100
@@ -114,3 +114,10 @@
 d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135
 c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136
 339c2d381d80dbf9b74604e6ba43ead276b8024e icedtea-1.14
+ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137
+cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138
+c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139
+82a9022c4f21b1313023c8303b557a17c4106701 jdk7-b140
+66826b0aec5a1834da3821c35cf85ac154e9b04d jdk7-b141
+0ef3ef823c39eee3d670e58027c3219cb66f0283 jdk7-b142
+569d1e7ea980d172046c4aba79d96b5c3afabbba jdk7-b143
--- a/build-defs.xml	Thu Jun 02 17:39:40 2011 +0100
+++ b/build-defs.xml	Thu Jun 02 18:58:33 2011 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 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
--- a/build-drop-template.xml	Thu Jun 02 17:39:40 2011 +0100
+++ b/build-drop-template.xml	Thu Jun 02 18:58:33 2011 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 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
--- a/build.xml	Thu Jun 02 17:39:40 2011 +0100
+++ b/build.xml	Thu Jun 02 18:58:33 2011 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 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
--- a/jaxws.properties	Thu Jun 02 17:39:40 2011 +0100
+++ b/jaxws.properties	Thu Jun 02 18:58:33 2011 +0100
@@ -25,8 +25,8 @@
 
 drops.master.copy.base=${drops.dir}
 
-jaxws_src.bundle.name=jdk7-jaxws2_2_2-2010_12_14.zip
-jaxws_src.bundle.md5.checksum=fee9ac72fabc96719eefc66ecaff4bc3
+jaxws_src.bundle.name=jdk7-jaxws2_2_4-b02-2011_05_09.zip
+jaxws_src.bundle.md5.checksum=0972a58090e8b2735d91a2f5d1ae1964
 jaxws_src.master.bundle.dir=${drops.master.copy.base}
 jaxws_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7
 
--- a/make/Makefile	Thu Jun 02 17:39:40 2011 +0100
+++ b/make/Makefile	Thu Jun 02 18:58:33 2011 +0100
@@ -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