Mercurial > jdk8-mips64-public > jaxws / changeset
changeset
Merge
Wed, 26 May 2010 10:40:39 -0700
- author
- ohair
- date
- Wed, 26 May 2010 10:40:39 -0700
- changeset 117
- ee06cfb113d5
- parent 115
- 3d5bc8c32313
- parent 116
- 4ac192952d75
- child 118
- 208fd4451232
Merge
1.1 --- a/build-defs.xml Thu May 20 16:00:20 2010 -0700 1.2 +++ b/build-defs.xml Wed May 26 10:40:39 2010 -0700 1.3 @@ -1,13 +1,13 @@ 1.4 <?xml version="1.0"?> 1.5 <!-- 1.6 - Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. 1.7 + Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. 1.8 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.9 1.10 This code is free software; you can redistribute it and/or modify it 1.11 under the terms of the GNU General Public License version 2 only, as 1.12 - published by the Free Software Foundation. Sun designates this 1.13 + published by the Free Software Foundation. Oracle designates this 1.14 particular file as subject to the "Classpath" exception as provided 1.15 - by Sun in the LICENSE file that accompanied this code. 1.16 + by Oracle in the LICENSE file that accompanied this code. 1.17 1.18 This code is distributed in the hope that it will be useful, but WITHOUT 1.19 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 1.20 @@ -19,9 +19,9 @@ 1.21 2 along with this work; if not, write to the Free Software Foundation, 1.22 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 1.23 1.24 - Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 1.25 - CA 95054 USA or visit www.sun.com if you need additional information or 1.26 - have any questions. 1.27 + Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 1.28 + or visit www.oracle.com if you need additional information or have any 1.29 + questions. 1.30 --> 1.31 1.32 <project name="jaxws_defs" default="all" basedir=".">
2.1 --- a/build-drop-template.xml Thu May 20 16:00:20 2010 -0700 2.2 +++ b/build-drop-template.xml Wed May 26 10:40:39 2010 -0700 2.3 @@ -1,13 +1,13 @@ 2.4 <?xml version="1.0"?> 2.5 <!-- 2.6 - Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. 2.7 + Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. 2.8 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.9 2.10 This code is free software; you can redistribute it and/or modify it 2.11 under the terms of the GNU General Public License version 2 only, as 2.12 - published by the Free Software Foundation. Sun designates this 2.13 + published by the Free Software Foundation. Oracle designates this 2.14 particular file as subject to the "Classpath" exception as provided 2.15 - by Sun in the LICENSE file that accompanied this code. 2.16 + by Oracle in the LICENSE file that accompanied this code. 2.17 2.18 This code is distributed in the hope that it will be useful, but WITHOUT 2.19 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.20 @@ -19,9 +19,9 @@ 2.21 2 along with this work; if not, write to the Free Software Foundation, 2.22 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.23 2.24 - Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 2.25 - CA 95054 USA or visit www.sun.com if you need additional information or 2.26 - have any questions. 2.27 + Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.28 + or visit www.oracle.com if you need additional information or have any 2.29 + questions. 2.30 --> 2.31 2.32 <project name="@DROP@-drop" default="all" basedir=".">
3.1 --- a/build.properties Thu May 20 16:00:20 2010 -0700 3.2 +++ b/build.properties Wed May 26 10:40:39 2010 -0700 3.3 @@ -1,12 +1,12 @@ 3.4 # 3.5 -# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved. 3.6 +# Copyright (c) 2007, 2009, Oracle and/or its affiliates. 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 +# published by the Free Software Foundation. Oracle designates this 3.13 # particular file as subject to the "Classpath" exception as provided 3.14 -# by Sun in the LICENSE file that accompanied this code. 3.15 +# by Oracle in the LICENSE file that accompanied this code. 3.16 # 3.17 # This code is distributed in the hope that it will be useful, but WITHOUT 3.18 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 3.19 @@ -18,9 +18,9 @@ 3.20 # 2 along with this work; if not, write to the Free Software Foundation, 3.21 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 3.22 # 3.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 3.24 -# CA 95054 USA or visit www.sun.com if you need additional information or 3.25 -# have any questions. 3.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 3.27 +# or visit www.oracle.com if you need additional information or have any 3.28 +# questions. 3.29 # 3.30 3.31 # Base locations where bundles are located
4.1 --- a/build.xml Thu May 20 16:00:20 2010 -0700 4.2 +++ b/build.xml Wed May 26 10:40:39 2010 -0700 4.3 @@ -1,13 +1,13 @@ 4.4 <?xml version="1.0"?> 4.5 <!-- 4.6 - Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. 4.7 + Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. 4.8 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.9 4.10 This code is free software; you can redistribute it and/or modify it 4.11 under the terms of the GNU General Public License version 2 only, as 4.12 - published by the Free Software Foundation. Sun designates this 4.13 + published by the Free Software Foundation. Oracle designates this 4.14 particular file as subject to the "Classpath" exception as provided 4.15 - by Sun in the LICENSE file that accompanied this code. 4.16 + by Oracle in the LICENSE file that accompanied this code. 4.17 4.18 This code is distributed in the hope that it will be useful, but WITHOUT 4.19 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 4.20 @@ -19,9 +19,9 @@ 4.21 2 along with this work; if not, write to the Free Software Foundation, 4.22 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 4.23 4.24 - Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 4.25 - CA 95054 USA or visit www.sun.com if you need additional information or 4.26 - have any questions. 4.27 + Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 4.28 + or visit www.oracle.com if you need additional information or have any 4.29 + questions. 4.30 --> 4.31 4.32 <project name="jaxws" default="all" basedir=".">
5.1 --- a/jaxws.properties Thu May 20 16:00:20 2010 -0700 5.2 +++ b/jaxws.properties Wed May 26 10:40:39 2010 -0700 5.3 @@ -1,12 +1,12 @@ 5.4 # 5.5 -# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved. 5.6 +# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. 5.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.8 # 5.9 # This code is free software; you can redistribute it and/or modify it 5.10 # under the terms of the GNU General Public License version 2 only, as 5.11 -# published by the Free Software Foundation. Sun designates this 5.12 +# published by the Free Software Foundation. Oracle designates this 5.13 # particular file as subject to the "Classpath" exception as provided 5.14 -# by Sun in the LICENSE file that accompanied this code. 5.15 +# by Oracle in the LICENSE file that accompanied this code. 5.16 # 5.17 # This code is distributed in the hope that it will be useful, but WITHOUT 5.18 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 5.19 @@ -18,9 +18,9 @@ 5.20 # 2 along with this work; if not, write to the Free Software Foundation, 5.21 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 5.22 # 5.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 5.24 -# CA 95054 USA or visit www.sun.com if you need additional information or 5.25 -# have any questions. 5.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 5.27 +# or visit www.oracle.com if you need additional information or have any 5.28 +# questions. 5.29 # 5.30 5.31 drops.master.copy.base=${drops.dir}
6.1 --- a/make/Makefile Thu May 20 16:00:20 2010 -0700 6.2 +++ b/make/Makefile Wed May 26 10:40:39 2010 -0700 6.3 @@ -1,12 +1,12 @@ 6.4 # 6.5 -# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved. 6.6 +# Copyright (c) 2007, 2009, Oracle and/or its affiliates. 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 +# published by the Free Software Foundation. Oracle designates this 6.13 # particular file as subject to the "Classpath" exception as provided 6.14 -# by Sun in the LICENSE file that accompanied this code. 6.15 +# by Oracle in the LICENSE file that accompanied this code. 6.16 # 6.17 # This code is distributed in the hope that it will be useful, but WITHOUT 6.18 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 6.19 @@ -18,9 +18,9 @@ 6.20 # 2 along with this work; if not, write to the Free Software Foundation, 6.21 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 6.22 # 6.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 6.24 -# CA 95054 USA or visit www.sun.com if you need additional information or 6.25 -# have any questions. 6.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 6.27 +# or visit www.oracle.com if you need additional information or have any 6.28 +# questions. 6.29 # 6.30 6.31 # Makefile wrapper around Ant build.xml file
7.1 --- a/make/jprt.properties Thu May 20 16:00:20 2010 -0700 7.2 +++ b/make/jprt.properties Wed May 26 10:40:39 2010 -0700 7.3 @@ -1,12 +1,12 @@ 7.4 # 7.5 -# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved. 7.6 +# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. 7.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 7.8 # 7.9 # This code is free software; you can redistribute it and/or modify it 7.10 # under the terms of the GNU General Public License version 2 only, as 7.11 -# published by the Free Software Foundation. Sun designates this 7.12 +# published by the Free Software Foundation. Oracle designates this 7.13 # particular file as subject to the "Classpath" exception as provided 7.14 -# by Sun in the LICENSE file that accompanied this code. 7.15 +# by Oracle in the LICENSE file that accompanied this code. 7.16 # 7.17 # This code is distributed in the hope that it will be useful, but WITHOUT 7.18 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 7.19 @@ -18,9 +18,9 @@ 7.20 # 2 along with this work; if not, write to the Free Software Foundation, 7.21 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 7.22 # 7.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 7.24 -# CA 95054 USA or visit www.sun.com if you need additional information or 7.25 -# have any questions. 7.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 7.27 +# or visit www.oracle.com if you need additional information or have any 7.28 +# questions. 7.29 # 7.30 7.31 # Properties for jprt
