Mercurial > hg > release > icedtea-1.9
view patches/security/icedtea-6658158.patch @ 1768:3a122c249dda
Port latest security fixes from IcedTea6.
2009-04-06 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Add new patches.
* patches/security/icedtea-6536193.patch,
* patches/security/icedtea-6610888.patch,
* patches/security/icedtea-6610896.patch,
* patches/security/icedtea-6630639.patch,
* patches/security/icedtea-6632886.patch,
* patches/security/icedtea-6636360.patch,
* patches/security/icedtea-6652463.patch,
* patches/security/icedtea-6656633.patch,
* patches/security/icedtea-6658158.patch,
* patches/security/icedtea-6691246.patch,
* patches/security/icedtea-6717680.patch,
* patches/security/icedtea-6721651.patch,
* patches/security/icedtea-6737315.patch,
* patches/security/icedtea-6792554.patch,
* patches/security/icedtea-6804996.patch,
* patches/security/icedtea-6804997.patch,
* patches/security/icedtea-6804998.patch:
Security patches ported from IcedTea6.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Tue, 07 Apr 2009 01:02:17 +0100 |
parents | |
children |
line wrap: on
line source
diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java 2009-04-06 18:03:31.000000000 +0100 @@ -53,13 +53,20 @@ * */ public class HttpSOAPConnection extends SOAPConnection { + + public static final String vmVendor = System.getProperty("java.vendor.url"); + private static final String sunVmVendor = "http://java.sun.com/"; + private static final String ibmVmVendor = "http://www.ibm.com/"; + private static final boolean isSunVM = sunVmVendor.equals(vmVendor) ? true: false; + private static final boolean isIBMVM = ibmVmVendor.equals(vmVendor) ? true : false; + private static final String JAXM_URLENDPOINT="javax.xml.messaging.URLEndpoint"; - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.HTTP_CONN_DOMAIN, "com.sun.xml.internal.messaging.saaj.client.p2p.LocalStrings"); - public static String defaultProxyHost = null; - public static int defaultProxyPort = -1; + public static final String defaultProxyHost = null; + public static final int defaultProxyPort = -1; MessageFactory messageFactory = null; @@ -71,6 +78,9 @@ try { messageFactory = MessageFactory.newInstance(SOAPConstants.DYNAMIC_SOAP_PROTOCOL); + } catch (NoSuchMethodError ex) { + //fallback to default SOAP 1.1 in this case for backward compatibility + messageFactory = MessageFactory.newInstance(); } catch (Exception ex) { log.log(Level.SEVERE, "SAAJ0001.p2p.cannot.create.msg.factory", ex); throw new SOAPExceptionImpl("Unable to create message factory", ex); @@ -94,14 +104,19 @@ throw new SOAPExceptionImpl("Connection is closed"); } - Class urlEndpointClass = null; + Class urlEndpointClass = null; + ClassLoader loader = Thread.currentThread().getContextClassLoader(); try { - urlEndpointClass = Class.forName("javax.xml.messaging.URLEndpoint"); - } catch (Exception ex) { - //Do nothing. URLEndpoint is available only when JAXM is there. - log.finest("SAAJ0090.p2p.endpoint.available.only.for.JAXM"); - } + if (loader != null) { + urlEndpointClass = loader.loadClass(JAXM_URLENDPOINT); + } else { + urlEndpointClass = Class.forName(JAXM_URLENDPOINT); + } + } catch (ClassNotFoundException ex) { + //Do nothing. URLEndpoint is available only when JAXM is there. + log.finest("SAAJ0090.p2p.endpoint.available.only.for.JAXM"); + } if (urlEndpointClass != null) { if (urlEndpointClass.isInstance(endPoint)) { @@ -638,10 +653,23 @@ return ret; } - - private static String SSL_PKG = "com.sun.net.ssl.internal.www.protocol"; - private static String SSL_PROVIDER = - "com.sun.net.ssl.internal.ssl.Provider"; + //private static String SSL_PKG = "com.sun.net.ssl.internal.www.protocol"; + //private static String SSL_PROVIDER = + // "com.sun.net.ssl.internal.ssl.Provider"; + private static final String SSL_PKG; + private static final String SSL_PROVIDER; + + + static { + if (isIBMVM) { + SSL_PKG ="com.ibm.net.ssl.internal.www.protocol"; + SSL_PROVIDER ="com.ibm.net.ssl.internal.ssl.Provider"; + } else { + //if not IBM VM default to Sun. + SSL_PKG = "com.sun.net.ssl.internal.www.protocol"; + SSL_PROVIDER ="com.sun.net.ssl.internal.ssl.Provider"; + } + } private void initHttps() { //if(!setHttps) { String pkgs = System.getProperty("java.protocol.handler.pkgs"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java 2009-04-06 18:03:31.000000000 +0100 @@ -69,7 +69,7 @@ */ public class AttachmentPartImpl extends AttachmentPart { - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java 2009-04-06 18:16:24.000000000 +0100 @@ -1,7 +1,7 @@ /* - * $Id: EnvelopeFactory.java,v 1.24 2006/01/27 12:49:26 vj135062 Exp $ - * $Revision: 1.24 $ - * $Date: 2006/01/27 12:49:26 $ + * + * + * */ /* @@ -54,7 +54,7 @@ */ public class EnvelopeFactory { - protected static Logger + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java 2009-04-06 18:03:31.000000000 +0100 @@ -48,7 +48,7 @@ public class ImageDataContentHandler extends Component implements DataContentHandler { - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java 2009-04-06 18:14:32.000000000 +0100 @@ -1,7 +1,7 @@ /* - * $Id: CDATAImpl.java,v 1.19 2006/01/27 12:49:34 vj135062 Exp $ - * $Revision: 1.19 $ - * $Date: 2006/01/27 12:49:34 $ + * + * + * */ /* @@ -42,7 +42,7 @@ extends com.sun.org.apache.xerces.internal.dom.CDATASectionImpl implements javax.xml.soap.Text { - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_IMPL_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.impl.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java 2009-04-06 18:14:47.000000000 +0100 @@ -1,7 +1,7 @@ /* - * $Id: CommentImpl.java,v 1.17 2006/01/27 12:49:34 vj135062 Exp $ - * $Revision: 1.17 $ - * $Date: 2006/01/27 12:49:34 $ + * + * + * */ /* @@ -46,7 +46,7 @@ extends com.sun.org.apache.xerces.internal.dom.CommentImpl implements javax.xml.soap.Text, org.w3c.dom.Comment { - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_IMPL_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.impl.LocalStrings"); protected static ResourceBundle rb = diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java 2009-04-06 18:13:49.000000000 +0100 @@ -1,7 +1,7 @@ /* - * $Id: ElementImpl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $ - * $Revision: 1.1.1.1 $ - * $Date: 2006/01/27 13:10:57 $ + * + * + * */ /* @@ -59,7 +59,7 @@ protected QName elementQName; - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_IMPL_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.impl.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java 2009-04-06 18:14:14.000000000 +0100 @@ -1,7 +1,7 @@ /* - * $Id: TextImpl.java,v 1.19 2006/01/27 12:49:36 vj135062 Exp $ - * $Revision: 1.19 $ - * $Date: 2006/01/27 12:49:36 $ + * + * + * */ /* @@ -42,7 +42,7 @@ extends com.sun.org.apache.xerces.internal.dom.TextImpl implements javax.xml.soap.Text, org.w3c.dom.Text { - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_IMPL_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.impl.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java 2009-04-06 18:08:37.000000000 +0100 @@ -1,7 +1,7 @@ /* - * $Id: MessageFactoryImpl.java,v 1.23 2006/01/27 12:49:27 vj135062 Exp $ - * $Revision: 1.23 $ - * $Date: 2006/01/27 12:49:27 $ + * + * + * */ /* @@ -53,15 +53,15 @@ */ public class MessageFactoryImpl extends MessageFactory { - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.LocalStrings"); - protected static OutputStream listener; + protected OutputStream listener; protected boolean lazyAttachments = false; - public static OutputStream listen(OutputStream newListener) { + public OutputStream listen(OutputStream newListener) { OutputStream oldListener = listener; listener = newListener; return oldListener; diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java 2009-04-06 18:09:47.000000000 +0100 @@ -1,7 +1,7 @@ /* - * $Id: MessageImpl.java,v 1.3 2006/08/04 09:24:24 ashutoshshahi Exp $ - * $Revision: 1.3 $ - * $Date: 2006/08/04 09:24:24 $ + * + * + * */ /* @@ -68,7 +68,7 @@ public static final String CONTENT_ID = "Content-ID"; public static final String CONTENT_LOCATION = "Content-Location"; - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java 2009-04-06 18:25:32.000000000 +0100 @@ -1,7 +1,7 @@ /* - * $Id: NameImpl.java,v 1.48 2006/01/27 12:49:38 vj135062 Exp $ - * $Revision: 1.48 $ - * $Date: 2006/01/27 12:49:38 $ + * + * + * */ /* @@ -62,7 +62,7 @@ protected String prefix = ""; private String qualifiedName = null; - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.NAMING_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.name.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java 2009-04-06 18:03:31.000000000 +0100 @@ -38,7 +38,7 @@ public class SAAJMetaFactoryImpl extends SAAJMetaFactory { - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java 2009-04-06 18:24:54.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: SOAPDocumentImpl.java,v 1.15 2006/01/27 12:49:29 vj135062 Exp $ + * */ /* @@ -44,7 +44,7 @@ public class SOAPDocumentImpl extends DocumentImpl implements SOAPDocument { - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java 2009-04-06 18:10:50.000000000 +0100 @@ -1,7 +1,7 @@ /* - * $Id: SOAPFactoryImpl.java,v 1.21 2006/01/27 12:49:29 vj135062 Exp $ - * $Revision: 1.21 $ - * $Date: 2006/01/27 12:49:29 $ + * + * + * */ /* @@ -49,7 +49,7 @@ public abstract class SOAPFactoryImpl extends SOAPFactory { - protected static Logger + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java 2009-04-06 18:24:42.000000000 +0100 @@ -1,7 +1,7 @@ /* - * $Id: SOAPPartImpl.java,v 1.1.1.1 2006/01/27 13:10:55 kumarjayanti Exp $ - * $Revision: 1.1.1.1 $ - * $Date: 2006/01/27 13:10:55 $ + * + * + * */ /* @@ -58,7 +58,7 @@ * @author Anil Vijendran (anil@sun.com) */ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument { - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java 2009-04-06 18:29:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: Fault1_1Impl.java,v 1.20 2006/01/27 12:49:41 vj135062 Exp $ + * */ /* @@ -56,7 +56,7 @@ public class Fault1_1Impl extends FaultImpl { - protected static Logger log = + protected static final Logger log = Logger.getLogger( LogDomainConstants.SOAP_VER1_1_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.ver1_1.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java 2009-04-06 18:29:14.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: Header1_1Impl.java,v 1.29 2006/01/27 12:49:41 vj135062 Exp $ + * */ /* diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java 2009-04-06 18:29:28.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: HeaderElement1_1Impl.java,v 1.29 2006/01/27 12:49:41 vj135062 Exp $ + * */ /* diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java 2009-04-06 18:29:37.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: Message1_1Impl.java,v 1.24 2006/01/27 12:49:41 vj135062 Exp $ + * */ /* diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java 2009-04-06 18:29:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: SOAPPart1_1Impl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $ + * */ /* @@ -47,7 +47,7 @@ public class SOAPPart1_1Impl extends SOAPPartImpl implements SOAPConstants { - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.SOAP_VER1_1_DOMAIN, "com.sun.xml.internal.messaging.saaj.soap.ver1_1.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java 2009-04-06 18:27:36.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: Body1_2Impl.java,v 1.32 2006/01/27 12:49:44 vj135062 Exp $ + * */ /* diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java 2009-04-06 18:27:47.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: Detail1_2Impl.java,v 1.24 2006/01/27 12:49:45 vj135062 Exp $ + * */ /* @@ -46,7 +46,7 @@ public class Detail1_2Impl extends DetailImpl { - protected static Logger log = + protected static final Logger log = Logger.getLogger(Detail1_2Impl.class.getName(), "com.sun.xml.internal.messaging.saaj.soap.ver1_2.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java 2009-04-06 18:27:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: Envelope1_2Impl.java,v 1.26 2006/01/27 12:49:47 vj135062 Exp $ + * */ /* @@ -46,7 +46,7 @@ public class Envelope1_2Impl extends EnvelopeImpl { - protected static Logger log = + protected static final Logger log = Logger.getLogger(Envelope1_2Impl.class.getName(), "com.sun.xml.internal.messaging.saaj.soap.ver1_2.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java 2009-04-06 18:28:07.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: Fault1_2Impl.java,v 1.45 2006/01/27 12:49:47 vj135062 Exp $ + * */ /* diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java 2009-04-06 18:28:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: Header1_2Impl.java,v 1.36 2006/01/27 12:49:48 vj135062 Exp $ + * */ /* diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java 2009-04-06 18:28:27.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: HeaderElement1_2Impl.java,v 1.29 2006/01/27 12:49:48 vj135062 Exp $ + * */ /* @@ -46,7 +46,7 @@ public class HeaderElement1_2Impl extends HeaderElementImpl { - private static Logger log = + private static final Logger log = Logger.getLogger(HeaderElement1_2Impl.class.getName(), "com.sun.xml.internal.messaging.saaj.soap.ver1_2.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java 2009-04-06 18:28:40.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: SOAPPart1_2Impl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $ + * */ /* @@ -46,7 +46,7 @@ public class SOAPPart1_2Impl extends SOAPPartImpl implements SOAPConstants{ - protected static Logger log = + protected static final Logger log = Logger.getLogger(SOAPPart1_2Impl.class.getName(), "com.sun.xml.internal.messaging.saaj.soap.ver1_2.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java 2009-04-06 18:03:31.000000000 +0100 @@ -44,12 +44,12 @@ * because they are not legal in SOAP. If the user of this class sets a * LexicalHandler, then it forwards events to that handler. * - * $Id: RejectDoctypeSaxFilter.java,v 1.13 2006/01/27 12:49:52 vj135062 Exp $ + * * @author Edwin Goei */ public class RejectDoctypeSaxFilter extends XMLFilterImpl implements XMLReader, LexicalHandler{ - protected static Logger log = + protected static final Logger log = Logger.getLogger(LogDomainConstants.UTIL_DOMAIN, "com.sun.xml.internal.messaging.saaj.util.LocalStrings"); diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java 2009-04-06 17:30:24.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java 2009-04-06 18:05:38.000000000 +0100 @@ -61,12 +61,13 @@ public class EfficientStreamingTransformer extends javax.xml.transform.Transformer { - static final String version; - static final String vendor; + //static final String version; + //static final String vendor; - protected static TransformerFactory transformerFactory = TransformerFactory.newInstance(); + protected static final TransformerFactory transformerFactory = TransformerFactory.newInstance(); - static { + //removing support for Java 1.4 and 1.3 : CR6658158 + /*static { version = System.getProperty("java.vm.version"); vendor = System.getProperty("java.vm.vendor"); if (vendor.startsWith("Sun") && @@ -75,6 +76,7 @@ new com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl(); } } + */ /** * TransformerFactory instance. diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java 2009-04-06 17:30:23.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java 2009-04-06 18:03:31.000000000 +0100 @@ -24,6 +24,9 @@ */ package com.sun.xml.internal.txw2; +import java.util.AbstractList; +import java.util.Collections; +import java.util.List; import javax.xml.namespace.QName; /** @@ -52,50 +55,60 @@ */ void print(DT dt, NamespaceResolver resolver, StringBuilder buf); + static final List<DatatypeWriter<?>> BUILTIN = Collections.unmodifiableList(new AbstractList() { + + private DatatypeWriter<?>[] BUILTIN_ARRAY = new DatatypeWriter<?>[] { + new DatatypeWriter<String>() { + public Class<String> getType() { + return String.class; + } + public void print(String s, NamespaceResolver resolver, StringBuilder buf) { + buf.append(s); + } + }, + new DatatypeWriter<Integer>() { + public Class<Integer> getType() { + return Integer.class; + } + public void print(Integer i, NamespaceResolver resolver, StringBuilder buf) { + buf.append(i); + } + }, + new DatatypeWriter<Float>() { + public Class<Float> getType() { + return Float.class; + } + public void print(Float f, NamespaceResolver resolver, StringBuilder buf) { + buf.append(f); + } + }, + new DatatypeWriter<Double>() { + public Class<Double> getType() { + return Double.class; + } + public void print(Double d, NamespaceResolver resolver, StringBuilder buf) { + buf.append(d); + } + }, + new DatatypeWriter<QName>() { + public Class<QName> getType() { + return QName.class; + } + public void print(QName qn, NamespaceResolver resolver, StringBuilder buf) { + String p = resolver.getPrefix(qn.getNamespaceURI()); + if(p.length()!=0) + buf.append(p).append(':'); + buf.append(qn.getLocalPart()); + } + } + }; + + public DatatypeWriter<?> get(int n) { + return BUILTIN_ARRAY[n]; + } - static final DatatypeWriter<?>[] BUILDIN = new DatatypeWriter<?>[] { - new DatatypeWriter<String>() { - public Class<String> getType() { - return String.class; - } - public void print(String s, NamespaceResolver resolver, StringBuilder buf) { - buf.append(s); - } - }, - new DatatypeWriter<Integer>() { - public Class<Integer> getType() { - return Integer.class; - } - public void print(Integer i, NamespaceResolver resolver, StringBuilder buf) { - buf.append(i); - } - }, - new DatatypeWriter<Float>() { - public Class<Float> getType() { - return Float.class; - } - public void print(Float f, NamespaceResolver resolver, StringBuilder buf) { - buf.append(f); - } - }, - new DatatypeWriter<Double>() { - public Class<Double> getType() { - return Double.class; - } - public void print(Double d, NamespaceResolver resolver, StringBuilder buf) { - buf.append(d); - } - }, - new DatatypeWriter<QName>() { - public Class<QName> getType() { - return QName.class; - } - public void print(QName qn, NamespaceResolver resolver, StringBuilder buf) { - String p = resolver.getPrefix(qn.getNamespaceURI()); - if(p.length()!=0) - buf.append(p).append(':'); - buf.append(qn.getLocalPart()); - } + public int size() { + return BUILTIN_ARRAY.length; } - }; + }); } diff -Nru openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/txw2/Document.java openjdk/jaxws/src/share/classes/com/sun/xml/internal/txw2/Document.java --- openjdk.orig/jaxws/src/share/classes/com/sun/xml/internal/txw2/Document.java 2009-04-06 17:30:23.000000000 +0100 +++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/txw2/Document.java 2009-04-06 18:03:31.000000000 +0100 @@ -75,7 +75,7 @@ Document(XmlSerializer out) { this.out = out; - for( DatatypeWriter dw : DatatypeWriter.BUILDIN ) + for( DatatypeWriter dw : DatatypeWriter.BUILTIN ) datatypeWriters.put(dw.getType(),dw); }