diff -Nru xmlstreambuffer-1.5.1/copyright-exclude xmlstreambuffer-1.5.4/copyright-exclude --- xmlstreambuffer-1.5.1/copyright-exclude 1970-01-01 00:00:00.000000000 +0000 +++ xmlstreambuffer-1.5.4/copyright-exclude 2012-11-28 16:52:01.000000000 +0000 @@ -0,0 +1,42 @@ +soap-message.xml +/MANIFEST.MF +/META-INF/services/ +/README +.gif +.jpg +.jpeg +.jpeg1 +.jpeg2 +.png +.svg +.tif +.exe +.ico +.jar +.zip +.war +.sql +.jks +.json +.class +.bin +.iml +.ipr +.envelope +.txt +.bat +.sh +.project +.settings +/CDDL+GPLv2.xml +/copyright-exclude +/LICENSE +/CDDL+GPLv2.txt +CDDL+GPLv2.html +/copyright.txt +.commented +/.auth +.svnignore +.svn +www +site diff -Nru xmlstreambuffer-1.5.1/copyright.txt xmlstreambuffer-1.5.4/copyright.txt --- xmlstreambuffer-1.5.1/copyright.txt 1970-01-01 00:00:00.000000000 +0000 +++ xmlstreambuffer-1.5.4/copyright.txt 2012-11-28 16:52:01.000000000 +0000 @@ -0,0 +1,39 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) YYYY Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * http://glassfish.java.net/public/CDDL+GPL_1_1.html + * or packager/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at packager/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + */ \ No newline at end of file diff -Nru xmlstreambuffer-1.5.1/debian/changelog xmlstreambuffer-1.5.4/debian/changelog --- xmlstreambuffer-1.5.1/debian/changelog 2014-02-25 11:27:29.000000000 +0000 +++ xmlstreambuffer-1.5.4/debian/changelog 2016-07-27 20:27:31.000000000 +0000 @@ -1,3 +1,17 @@ +xmlstreambuffer (1.5.4-1) unstable; urgency=medium + + * Team upload. + * New upstream release + - New build dependency on libmaven-bundle-plugin-java + * Build with the DH sequencer instead of CDBS + * Enabled the unit tests + * Removed the unused build dependency on glassfish-activation + * Removed the build dependency on libstax-java (provided by libstax-ex-java) + * Standards-Version updated to 3.9.8 + * Use secure Vcs-* URLs + + -- Emmanuel Bourg Wed, 27 Jul 2016 22:27:29 +0200 + xmlstreambuffer (1.5.1-1) unstable; urgency=medium * Initial release (Closes: #732230) diff -Nru xmlstreambuffer-1.5.1/debian/control xmlstreambuffer-1.5.4/debian/control --- xmlstreambuffer-1.5.1/debian/control 2014-02-25 10:47:43.000000000 +0000 +++ xmlstreambuffer-1.5.4/debian/control 2016-07-27 20:25:57.000000000 +0000 @@ -3,15 +3,17 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: Timo Aaltonen -Build-Depends: cdbs, - debhelper (>= 9), - default-jdk, - javahelper, - maven-debian-helper (>= 1.5) -Build-Depends-Indep: glassfish-activation, libstax-ex-java, libstax-java -Standards-Version: 3.9.5 -Vcs-Git: git://anonscm.debian.org/pkg-java/xmlstreambuffer.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/xmlstreambuffer.git +Build-Depends: + debhelper (>= 9), + default-jdk, + javahelper, + junit, + libmaven-bundle-plugin-java, + libstax-ex-java, + maven-debian-helper (>= 2.0) +Standards-Version: 3.9.8 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/xmlstreambuffer.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/xmlstreambuffer.git Homepage: http://xmlstreambuffer.java.net Package: libstreambuffer-java diff -Nru xmlstreambuffer-1.5.1/debian/copyright xmlstreambuffer-1.5.4/debian/copyright --- xmlstreambuffer-1.5.1/debian/copyright 2014-02-25 11:27:28.000000000 +0000 +++ xmlstreambuffer-1.5.4/debian/copyright 2016-07-27 20:27:17.000000000 +0000 @@ -3,7 +3,7 @@ Source: http://xmlstreambuffer.java.net/ Files: * -Copyright: 2005-2012, Oracle and/or its affiliates +Copyright: 2005-2014, Oracle and/or its affiliates License: CDDL-1.1 or GPL-2 with classpath exception Files: src/com/sun/xml/stream/buffer/sax/Features.java diff -Nru xmlstreambuffer-1.5.1/debian/maven.ignoreRules xmlstreambuffer-1.5.4/debian/maven.ignoreRules --- xmlstreambuffer-1.5.1/debian/maven.ignoreRules 2014-02-25 10:39:59.000000000 +0000 +++ xmlstreambuffer-1.5.4/debian/maven.ignoreRules 2016-07-27 20:25:57.000000000 +0000 @@ -1,6 +1,10 @@ -junit junit * * * * +org.apache.maven.plugins maven-enforcer-plugin * * * * +org.apache.maven.plugins maven-javadoc-plugin * * * * org.apache.maven.plugins maven-release-plugin * * * * -org.apache.maven.plugins maven-surefire-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * +org.codehaus.mojo buildnumber-maven-plugin * * * * +org.codehaus.mojo cobertura-maven-plugin * * * * org.codehaus.mojo findbugs-maven-plugin * * * * org.codehaus.woodstox wstx-asl * * * * +org.glassfish.copyright glassfish-copyright-maven-plugin * * * * diff -Nru xmlstreambuffer-1.5.1/debian/maven.properties xmlstreambuffer-1.5.4/debian/maven.properties --- xmlstreambuffer-1.5.1/debian/maven.properties 2014-02-13 16:23:34.000000000 +0000 +++ xmlstreambuffer-1.5.4/debian/maven.properties 2016-07-27 20:25:57.000000000 +0000 @@ -2,5 +2,5 @@ # For example: # maven.test.skip=true -maven.test.skip=true +maven.test.skip=false project.build.sourceEncoding=UTF-8 diff -Nru xmlstreambuffer-1.5.1/debian/maven.publishedRules xmlstreambuffer-1.5.4/debian/maven.publishedRules --- xmlstreambuffer-1.5.1/debian/maven.publishedRules 2014-02-25 10:39:59.000000000 +0000 +++ xmlstreambuffer-1.5.4/debian/maven.publishedRules 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ - diff -Nru xmlstreambuffer-1.5.1/debian/maven.rules xmlstreambuffer-1.5.4/debian/maven.rules --- xmlstreambuffer-1.5.1/debian/maven.rules 2014-02-25 10:39:59.000000000 +0000 +++ xmlstreambuffer-1.5.4/debian/maven.rules 2016-07-27 20:25:57.000000000 +0000 @@ -1,3 +1,3 @@ -junit junit jar s/3\..*/3.x/ * * s/javax.xml.stream/stax/ stax-api jar s/1.0.2/1.0.1/ * * +junit junit jar s/3\..*/3.x/ * * diff -Nru xmlstreambuffer-1.5.1/debian/rules xmlstreambuffer-1.5.4/debian/rules --- xmlstreambuffer-1.5.1/debian/rules 2014-02-13 16:23:34.000000000 +0000 +++ xmlstreambuffer-1.5.4/debian/rules 2016-07-27 20:25:57.000000000 +0000 @@ -1,10 +1,7 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/javahelper.mk -include /usr/share/cdbs/1/class/maven.mk - -JAVA_HOME := /usr/lib/jvm/default-java +%: + dh $@ --buildsystem=maven --with javahelper get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + uscan --download-current-version --force-download --rename diff -Nru xmlstreambuffer-1.5.1/docs/manifest/manifest.mf xmlstreambuffer-1.5.4/docs/manifest/manifest.mf --- xmlstreambuffer-1.5.1/docs/manifest/manifest.mf 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/docs/manifest/manifest.mf 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -Manifest-Version: 1.0 -Implementation-Title: XML Stream Buffer Implementation -Implementation-Version: @@IMPL_VERSION@@ -Implementation-Vendor: Sun Microsystems, Inc. -Implementation-Vendor-Id: @@VENDOR_ID@@ -Extension-Name: @@EXTENSION_NAME@@ -Build-Id: @@BUILD_ID@@ diff -Nru xmlstreambuffer-1.5.1/exclude.xml xmlstreambuffer-1.5.4/exclude.xml --- xmlstreambuffer-1.5.1/exclude.xml 1970-01-01 00:00:00.000000000 +0000 +++ xmlstreambuffer-1.5.4/exclude.xml 2013-07-02 10:57:09.000000000 +0000 @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru xmlstreambuffer-1.5.1/nbproject/build-impl.xml xmlstreambuffer-1.5.4/nbproject/build-impl.xml --- xmlstreambuffer-1.5.1/nbproject/build-impl.xml 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/nbproject/build-impl.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,541 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - diff -Nru xmlstreambuffer-1.5.1/nbproject/genfiles.properties xmlstreambuffer-1.5.4/nbproject/genfiles.properties --- xmlstreambuffer-1.5.1/nbproject/genfiles.properties 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/nbproject/genfiles.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -build.xml.data.CRC32=d6b9b3a0 -build.xml.script.CRC32=686dbc1d -build.xml.stylesheet.CRC32=d5b6853a -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=d6b9b3a0 -nbproject/build-impl.xml.script.CRC32=87cc9298 -nbproject/build-impl.xml.stylesheet.CRC32=99b91518 diff -Nru xmlstreambuffer-1.5.1/nbproject/project.properties xmlstreambuffer-1.5.4/nbproject/project.properties --- xmlstreambuffer-1.5.1/nbproject/project.properties 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/nbproject/project.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -application.args= -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/streambuffer.jar -dist.javadoc.dir=${dist.dir}/javadoc -file.reference.activation.jar=lib/activation.jar -file.reference.jsr173_1.0_src.zip=lib/jsr173_1.0_src.zip -file.reference.jsr173_api.jar=lib/jsr173_api.jar -file.reference.sjsxp-src.zip=lib/sjsxp-src.zip -file.reference.sjsxp.jar=lib/sjsxp.jar -file.reference.woodstox-src.zip=lib/woodstox-src.zip -file.reference.woodstox.jar=lib/woodstox.jar -file.reference.stax-ex-src.zip=lib/stax-ex-src.zip -file.reference.stax-ex.jar=lib/stax-ex.jar -jar.compress=false -javac.classpath=\ - ${file.reference.jsr173_1.0_src.zip}:\ - ${file.reference.jsr173_api.jar}:\ - ${file.reference.activation.jar}:\ - ${file.reference.woodstox-src.zip}:\ - ${file.reference.woodstox.jar}:\ - ${file.reference.sjsxp-src.zip}:\ - ${file.reference.sjsxp.jar}:\ - ${file.reference.stax-ex-src.zip}:\ - ${file.reference.stax-ex.jar} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding= -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -main.class= -meta.inf.dir=${src.dir}/META-INF -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir}:\ - ${file.reference.sjsxp.jar} -src.dir=src -test.src.dir=test diff -Nru xmlstreambuffer-1.5.1/nbproject/project.xml xmlstreambuffer-1.5.4/nbproject/project.xml --- xmlstreambuffer-1.5.1/nbproject/project.xml 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/nbproject/project.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ - - - org.netbeans.modules.java.j2seproject - - - streambuffer - 1.6.5 - - - - - - - - - diff -Nru xmlstreambuffer-1.5.1/pom.xml xmlstreambuffer-1.5.4/pom.xml --- xmlstreambuffer-1.5.1/pom.xml 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/pom.xml 2014-05-14 07:59:19.000000000 +0000 @@ -2,14 +2,14 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2014 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development and Distribution License("CDDL") (collectively, the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the License at - https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + http://glassfish.java.net/public/CDDL+GPL_1_1.html or packager/legal/LICENSE.txt. See the License for the specific language governing permissions and limitations under the License. @@ -50,7 +50,7 @@ 4.0.0 com.sun.xml.stream.buffer streambuffer - 1.5.1 + 1.5.4 jar xmlstreambuffer @@ -59,9 +59,9 @@ http://xmlstreambuffer.java.net/ - scm:svn:https://svn.java.net/svn/xmlstreambuffer~svn/tags/streambuffer-1.5.1 - scm:svn:https://svn.java.net/svn/xmlstreambuffer~svn/tags/streambuffer-1.5.1 - http://java.net/projects/xmlstreambuffer/sources/svn/show/tags/streambuffer-1.5.1 + scm:svn:https://svn.java.net/svn/xmlstreambuffer~svn/tags/streambuffer-1.5.4 + scm:svn:https://svn.java.net/svn/xmlstreambuffer~svn/tags/streambuffer-1.5.4 + http://java.net/projects/xmlstreambuffer/sources/svn/show/tags/streambuffer-1.5.4 @@ -76,39 +76,34 @@ - Jitendra Kotamraju - jitendra.kotamraju@oracle.com + Martin Grebac + martin.grebac@oracle.com Oracle Corporation - Rama Pulavarthi - rama.pulavarthi@oracle.com + Lukas Jungmann + lukas.jungmann@oracle.com Oracle Corporation - Martin Grebac - martin.grebac@oracle.com + Miroslav Kos + miroslav.kos@oracle.com + Oracle Corporation + + + Jaroslav Savytskyi + iaroslav.savytskyi@oracle.com Oracle Corporation - javax.xml.stream - stax-api - 1.0-2 - - org.jvnet.staxex stax-ex 1.7.1 - javax.activation - activation - 1.1 - - junit junit 3.8 @@ -127,6 +122,29 @@ test + maven-enforcer-plugin + 1.0.1 + + + enforce-versions + + enforce + + + + + + + [1.6,) + + + [3.0.3,) + + + + + + org.apache.maven.plugins maven-compiler-plugin 2.5.1 @@ -137,12 +155,13 @@ org.apache.maven.plugins - maven-release-plugin - - forked-path - false - ${release.arguments} - + maven-javadoc-plugin + 2.8.1 + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 org.apache.maven.plugins @@ -155,6 +174,126 @@ + + org.codehaus.mojo + findbugs-maven-plugin + 2.5.2 + + ${findbugs.skip} + ${findbugs.threshold} + true + + exclude-common.xml,${findbugs.exclude} + + true + -Xms64m -Xmx256m + + + + org.glassfish.findbugs + findbugs + 1.0 + + + + + org.glassfish.copyright + glassfish-copyright-maven-plugin + 1.31 + + ${project.basedir}/copyright.txt + ${project.basedir}/copyright-exclude + + true + + true + + false + + false + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.5.1 + + + xml + + + 45 + 40 + true + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.1 + + true + {0,date,yyyy-MM-dd'T'HH:mm:ssZ} + + javasvn + + true + false + + + + validate + + create + + + + + + org.tmatesoft.svnkit + svnkit + 1.7.4-v1 + + + + + maven-jar-plugin + 2.4 + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + true + + + ${scmBranch}-${buildNumber}, ${timestamp} + + + + + + org.apache.felix + maven-bundle-plugin + 2.0.0 + + + bundle-manifest + process-classes + + manifest + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.7 + + 10 + + @@ -167,5 +306,11 @@ + + + ${project.basedir}/exclude.xml + false + Low + diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/AbstractCreator.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/AbstractCreator.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/AbstractCreator.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/AbstractCreator.java 2012-11-28 16:52:01.000000000 +0000 @@ -8,7 +8,7 @@ * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/AbstractCreatorProcessor.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/AbstractCreatorProcessor.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/AbstractCreatorProcessor.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/AbstractCreatorProcessor.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * @@ -40,6 +40,7 @@ package com.sun.xml.stream.buffer; +@SuppressWarnings("PointlessBitwiseExpression") public abstract class AbstractCreatorProcessor { /** * Flag on a T_DOCUMENT to indicate if a fragment diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/AbstractProcessor.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/AbstractProcessor.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/AbstractProcessor.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/AbstractProcessor.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/AttributesHolder.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/AttributesHolder.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/AttributesHolder.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/AttributesHolder.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * @@ -50,19 +50,19 @@ */ @SuppressWarnings({"PointlessArithmeticExpression"}) public final class AttributesHolder implements Attributes { - protected static final int DEFAULT_CAPACITY = 8; - protected static final int ITEM_SIZE = 1 << 3; + private static final int DEFAULT_CAPACITY = 8; + private static final int ITEM_SIZE = 1 << 3; - protected static final int PREFIX = 0; - protected static final int URI = 1; - protected static final int LOCAL_NAME = 2; - protected static final int QNAME = 3; - protected static final int TYPE = 4; - protected static final int VALUE = 5; + private static final int PREFIX = 0; + private static final int URI = 1; + private static final int LOCAL_NAME = 2; + private static final int QNAME = 3; + private static final int TYPE = 4; + private static final int VALUE = 5; - protected int _attributeCount; + private int _attributeCount; - protected String[] _strings; + private String[] _strings; public AttributesHolder() { _strings = new String[DEFAULT_CAPACITY * ITEM_SIZE]; diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/ContextClassloaderLocal.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/ContextClassloaderLocal.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/ContextClassloaderLocal.java 1970-01-01 00:00:00.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/ContextClassloaderLocal.java 2014-05-13 15:35:53.000000000 +0000 @@ -0,0 +1,101 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * http://glassfish.java.net/public/CDDL+GPL_1_1.html + * or packager/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at packager/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + */ + +package com.sun.xml.stream.buffer; + +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.text.MessageFormat; +import java.util.ResourceBundle; +import java.util.WeakHashMap; + +/** + * Simple utility ensuring that the value is cached only in case it is non-internal implementation + */ +abstract class ContextClassloaderLocal { + + private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE"; + + private WeakHashMap CACHE = new WeakHashMap(); + + public V get() throws Error { + ClassLoader tccl = getContextClassLoader(); + V instance = CACHE.get(tccl); + if (instance == null) { + instance = createNewInstance(); + CACHE.put(tccl, instance); + } + return instance; + } + + public void set(V instance) { + CACHE.put(getContextClassLoader(), instance); + } + + protected abstract V initialValue() throws Exception; + + private V createNewInstance() { + try { + return initialValue(); + } catch (Exception e) { + throw new Error(format(FAILED_TO_CREATE_NEW_INSTANCE, getClass().getName()), e); + } + } + + private static String format(String property, Object... args) { + String text = ResourceBundle.getBundle(ContextClassloaderLocal.class.getName()).getString(property); + return MessageFormat.format(text, args); + } + + private static ClassLoader getContextClassLoader() { + return (ClassLoader) + AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + ClassLoader cl = null; + try { + cl = Thread.currentThread().getContextClassLoader(); + } catch (SecurityException ex) { + } + return cl; + } + }); + } +} + diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/ContextClassloaderLocal.properties xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/ContextClassloaderLocal.properties --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/ContextClassloaderLocal.properties 1970-01-01 00:00:00.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/ContextClassloaderLocal.properties 2014-05-13 16:05:07.000000000 +0000 @@ -0,0 +1,41 @@ +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common Development +# and Distribution License("CDDL") (collectively, the "License"). You +# may not use this file except in compliance with the License. You can +# obtain a copy of the License at +# http://glassfish.java.net/public/CDDL+GPL_1_1.html +# or packager/legal/LICENSE.txt. See the License for the specific +# language governing permissions and limitations under the License. +# +# When distributing the software, include this License Header Notice in each +# file and include the License file at packager/legal/LICENSE.txt. +# +# GPL Classpath Exception: +# Oracle designates this particular file as subject to the "Classpath" +# exception as provided by Oracle in the GPL Version 2 section of the License +# file that accompanied this code. +# +# Modifications: +# If applicable, add the following below the License Header, with the fields +# enclosed by brackets [] replaced by your own identifying information: +# "Portions Copyright [year] [name of copyright owner]" +# +# Contributor(s): +# If you wish your version of this file to be governed by only the CDDL or +# only the GPL Version 2, indicate your decision by adding "[Contributor] +# elects to include this software in this distribution under the [CDDL or GPL +# Version 2] license." If you don't indicate a single choice of license, a +# recipient has the option to distribute your version of this file under +# either the CDDL, the GPL Version 2 or to extend the choice of license to +# its licensees as provided above. However, if you add GPL Version 2 code +# and therefore, elected the GPL Version 2 license, then the option applies +# only if the new code is made subject to such option by the copyright +# holder. +# + +FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0} diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/FragmentedArray.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/FragmentedArray.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/FragmentedArray.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/FragmentedArray.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * @@ -40,10 +40,10 @@ package com.sun.xml.stream.buffer; -class FragmentedArray { - protected T _item; - protected FragmentedArray _next; - protected FragmentedArray _previous; +final class FragmentedArray { + private T _item; + private FragmentedArray _next; + private FragmentedArray _previous; FragmentedArray(T item) { this(item, null); diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/MutableXMLStreamBuffer.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/MutableXMLStreamBuffer.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/MutableXMLStreamBuffer.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/MutableXMLStreamBuffer.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/sax/DefaultWithLexicalHandler.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/sax/DefaultWithLexicalHandler.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/sax/DefaultWithLexicalHandler.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/sax/DefaultWithLexicalHandler.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/sax/Features.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/sax/Features.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/sax/Features.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/sax/Features.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/sax/Properties.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/sax/Properties.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/sax/Properties.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/sax/Properties.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/sax/SAXBufferCreator.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/sax/SAXBufferCreator.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/sax/SAXBufferCreator.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/sax/SAXBufferCreator.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/sax/SAXBufferProcessor.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/sax/SAXBufferProcessor.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/sax/SAXBufferProcessor.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/sax/SAXBufferProcessor.java 2012-11-28 16:52:01.000000000 +0000 @@ -8,7 +8,7 @@ * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/stax/NamespaceContexHelper.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/NamespaceContexHelper.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/stax/NamespaceContexHelper.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/NamespaceContexHelper.java 2012-11-28 16:52:01.000000000 +0000 @@ -8,7 +8,7 @@ * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/stax/StreamBufferCreator.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamBufferCreator.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/stax/StreamBufferCreator.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamBufferCreator.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/stax/StreamReaderBufferCreator.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamReaderBufferCreator.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/stax/StreamReaderBufferCreator.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamReaderBufferCreator.java 2013-06-26 11:28:47.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2013 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * @@ -230,7 +230,8 @@ CharSequence c = reader.getPCDATA(); if (c instanceof Base64Data) { storeStructure(T_TEXT_AS_OBJECT); - storeContentObject(((Base64Data)c).clone()); + //Instead of clone the Base64Data, the original Base64Data instance is used here to preserve the DataHandler + storeContentObject(c); } else { storeContentCharacters(T_TEXT_AS_CHAR_ARRAY, reader.getTextCharacters(), reader.getTextStart(), diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/stax/StreamReaderBufferProcessor.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamReaderBufferProcessor.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/stax/StreamReaderBufferProcessor.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamReaderBufferProcessor.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferProcessor.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferProcessor.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferProcessor.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferProcessor.java 2012-11-28 16:52:01.000000000 +0000 @@ -8,7 +8,7 @@ * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/XMLStreamBufferException.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/XMLStreamBufferException.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/XMLStreamBufferException.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/XMLStreamBufferException.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/XMLStreamBuffer.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/XMLStreamBuffer.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/XMLStreamBuffer.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/XMLStreamBuffer.java 2014-05-13 15:35:53.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2014 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * @@ -385,7 +385,12 @@ writeTo(handler, errorHandler, isFragment()); } - private static final TransformerFactory trnsformerFactory = TransformerFactory.newInstance(); + private static final ContextClassloaderLocal trnsformerFactory = new ContextClassloaderLocal() { + @Override + protected TransformerFactory initialValue() throws Exception { + return TransformerFactory.newInstance(); + } + }; /** * Writes out the contents of this buffer as DOM node and append that to the given node. @@ -397,7 +402,7 @@ */ public final Node writeTo(Node n) throws XMLStreamBufferException { try { - Transformer t = trnsformerFactory.newTransformer(); + Transformer t = trnsformerFactory.get().newTransformer(); t.transform(new XMLStreamBufferSource(this), new DOMResult(n)); return n.getLastChild(); } catch (TransformerException e) { diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/XMLStreamBufferMark.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/XMLStreamBufferMark.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/XMLStreamBufferMark.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/XMLStreamBufferMark.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/XMLStreamBufferResult.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/XMLStreamBufferResult.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/XMLStreamBufferResult.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/XMLStreamBufferResult.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/XMLStreamBufferSource.java xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/XMLStreamBufferSource.java --- xmlstreambuffer-1.5.1/src/com/sun/xml/stream/buffer/XMLStreamBufferSource.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/src/com/sun/xml/stream/buffer/XMLStreamBufferSource.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/BaseBufferTestCase.java xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/BaseBufferTestCase.java --- xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/BaseBufferTestCase.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/BaseBufferTestCase.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/EmptyBufferTest.java xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/EmptyBufferTest.java --- xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/EmptyBufferTest.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/EmptyBufferTest.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/MarkTest.java xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/MarkTest.java --- xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/MarkTest.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/MarkTest.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/RegressionTestBug1.java xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/RegressionTestBug1.java --- xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/RegressionTestBug1.java 1970-01-01 00:00:00.000000000 +0000 +++ xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/RegressionTestBug1.java 2012-11-30 14:06:09.000000000 +0000 @@ -0,0 +1,73 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * http://glassfish.java.net/public/CDDL+GPL_1_1.html + * or packager/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at packager/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + */ +package com.sun.xml.stream.buffer; + +import java.io.InputStream; + +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamReader; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamSource; + +public class RegressionTestBug1 extends junit.framework.TestCase { + + public void test() throws Exception { + + InputStream is = this.getClass().getClassLoader().getResourceAsStream("data/wsdlnamespace.wsdl"); + + Transformer transformer = TransformerFactory.newInstance().newTransformer(); + XMLStreamBufferResult xsbr = new XMLStreamBufferResult(); + transformer.transform(new StreamSource(is), xsbr); + + XMLStreamBuffer xrb = xsbr.getXMLStreamBuffer(); + XMLStreamReader xr = xrb.readAsXMLStreamReader(); + + while (xr.hasNext()) { + int t = xr.next(); + + if (t == XMLStreamConstants.START_ELEMENT) { + if (xr.getName().getLocalPart().contains("elementFormDefault")) { + fail("Attribute names printed for element name calls."); + } + } + } + } +} \ No newline at end of file diff -Nru xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/sax/NamespaceTest.java xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/sax/NamespaceTest.java --- xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/sax/NamespaceTest.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/sax/NamespaceTest.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/stax/Base64Test.java xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/stax/Base64Test.java --- xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/stax/Base64Test.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/stax/Base64Test.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/stax/CharactersTest.java xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/stax/CharactersTest.java --- xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/stax/CharactersTest.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/stax/CharactersTest.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/stax/InscopeNamespaceTest.java xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/stax/InscopeNamespaceTest.java --- xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/stax/InscopeNamespaceTest.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/stax/InscopeNamespaceTest.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/stax/OverrideNamespaceTest.java xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/stax/OverrideNamespaceTest.java --- xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/stax/OverrideNamespaceTest.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/stax/OverrideNamespaceTest.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreatorTest.java xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreatorTest.java --- xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreatorTest.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreatorTest.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/stax/StreamWriterBufferProcessorTest.java xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/stax/StreamWriterBufferProcessorTest.java --- xmlstreambuffer-1.5.1/test/com/sun/xml/stream/buffer/stax/StreamWriterBufferProcessorTest.java 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/test/com/sun/xml/stream/buffer/stax/StreamWriterBufferProcessorTest.java 2012-11-28 16:52:01.000000000 +0000 @@ -1,14 +1,14 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2012 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * http://glassfish.java.net/public/CDDL+GPL_1_1.html * or packager/legal/LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * diff -Nru xmlstreambuffer-1.5.1/test/data/header.wsdl xmlstreambuffer-1.5.4/test/data/header.wsdl --- xmlstreambuffer-1.5.1/test/data/header.wsdl 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/test/data/header.wsdl 2012-11-28 16:52:01.000000000 +0000 @@ -1,4 +1,45 @@ + contents - diff -Nru xmlstreambuffer-1.5.1/test/data/test-epr.xml xmlstreambuffer-1.5.4/test/data/test-epr.xml --- xmlstreambuffer-1.5.1/test/data/test-epr.xml 2014-01-08 07:39:03.000000000 +0000 +++ xmlstreambuffer-1.5.4/test/data/test-epr.xml 2012-11-28 16:52:01.000000000 +0000 @@ -1,3 +1,44 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file