Mercurial > hg > release > icedtea7-forest-2.2 > jaxws
changeset 51:d353089652d6
Merge.
line wrap: on
line diff
--- a/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java Fri May 08 18:01:16 2009 +0100 @@ -390,6 +390,16 @@ octetBufferIndex = 0; } + public void flush() throws IOException { + flushBuffer(); + out.flush(); + } + + public void setHeader(String header) { + this.header = header; + } + + static byte[] toBytes(String s) { byte[] buf = new byte[s.length()]; for( int i=s.length()-1; i>=0; i-- )
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java Fri May 08 18:01:16 2009 +0100 @@ -54,13 +54,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; @@ -72,6 +79,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); @@ -95,14 +105,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)) { @@ -639,10 +654,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Fri May 08 18:01:16 2009 +0100 @@ -70,7 +70,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,11 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + * + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -55,7 +61,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java Fri May 08 18:01:16 2009 +0100 @@ -49,7 +49,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,11 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + * + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -54,15 +60,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;
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,11 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + * + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -69,7 +75,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java Fri May 08 18:01:16 2009 +0100 @@ -37,7 +37,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,9 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -45,7 +49,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,11 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + * + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -50,7 +56,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,11 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + * + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,7 +65,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,11 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + * + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,7 +49,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,11 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + * + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,7 +53,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 =
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,11 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + * + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -60,7 +66,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,11 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + * + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,7 +49,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,11 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + * + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -63,7 +69,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,9 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -57,7 +61,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,9 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,9 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,9 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,9 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -48,7 +52,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,9 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,9 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,7 +51,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,9 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,7 +51,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,9 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,9 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,9 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,7 +51,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java Fri May 08 18:01:16 2009 +0100 @@ -1,5 +1,9 @@ /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,7 +51,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java Fri May 08 18:01:16 2009 +0100 @@ -45,12 +45,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");
--- a/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java Fri May 08 18:01:16 2009 +0100 @@ -62,12 +62,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") && @@ -76,6 +77,7 @@ new com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl(); } } + */ /** * TransformerFactory instance.
--- a/src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java Fri May 08 18:01:16 2009 +0100 @@ -25,6 +25,9 @@ package com.sun.xml.internal.txw2; +import java.util.AbstractList; +import java.util.Collections; +import java.util.List; import javax.xml.namespace.QName; /** @@ -53,50 +56,60 @@ */ void print(DT dt, NamespaceResolver resolver, StringBuilder buf); - - 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; + 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 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]; } - }; + + public int size() { + return BUILTIN_ARRAY.length; + } + }); }
--- a/src/share/classes/com/sun/xml/internal/txw2/Document.java Mon Apr 27 20:18:40 2009 -0700 +++ b/src/share/classes/com/sun/xml/internal/txw2/Document.java Fri May 08 18:01:16 2009 +0100 @@ -76,7 +76,7 @@ Document(XmlSerializer out) { this.out = out; - for( DatatypeWriter dw : DatatypeWriter.BUILDIN ) + for( DatatypeWriter dw : DatatypeWriter.BUILTIN ) datatypeWriters.put(dw.getType(),dw); }