Mercurial > jdk8-mips64-public > jaxws / changeset
changeset
Merge
Wed, 14 Mar 2012 13:49:09 -0700
- author
- katleman
- date
- Wed, 14 Mar 2012 13:49:09 -0700
- changeset 294
- 6882b10e85d6
- parent 291
- c65c291660eb
- parent 293
- df8e8071a413
- child 295
- 4c41c6d0e15d
Merge
1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/EnvelopeStyle.java Fri Mar 09 11:57:06 2012 -0800 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/EnvelopeStyle.java Wed Mar 14 13:49:09 2012 -0700 1.3 @@ -1,41 +1,26 @@ 1.4 /* 1.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 1.6 + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 1.7 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. 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. Oracle designates this 1.13 + * particular file as subject to the "Classpath" exception as provided 1.14 + * by Oracle in the LICENSE file that accompanied this code. 1.15 * 1.16 - * The contents of this file are subject to the terms of either the GNU 1.17 - * General Public License Version 2 only ("GPL") or the Common Development 1.18 - * and Distribution License("CDDL") (collectively, the "License"). You 1.19 - * may not use this file except in compliance with the License. You can 1.20 - * obtain a copy of the License at 1.21 - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html 1.22 - * or packager/legal/LICENSE.txt. See the License for the specific 1.23 - * language governing permissions and limitations under the License. 1.24 + * This code is distributed in the hope that it will be useful, but WITHOUT 1.25 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 1.26 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 1.27 + * version 2 for more details (a copy is included in the LICENSE file that 1.28 + * accompanied this code). 1.29 * 1.30 - * When distributing the software, include this License Header Notice in each 1.31 - * file and include the License file at packager/legal/LICENSE.txt. 1.32 + * You should have received a copy of the GNU General Public License version 1.33 + * 2 along with this work; if not, write to the Free Software Foundation, 1.34 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 1.35 * 1.36 - * GPL Classpath Exception: 1.37 - * Oracle designates this particular file as subject to the "Classpath" 1.38 - * exception as provided by Oracle in the GPL Version 2 section of the License 1.39 - * file that accompanied this code. 1.40 - * 1.41 - * Modifications: 1.42 - * If applicable, add the following below the License Header, with the fields 1.43 - * enclosed by brackets [] replaced by your own identifying information: 1.44 - * "Portions Copyright [year] [name of copyright owner]" 1.45 - * 1.46 - * Contributor(s): 1.47 - * If you wish your version of this file to be governed by only the CDDL or 1.48 - * only the GPL Version 2, indicate your decision by adding "[Contributor] 1.49 - * elects to include this software in this distribution under the [CDDL or GPL 1.50 - * Version 2] license." If you don't indicate a single choice of license, a 1.51 - * recipient has the option to distribute your version of this file under 1.52 - * either the CDDL, the GPL Version 2 or to extend the choice of license to 1.53 - * its licensees as provided above. However, if you add GPL Version 2 code 1.54 - * and therefore, elected the GPL Version 2 license, then the option applies 1.55 - * only if the new code is made subject to such option by the copyright 1.56 - * holder. 1.57 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 1.58 + * or visit www.oracle.com if you need additional information or have any 1.59 + * questions. 1.60 */ 1.61 1.62 package com.sun.xml.internal.org.jvnet.ws;
2.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/EnvelopeStyleFeature.java Fri Mar 09 11:57:06 2012 -0800 2.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/EnvelopeStyleFeature.java Wed Mar 14 13:49:09 2012 -0700 2.3 @@ -1,41 +1,26 @@ 2.4 /* 2.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 2.6 + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 2.7 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 * 2.9 - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. 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. Oracle designates this 2.13 + * particular file as subject to the "Classpath" exception as provided 2.14 + * by Oracle in the LICENSE file that accompanied this code. 2.15 * 2.16 - * The contents of this file are subject to the terms of either the GNU 2.17 - * General Public License Version 2 only ("GPL") or the Common Development 2.18 - * and Distribution License("CDDL") (collectively, the "License"). You 2.19 - * may not use this file except in compliance with the License. You can 2.20 - * obtain a copy of the License at 2.21 - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html 2.22 - * or packager/legal/LICENSE.txt. See the License for the specific 2.23 - * language governing permissions and limitations under the License. 2.24 + * This code is distributed in the hope that it will be useful, but WITHOUT 2.25 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.26 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.27 + * version 2 for more details (a copy is included in the LICENSE file that 2.28 + * accompanied this code). 2.29 * 2.30 - * When distributing the software, include this License Header Notice in each 2.31 - * file and include the License file at packager/legal/LICENSE.txt. 2.32 + * You should have received a copy of the GNU General Public License version 2.33 + * 2 along with this work; if not, write to the Free Software Foundation, 2.34 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.35 * 2.36 - * GPL Classpath Exception: 2.37 - * Oracle designates this particular file as subject to the "Classpath" 2.38 - * exception as provided by Oracle in the GPL Version 2 section of the License 2.39 - * file that accompanied this code. 2.40 - * 2.41 - * Modifications: 2.42 - * If applicable, add the following below the License Header, with the fields 2.43 - * enclosed by brackets [] replaced by your own identifying information: 2.44 - * "Portions Copyright [year] [name of copyright owner]" 2.45 - * 2.46 - * Contributor(s): 2.47 - * If you wish your version of this file to be governed by only the CDDL or 2.48 - * only the GPL Version 2, indicate your decision by adding "[Contributor] 2.49 - * elects to include this software in this distribution under the [CDDL or GPL 2.50 - * Version 2] license." If you don't indicate a single choice of license, a 2.51 - * recipient has the option to distribute your version of this file under 2.52 - * either the CDDL, the GPL Version 2 or to extend the choice of license to 2.53 - * its licensees as provided above. However, if you add GPL Version 2 code 2.54 - * and therefore, elected the GPL Version 2 license, then the option applies 2.55 - * only if the new code is made subject to such option by the copyright 2.56 - * holder. 2.57 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.58 + * or visit www.oracle.com if you need additional information or have any 2.59 + * questions. 2.60 */ 2.61 2.62 package com.sun.xml.internal.org.jvnet.ws;
3.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/Databinding.java Fri Mar 09 11:57:06 2012 -0800 3.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/Databinding.java Wed Mar 14 13:49:09 2012 -0700 3.3 @@ -1,41 +1,26 @@ 3.4 /* 3.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 3.6 + * Copyright (c) 1997, 2011, 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 - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. 3.10 + * This code is free software; you can redistribute it and/or modify it 3.11 + * under the terms of the GNU General Public License version 2 only, as 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 Oracle in the LICENSE file that accompanied this code. 3.15 * 3.16 - * The contents of this file are subject to the terms of either the GNU 3.17 - * General Public License Version 2 only ("GPL") or the Common Development 3.18 - * and Distribution License("CDDL") (collectively, the "License"). You 3.19 - * may not use this file except in compliance with the License. You can 3.20 - * obtain a copy of the License at 3.21 - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html 3.22 - * or packager/legal/LICENSE.txt. See the License for the specific 3.23 - * language governing permissions and limitations under the License. 3.24 + * This code is distributed in the hope that it will be useful, but WITHOUT 3.25 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 3.26 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 3.27 + * version 2 for more details (a copy is included in the LICENSE file that 3.28 + * accompanied this code). 3.29 * 3.30 - * When distributing the software, include this License Header Notice in each 3.31 - * file and include the License file at packager/legal/LICENSE.txt. 3.32 + * You should have received a copy of the GNU General Public License version 3.33 + * 2 along with this work; if not, write to the Free Software Foundation, 3.34 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 3.35 * 3.36 - * GPL Classpath Exception: 3.37 - * Oracle designates this particular file as subject to the "Classpath" 3.38 - * exception as provided by Oracle in the GPL Version 2 section of the License 3.39 - * file that accompanied this code. 3.40 - * 3.41 - * Modifications: 3.42 - * If applicable, add the following below the License Header, with the fields 3.43 - * enclosed by brackets [] replaced by your own identifying information: 3.44 - * "Portions Copyright [year] [name of copyright owner]" 3.45 - * 3.46 - * Contributor(s): 3.47 - * If you wish your version of this file to be governed by only the CDDL or 3.48 - * only the GPL Version 2, indicate your decision by adding "[Contributor] 3.49 - * elects to include this software in this distribution under the [CDDL or GPL 3.50 - * Version 2] license." If you don't indicate a single choice of license, a 3.51 - * recipient has the option to distribute your version of this file under 3.52 - * either the CDDL, the GPL Version 2 or to extend the choice of license to 3.53 - * its licensees as provided above. However, if you add GPL Version 2 code 3.54 - * and therefore, elected the GPL Version 2 license, then the option applies 3.55 - * only if the new code is made subject to such option by the copyright 3.56 - * holder. 3.57 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 3.58 + * or visit www.oracle.com if you need additional information or have any 3.59 + * questions. 3.60 */ 3.61 3.62 package com.sun.xml.internal.org.jvnet.ws.databinding;
4.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/DatabindingFactory.java Fri Mar 09 11:57:06 2012 -0800 4.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/DatabindingFactory.java Wed Mar 14 13:49:09 2012 -0700 4.3 @@ -1,41 +1,26 @@ 4.4 /* 4.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 4.6 + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 4.7 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.8 * 4.9 - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. 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. Oracle designates this 4.13 + * particular file as subject to the "Classpath" exception as provided 4.14 + * by Oracle in the LICENSE file that accompanied this code. 4.15 * 4.16 - * The contents of this file are subject to the terms of either the GNU 4.17 - * General Public License Version 2 only ("GPL") or the Common Development 4.18 - * and Distribution License("CDDL") (collectively, the "License"). You 4.19 - * may not use this file except in compliance with the License. You can 4.20 - * obtain a copy of the License at 4.21 - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html 4.22 - * or packager/legal/LICENSE.txt. See the License for the specific 4.23 - * language governing permissions and limitations under the License. 4.24 + * This code is distributed in the hope that it will be useful, but WITHOUT 4.25 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 4.26 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 4.27 + * version 2 for more details (a copy is included in the LICENSE file that 4.28 + * accompanied this code). 4.29 * 4.30 - * When distributing the software, include this License Header Notice in each 4.31 - * file and include the License file at packager/legal/LICENSE.txt. 4.32 + * You should have received a copy of the GNU General Public License version 4.33 + * 2 along with this work; if not, write to the Free Software Foundation, 4.34 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 4.35 * 4.36 - * GPL Classpath Exception: 4.37 - * Oracle designates this particular file as subject to the "Classpath" 4.38 - * exception as provided by Oracle in the GPL Version 2 section of the License 4.39 - * file that accompanied this code. 4.40 - * 4.41 - * Modifications: 4.42 - * If applicable, add the following below the License Header, with the fields 4.43 - * enclosed by brackets [] replaced by your own identifying information: 4.44 - * "Portions Copyright [year] [name of copyright owner]" 4.45 - * 4.46 - * Contributor(s): 4.47 - * If you wish your version of this file to be governed by only the CDDL or 4.48 - * only the GPL Version 2, indicate your decision by adding "[Contributor] 4.49 - * elects to include this software in this distribution under the [CDDL or GPL 4.50 - * Version 2] license." If you don't indicate a single choice of license, a 4.51 - * recipient has the option to distribute your version of this file under 4.52 - * either the CDDL, the GPL Version 2 or to extend the choice of license to 4.53 - * its licensees as provided above. However, if you add GPL Version 2 code 4.54 - * and therefore, elected the GPL Version 2 license, then the option applies 4.55 - * only if the new code is made subject to such option by the copyright 4.56 - * holder. 4.57 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 4.58 + * or visit www.oracle.com if you need additional information or have any 4.59 + * questions. 4.60 */ 4.61 4.62 package com.sun.xml.internal.org.jvnet.ws.databinding;
5.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/DatabindingMode.java Fri Mar 09 11:57:06 2012 -0800 5.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/DatabindingMode.java Wed Mar 14 13:49:09 2012 -0700 5.3 @@ -1,42 +1,28 @@ 5.4 /* 5.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 5.6 + * Copyright (c) 1997, 2011, 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 - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. 5.10 + * This code is free software; you can redistribute it and/or modify it 5.11 + * under the terms of the GNU General Public License version 2 only, as 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 Oracle in the LICENSE file that accompanied this code. 5.15 * 5.16 - * The contents of this file are subject to the terms of either the GNU 5.17 - * General Public License Version 2 only ("GPL") or the Common Development 5.18 - * and Distribution License("CDDL") (collectively, the "License"). You 5.19 - * may not use this file except in compliance with the License. You can 5.20 - * obtain a copy of the License at 5.21 - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html 5.22 - * or packager/legal/LICENSE.txt. See the License for the specific 5.23 - * language governing permissions and limitations under the License. 5.24 + * This code is distributed in the hope that it will be useful, but WITHOUT 5.25 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 5.26 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 5.27 + * version 2 for more details (a copy is included in the LICENSE file that 5.28 + * accompanied this code). 5.29 * 5.30 - * When distributing the software, include this License Header Notice in each 5.31 - * file and include the License file at packager/legal/LICENSE.txt. 5.32 + * You should have received a copy of the GNU General Public License version 5.33 + * 2 along with this work; if not, write to the Free Software Foundation, 5.34 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 5.35 * 5.36 - * GPL Classpath Exception: 5.37 - * Oracle designates this particular file as subject to the "Classpath" 5.38 - * exception as provided by Oracle in the GPL Version 2 section of the License 5.39 - * file that accompanied this code. 5.40 - * 5.41 - * Modifications: 5.42 - * If applicable, add the following below the License Header, with the fields 5.43 - * enclosed by brackets [] replaced by your own identifying information: 5.44 - * "Portions Copyright [year] [name of copyright owner]" 5.45 - * 5.46 - * Contributor(s): 5.47 - * If you wish your version of this file to be governed by only the CDDL or 5.48 - * only the GPL Version 2, indicate your decision by adding "[Contributor] 5.49 - * elects to include this software in this distribution under the [CDDL or GPL 5.50 - * Version 2] license." If you don't indicate a single choice of license, a 5.51 - * recipient has the option to distribute your version of this file under 5.52 - * either the CDDL, the GPL Version 2 or to extend the choice of license to 5.53 - * its licensees as provided above. However, if you add GPL Version 2 code 5.54 - * and therefore, elected the GPL Version 2 license, then the option applies 5.55 - * only if the new code is made subject to such option by the copyright 5.56 - * holder. 5.57 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 5.58 + * or visit www.oracle.com if you need additional information or have any 5.59 + * questions. 5.60 */ 5.61 + 5.62 package com.sun.xml.internal.org.jvnet.ws.databinding; 5.63 5.64 import java.lang.annotation.Retention;
6.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/DatabindingModeFeature.java Fri Mar 09 11:57:06 2012 -0800 6.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/DatabindingModeFeature.java Wed Mar 14 13:49:09 2012 -0700 6.3 @@ -1,41 +1,26 @@ 6.4 /* 6.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 6.6 + * Copyright (c) 1997, 2011, 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 - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. 6.10 + * This code is free software; you can redistribute it and/or modify it 6.11 + * under the terms of the GNU General Public License version 2 only, as 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 Oracle in the LICENSE file that accompanied this code. 6.15 * 6.16 - * The contents of this file are subject to the terms of either the GNU 6.17 - * General Public License Version 2 only ("GPL") or the Common Development 6.18 - * and Distribution License("CDDL") (collectively, the "License"). You 6.19 - * may not use this file except in compliance with the License. You can 6.20 - * obtain a copy of the License at 6.21 - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html 6.22 - * or packager/legal/LICENSE.txt. See the License for the specific 6.23 - * language governing permissions and limitations under the License. 6.24 + * This code is distributed in the hope that it will be useful, but WITHOUT 6.25 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 6.26 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 6.27 + * version 2 for more details (a copy is included in the LICENSE file that 6.28 + * accompanied this code). 6.29 * 6.30 - * When distributing the software, include this License Header Notice in each 6.31 - * file and include the License file at packager/legal/LICENSE.txt. 6.32 + * You should have received a copy of the GNU General Public License version 6.33 + * 2 along with this work; if not, write to the Free Software Foundation, 6.34 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 6.35 * 6.36 - * GPL Classpath Exception: 6.37 - * Oracle designates this particular file as subject to the "Classpath" 6.38 - * exception as provided by Oracle in the GPL Version 2 section of the License 6.39 - * file that accompanied this code. 6.40 - * 6.41 - * Modifications: 6.42 - * If applicable, add the following below the License Header, with the fields 6.43 - * enclosed by brackets [] replaced by your own identifying information: 6.44 - * "Portions Copyright [year] [name of copyright owner]" 6.45 - * 6.46 - * Contributor(s): 6.47 - * If you wish your version of this file to be governed by only the CDDL or 6.48 - * only the GPL Version 2, indicate your decision by adding "[Contributor] 6.49 - * elects to include this software in this distribution under the [CDDL or GPL 6.50 - * Version 2] license." If you don't indicate a single choice of license, a 6.51 - * recipient has the option to distribute your version of this file under 6.52 - * either the CDDL, the GPL Version 2 or to extend the choice of license to 6.53 - * its licensees as provided above. However, if you add GPL Version 2 code 6.54 - * and therefore, elected the GPL Version 2 license, then the option applies 6.55 - * only if the new code is made subject to such option by the copyright 6.56 - * holder. 6.57 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 6.58 + * or visit www.oracle.com if you need additional information or have any 6.59 + * questions. 6.60 */ 6.61 6.62 package com.sun.xml.internal.org.jvnet.ws.databinding;
7.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/JavaCallInfo.java Fri Mar 09 11:57:06 2012 -0800 7.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/JavaCallInfo.java Wed Mar 14 13:49:09 2012 -0700 7.3 @@ -1,41 +1,26 @@ 7.4 /* 7.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 7.6 + * Copyright (c) 1997, 2011, 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 - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. 7.10 + * This code is free software; you can redistribute it and/or modify it 7.11 + * under the terms of the GNU General Public License version 2 only, as 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 Oracle in the LICENSE file that accompanied this code. 7.15 * 7.16 - * The contents of this file are subject to the terms of either the GNU 7.17 - * General Public License Version 2 only ("GPL") or the Common Development 7.18 - * and Distribution License("CDDL") (collectively, the "License"). You 7.19 - * may not use this file except in compliance with the License. You can 7.20 - * obtain a copy of the License at 7.21 - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html 7.22 - * or packager/legal/LICENSE.txt. See the License for the specific 7.23 - * language governing permissions and limitations under the License. 7.24 + * This code is distributed in the hope that it will be useful, but WITHOUT 7.25 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 7.26 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 7.27 + * version 2 for more details (a copy is included in the LICENSE file that 7.28 + * accompanied this code). 7.29 * 7.30 - * When distributing the software, include this License Header Notice in each 7.31 - * file and include the License file at packager/legal/LICENSE.txt. 7.32 + * You should have received a copy of the GNU General Public License version 7.33 + * 2 along with this work; if not, write to the Free Software Foundation, 7.34 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 7.35 * 7.36 - * GPL Classpath Exception: 7.37 - * Oracle designates this particular file as subject to the "Classpath" 7.38 - * exception as provided by Oracle in the GPL Version 2 section of the License 7.39 - * file that accompanied this code. 7.40 - * 7.41 - * Modifications: 7.42 - * If applicable, add the following below the License Header, with the fields 7.43 - * enclosed by brackets [] replaced by your own identifying information: 7.44 - * "Portions Copyright [year] [name of copyright owner]" 7.45 - * 7.46 - * Contributor(s): 7.47 - * If you wish your version of this file to be governed by only the CDDL or 7.48 - * only the GPL Version 2, indicate your decision by adding "[Contributor] 7.49 - * elects to include this software in this distribution under the [CDDL or GPL 7.50 - * Version 2] license." If you don't indicate a single choice of license, a 7.51 - * recipient has the option to distribute your version of this file under 7.52 - * either the CDDL, the GPL Version 2 or to extend the choice of license to 7.53 - * its licensees as provided above. However, if you add GPL Version 2 code 7.54 - * and therefore, elected the GPL Version 2 license, then the option applies 7.55 - * only if the new code is made subject to such option by the copyright 7.56 - * holder. 7.57 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 7.58 + * or visit www.oracle.com if you need additional information or have any 7.59 + * questions. 7.60 */ 7.61 7.62 package com.sun.xml.internal.org.jvnet.ws.databinding;
8.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/ContentType.java Fri Mar 09 11:57:06 2012 -0800 8.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/ContentType.java Wed Mar 14 13:49:09 2012 -0700 8.3 @@ -1,41 +1,26 @@ 8.4 /* 8.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 8.6 + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 8.7 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 8.8 * 8.9 - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. 8.10 + * This code is free software; you can redistribute it and/or modify it 8.11 + * under the terms of the GNU General Public License version 2 only, as 8.12 + * published by the Free Software Foundation. Oracle designates this 8.13 + * particular file as subject to the "Classpath" exception as provided 8.14 + * by Oracle in the LICENSE file that accompanied this code. 8.15 * 8.16 - * The contents of this file are subject to the terms of either the GNU 8.17 - * General Public License Version 2 only ("GPL") or the Common Development 8.18 - * and Distribution License("CDDL") (collectively, the "License"). You 8.19 - * may not use this file except in compliance with the License. You can 8.20 - * obtain a copy of the License at 8.21 - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html 8.22 - * or packager/legal/LICENSE.txt. See the License for the specific 8.23 - * language governing permissions and limitations under the License. 8.24 + * This code is distributed in the hope that it will be useful, but WITHOUT 8.25 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 8.26 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 8.27 + * version 2 for more details (a copy is included in the LICENSE file that 8.28 + * accompanied this code). 8.29 * 8.30 - * When distributing the software, include this License Header Notice in each 8.31 - * file and include the License file at packager/legal/LICENSE.txt. 8.32 + * You should have received a copy of the GNU General Public License version 8.33 + * 2 along with this work; if not, write to the Free Software Foundation, 8.34 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 8.35 * 8.36 - * GPL Classpath Exception: 8.37 - * Oracle designates this particular file as subject to the "Classpath" 8.38 - * exception as provided by Oracle in the GPL Version 2 section of the License 8.39 - * file that accompanied this code. 8.40 - * 8.41 - * Modifications: 8.42 - * If applicable, add the following below the License Header, with the fields 8.43 - * enclosed by brackets [] replaced by your own identifying information: 8.44 - * "Portions Copyright [year] [name of copyright owner]" 8.45 - * 8.46 - * Contributor(s): 8.47 - * If you wish your version of this file to be governed by only the CDDL or 8.48 - * only the GPL Version 2, indicate your decision by adding "[Contributor] 8.49 - * elects to include this software in this distribution under the [CDDL or GPL 8.50 - * Version 2] license." If you don't indicate a single choice of license, a 8.51 - * recipient has the option to distribute your version of this file under 8.52 - * either the CDDL, the GPL Version 2 or to extend the choice of license to 8.53 - * its licensees as provided above. However, if you add GPL Version 2 code 8.54 - * and therefore, elected the GPL Version 2 license, then the option applies 8.55 - * only if the new code is made subject to such option by the copyright 8.56 - * holder. 8.57 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 8.58 + * or visit www.oracle.com if you need additional information or have any 8.59 + * questions. 8.60 */ 8.61 8.62 package com.sun.xml.internal.org.jvnet.ws.message;
9.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/DistributedPropertySet.java Fri Mar 09 11:57:06 2012 -0800 9.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/DistributedPropertySet.java Wed Mar 14 13:49:09 2012 -0700 9.3 @@ -1,41 +1,26 @@ 9.4 /* 9.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 9.6 + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 9.7 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 9.8 * 9.9 - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. 9.10 + * This code is free software; you can redistribute it and/or modify it 9.11 + * under the terms of the GNU General Public License version 2 only, as 9.12 + * published by the Free Software Foundation. Oracle designates this 9.13 + * particular file as subject to the "Classpath" exception as provided 9.14 + * by Oracle in the LICENSE file that accompanied this code. 9.15 * 9.16 - * The contents of this file are subject to the terms of either the GNU 9.17 - * General Public License Version 2 only ("GPL") or the Common Development 9.18 - * and Distribution License("CDDL") (collectively, the "License"). You 9.19 - * may not use this file except in compliance with the License. You can 9.20 - * obtain a copy of the License at 9.21 - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html 9.22 - * or packager/legal/LICENSE.txt. See the License for the specific 9.23 - * language governing permissions and limitations under the License. 9.24 + * This code is distributed in the hope that it will be useful, but WITHOUT 9.25 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 9.26 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 9.27 + * version 2 for more details (a copy is included in the LICENSE file that 9.28 + * accompanied this code). 9.29 * 9.30 - * When distributing the software, include this License Header Notice in each 9.31 - * file and include the License file at packager/legal/LICENSE.txt. 9.32 + * You should have received a copy of the GNU General Public License version 9.33 + * 2 along with this work; if not, write to the Free Software Foundation, 9.34 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 9.35 * 9.36 - * GPL Classpath Exception: 9.37 - * Oracle designates this particular file as subject to the "Classpath" 9.38 - * exception as provided by Oracle in the GPL Version 2 section of the License 9.39 - * file that accompanied this code. 9.40 - * 9.41 - * Modifications: 9.42 - * If applicable, add the following below the License Header, with the fields 9.43 - * enclosed by brackets [] replaced by your own identifying information: 9.44 - * "Portions Copyright [year] [name of copyright owner]" 9.45 - * 9.46 - * Contributor(s): 9.47 - * If you wish your version of this file to be governed by only the CDDL or 9.48 - * only the GPL Version 2, indicate your decision by adding "[Contributor] 9.49 - * elects to include this software in this distribution under the [CDDL or GPL 9.50 - * Version 2] license." If you don't indicate a single choice of license, a 9.51 - * recipient has the option to distribute your version of this file under 9.52 - * either the CDDL, the GPL Version 2 or to extend the choice of license to 9.53 - * its licensees as provided above. However, if you add GPL Version 2 code 9.54 - * and therefore, elected the GPL Version 2 license, then the option applies 9.55 - * only if the new code is made subject to such option by the copyright 9.56 - * holder. 9.57 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 9.58 + * or visit www.oracle.com if you need additional information or have any 9.59 + * questions. 9.60 */ 9.61 9.62 package com.sun.xml.internal.org.jvnet.ws.message;
10.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/MessageContext.java Fri Mar 09 11:57:06 2012 -0800 10.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/MessageContext.java Wed Mar 14 13:49:09 2012 -0700 10.3 @@ -1,41 +1,26 @@ 10.4 /* 10.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 10.6 + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 10.7 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 10.8 * 10.9 - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. 10.10 + * This code is free software; you can redistribute it and/or modify it 10.11 + * under the terms of the GNU General Public License version 2 only, as 10.12 + * published by the Free Software Foundation. Oracle designates this 10.13 + * particular file as subject to the "Classpath" exception as provided 10.14 + * by Oracle in the LICENSE file that accompanied this code. 10.15 * 10.16 - * The contents of this file are subject to the terms of either the GNU 10.17 - * General Public License Version 2 only ("GPL") or the Common Development 10.18 - * and Distribution License("CDDL") (collectively, the "License"). You 10.19 - * may not use this file except in compliance with the License. You can 10.20 - * obtain a copy of the License at 10.21 - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html 10.22 - * or packager/legal/LICENSE.txt. See the License for the specific 10.23 - * language governing permissions and limitations under the License. 10.24 + * This code is distributed in the hope that it will be useful, but WITHOUT 10.25 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 10.26 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 10.27 + * version 2 for more details (a copy is included in the LICENSE file that 10.28 + * accompanied this code). 10.29 * 10.30 - * When distributing the software, include this License Header Notice in each 10.31 - * file and include the License file at packager/legal/LICENSE.txt. 10.32 + * You should have received a copy of the GNU General Public License version 10.33 + * 2 along with this work; if not, write to the Free Software Foundation, 10.34 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 10.35 * 10.36 - * GPL Classpath Exception: 10.37 - * Oracle designates this particular file as subject to the "Classpath" 10.38 - * exception as provided by Oracle in the GPL Version 2 section of the License 10.39 - * file that accompanied this code. 10.40 - * 10.41 - * Modifications: 10.42 - * If applicable, add the following below the License Header, with the fields 10.43 - * enclosed by brackets [] replaced by your own identifying information: 10.44 - * "Portions Copyright [year] [name of copyright owner]" 10.45 - * 10.46 - * Contributor(s): 10.47 - * If you wish your version of this file to be governed by only the CDDL or 10.48 - * only the GPL Version 2, indicate your decision by adding "[Contributor] 10.49 - * elects to include this software in this distribution under the [CDDL or GPL 10.50 - * Version 2] license." If you don't indicate a single choice of license, a 10.51 - * recipient has the option to distribute your version of this file under 10.52 - * either the CDDL, the GPL Version 2 or to extend the choice of license to 10.53 - * its licensees as provided above. However, if you add GPL Version 2 code 10.54 - * and therefore, elected the GPL Version 2 license, then the option applies 10.55 - * only if the new code is made subject to such option by the copyright 10.56 - * holder. 10.57 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 10.58 + * or visit www.oracle.com if you need additional information or have any 10.59 + * questions. 10.60 */ 10.61 10.62 package com.sun.xml.internal.org.jvnet.ws.message;
11.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/MessageContextFactory.java Fri Mar 09 11:57:06 2012 -0800 11.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/MessageContextFactory.java Wed Mar 14 13:49:09 2012 -0700 11.3 @@ -1,3 +1,28 @@ 11.4 +/* 11.5 + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 11.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 11.7 + * 11.8 + * This code is free software; you can redistribute it and/or modify it 11.9 + * under the terms of the GNU General Public License version 2 only, as 11.10 + * published by the Free Software Foundation. Oracle designates this 11.11 + * particular file as subject to the "Classpath" exception as provided 11.12 + * by Oracle in the LICENSE file that accompanied this code. 11.13 + * 11.14 + * This code is distributed in the hope that it will be useful, but WITHOUT 11.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 11.16 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 11.17 + * version 2 for more details (a copy is included in the LICENSE file that 11.18 + * accompanied this code). 11.19 + * 11.20 + * You should have received a copy of the GNU General Public License version 11.21 + * 2 along with this work; if not, write to the Free Software Foundation, 11.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 11.23 + * 11.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 11.25 + * or visit www.oracle.com if you need additional information or have any 11.26 + * questions. 11.27 + */ 11.28 + 11.29 package com.sun.xml.internal.org.jvnet.ws.message; 11.30 11.31 import java.io.IOException;
12.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/PropertySet.java Fri Mar 09 11:57:06 2012 -0800 12.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/PropertySet.java Wed Mar 14 13:49:09 2012 -0700 12.3 @@ -1,41 +1,26 @@ 12.4 /* 12.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 12.6 + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 12.7 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 12.8 * 12.9 - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. 12.10 + * This code is free software; you can redistribute it and/or modify it 12.11 + * under the terms of the GNU General Public License version 2 only, as 12.12 + * published by the Free Software Foundation. Oracle designates this 12.13 + * particular file as subject to the "Classpath" exception as provided 12.14 + * by Oracle in the LICENSE file that accompanied this code. 12.15 * 12.16 - * The contents of this file are subject to the terms of either the GNU 12.17 - * General Public License Version 2 only ("GPL") or the Common Development 12.18 - * and Distribution License("CDDL") (collectively, the "License"). You 12.19 - * may not use this file except in compliance with the License. You can 12.20 - * obtain a copy of the License at 12.21 - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html 12.22 - * or packager/legal/LICENSE.txt. See the License for the specific 12.23 - * language governing permissions and limitations under the License. 12.24 + * This code is distributed in the hope that it will be useful, but WITHOUT 12.25 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 12.26 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 12.27 + * version 2 for more details (a copy is included in the LICENSE file that 12.28 + * accompanied this code). 12.29 * 12.30 - * When distributing the software, include this License Header Notice in each 12.31 - * file and include the License file at packager/legal/LICENSE.txt. 12.32 + * You should have received a copy of the GNU General Public License version 12.33 + * 2 along with this work; if not, write to the Free Software Foundation, 12.34 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 12.35 * 12.36 - * GPL Classpath Exception: 12.37 - * Oracle designates this particular file as subject to the "Classpath" 12.38 - * exception as provided by Oracle in the GPL Version 2 section of the License 12.39 - * file that accompanied this code. 12.40 - * 12.41 - * Modifications: 12.42 - * If applicable, add the following below the License Header, with the fields 12.43 - * enclosed by brackets [] replaced by your own identifying information: 12.44 - * "Portions Copyright [year] [name of copyright owner]" 12.45 - * 12.46 - * Contributor(s): 12.47 - * If you wish your version of this file to be governed by only the CDDL or 12.48 - * only the GPL Version 2, indicate your decision by adding "[Contributor] 12.49 - * elects to include this software in this distribution under the [CDDL or GPL 12.50 - * Version 2] license." If you don't indicate a single choice of license, a 12.51 - * recipient has the option to distribute your version of this file under 12.52 - * either the CDDL, the GPL Version 2 or to extend the choice of license to 12.53 - * its licensees as provided above. However, if you add GPL Version 2 code 12.54 - * and therefore, elected the GPL Version 2 license, then the option applies 12.55 - * only if the new code is made subject to such option by the copyright 12.56 - * holder. 12.57 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 12.58 + * or visit www.oracle.com if you need additional information or have any 12.59 + * questions. 12.60 */ 12.61 12.62 package com.sun.xml.internal.org.jvnet.ws.message;
