Mercurial > hg > icedtea7-forest-aarch64 > jaxws
changeset 101:c33dece1b2b3
Merge
line wrap: on
line diff
--- a/.hgtags Mon Aug 17 13:33:49 2009 +0100 +++ b/.hgtags Fri Aug 21 19:46:03 2009 +0100 @@ -43,3 +43,4 @@ fa8712c099edd5c9a6b3ed9729353738004d388f jdk7-b66 faa13cd4d6cdcfb155da5ed23b0da6e0ed0f9ea8 jdk7-b67 845fa487f0f72a9f232ead8315c0087a477a5a31 jdk7-b68 +3e64fdfb92910e164d1f4b21b147719d5c674254 jdk7-b69
--- a/src/share/classes/com/sun/codemodel/internal/fmt/package.html Mon Aug 17 13:33:49 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -<!-- - Copyright 2005-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 - under the terms of the GNU General Public License version 2 only, as - published by the Free Software Foundation. Sun designates this - particular file as subject to the "Classpath" exception as provided - by Sun in the LICENSE file that accompanied this code. - - This code is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - version 2 for more details (a copy is included in the LICENSE file that - accompanied this code). - - You should have received a copy of the GNU General Public License version - 2 along with this work; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - - Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - CA 95054 USA or visit www.sun.com if you need additional information or - have any questions. ---> -<HTML> -<BODY> -Various resource file formats (classes that implement <code>JResourceFile</code>). -</BODY> -</HTML>
--- a/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java Mon Aug 17 13:33:49 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* - * Copyright 2005-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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ -package com.sun.tools.internal.xjc.api.impl.j2s; - -import java.text.MessageFormat; -import java.util.ResourceBundle; - -/** - * @author Kohsuke Kawaguchi - */ -enum Messages { - ; - - - private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName()); - - public String toString() { - return format(); - } - - public String format( Object... args ) { - return MessageFormat.format( rb.getString(name()), args ); - } -}
--- a/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties Mon Aug 17 13:33:49 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -# -# Copyright 2005-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 -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Sun designates this -# particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -# CA 95054 USA or visit www.sun.com if you need additional information or -# have any questions. -# - -
--- a/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java Mon Aug 17 13:33:49 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,237 +0,0 @@ -/* - * Copyright 2005-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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC. - */ - - - -package com.sun.xml.internal.fastinfoset.stax.events; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.events.Namespace; -import javax.xml.stream.events.XMLEvent; -import javax.xml.stream.util.XMLEventAllocator; -import javax.xml.stream.util.XMLEventConsumer; - -import com.sun.xml.internal.fastinfoset.CommonResourceBundle; - -/** - * This class provides the same functionality as StAXEventAllocatorBase, but without - * using EventFactory and creating a new object for each call. - * - * It seems to be good idea using static components. Unfortunately, EventReader's peek - * and next methods require that multiple instances being created. - * - */ -public class StAXEventAllocator implements XMLEventAllocator { - StartElementEvent startElement = new StartElementEvent(); - EndElementEvent endElement = new EndElementEvent(); - CharactersEvent characters = new CharactersEvent(); - CharactersEvent cData = new CharactersEvent("",true); - CharactersEvent space = new CharactersEvent(); - CommentEvent comment = new CommentEvent(); - EntityReferenceEvent entity = new EntityReferenceEvent(); - ProcessingInstructionEvent pi = new ProcessingInstructionEvent(); - StartDocumentEvent startDoc = new StartDocumentEvent(); - EndDocumentEvent endDoc = new EndDocumentEvent(); - DTDEvent dtd = new DTDEvent(); - - /** Creates a new instance of StAXEventAllocator */ - public StAXEventAllocator() { - } - public XMLEventAllocator newInstance() { - return new StAXEventAllocator(); - } - - /** - * This method allocates an event given the current state of the XMLStreamReader. - * If this XMLEventAllocator does not have a one-to-one mapping between reader state - * and events this method will return null. - * @param streamReader The XMLStreamReader to allocate from - * @return the event corresponding to the current reader state - */ - public XMLEvent allocate(XMLStreamReader streamReader) throws XMLStreamException { - if(streamReader == null ) - throw new XMLStreamException(CommonResourceBundle.getInstance().getString("message.nullReader")); - return getXMLEvent(streamReader); - } - - /** - * This method allocates an event or set of events given the current state of - * the XMLStreamReader and adds the event or set of events to the consumer that - * was passed in. - * @param streamReader The XMLStreamReader to allocate from - * @param consumer The XMLEventConsumer to add to. - */ - public void allocate(XMLStreamReader streamReader, XMLEventConsumer consumer) throws XMLStreamException { - consumer.add(getXMLEvent(streamReader)); - - } - // ---------------------end of methods defined by XMLEventAllocator-----------------// - - - XMLEvent getXMLEvent(XMLStreamReader reader){ - EventBase event = null; - int eventType = reader.getEventType(); - - switch(eventType){ - - case XMLEvent.START_ELEMENT: - { - startElement.reset(); - startElement.setName(new QName(reader.getNamespaceURI(), - reader.getLocalName(), reader.getPrefix())); - - addAttributes(startElement,reader); - addNamespaces(startElement, reader); - //need to fix it along with the Reader - //setNamespaceContext(startElement,reader); - event = startElement; - break; - } - case XMLEvent.END_ELEMENT: - { - endElement.reset(); - endElement.setName(new QName(reader.getNamespaceURI(), - reader.getLocalName(),reader.getPrefix())); - addNamespaces(endElement,reader); - event = endElement ; - break; - } - case XMLEvent.PROCESSING_INSTRUCTION: - { - pi.setTarget(reader.getPITarget()); - pi.setData(reader.getPIData()); - event = pi; - break; - } - case XMLEvent.CHARACTERS: - { - characters.setData(reader.getText()); - event = characters; - /** - if (reader.isWhiteSpace()) { - space.setData(reader.getText()); - space.setSpace(true); - event = space; - } - else { - characters.setData(reader.getText()); - event = characters; - } - */ - break; - } - case XMLEvent.COMMENT: - { - comment.setText(reader.getText()); - event = comment; - break; - } - case XMLEvent.START_DOCUMENT: - { - startDoc.reset(); - String encoding = reader.getEncoding(); - String version = reader.getVersion(); - if (encoding != null) - startDoc.setEncoding(encoding); - if (version != null) - startDoc.setVersion(version); - startDoc.setStandalone(reader.isStandalone()); - if(reader.getCharacterEncodingScheme() != null){ - startDoc.setDeclaredEncoding(true); - }else{ - startDoc.setDeclaredEncoding(false); - } - event = startDoc ; - break; - } - case XMLEvent.END_DOCUMENT:{ - event = endDoc; - break; - } - case XMLEvent.ENTITY_REFERENCE:{ - entity.setName(reader.getLocalName()); - entity.setDeclaration(new EntityDeclarationImpl(reader.getLocalName(),reader.getText())); - event = entity; - break; - - } - case XMLEvent.ATTRIBUTE:{ - event = null ; - break; - } - case XMLEvent.DTD:{ - dtd.setDTD(reader.getText()); - event = dtd; - break; - } - case XMLEvent.CDATA:{ - cData.setData(reader.getText()); - event = cData; - break; - } - case XMLEvent.SPACE:{ - space.setData(reader.getText()); - space.setSpace(true); - event = space; - break; - } - } - event.setLocation(reader.getLocation()); - return event ; - } - - //use event.addAttribute instead of addAttributes to avoid creating another list - protected void addAttributes(StartElementEvent event,XMLStreamReader reader){ - AttributeBase attr = null; - for(int i=0; i<reader.getAttributeCount() ;i++){ - attr = new AttributeBase(reader.getAttributeName(i), reader.getAttributeValue(i)); - attr.setAttributeType(reader.getAttributeType(i)); - attr.setSpecified(reader.isAttributeSpecified(i)); - event.addAttribute(attr); - } - } - - //add namespaces to StartElement/EndElement - protected void addNamespaces(StartElementEvent event,XMLStreamReader reader){ - Namespace namespace = null; - for(int i=0; i<reader.getNamespaceCount(); i++){ - namespace = new NamespaceBase(reader.getNamespacePrefix(i), reader.getNamespaceURI(i)); - event.addNamespace(namespace); - } - } - - protected void addNamespaces(EndElementEvent event,XMLStreamReader reader){ - Namespace namespace = null; - for(int i=0; i<reader.getNamespaceCount(); i++){ - namespace = new NamespaceBase(reader.getNamespacePrefix(i), reader.getNamespaceURI(i)); - event.addNamespace(namespace); - } - } - -}
--- a/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidMapException.java Mon Aug 17 13:33:49 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -/* - * Copyright 2005-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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.xml.internal.ws.addressing.model; - -import javax.xml.ws.WebServiceException; -import javax.xml.namespace.QName; - -/** - * @author Arun Gupta - */ -public class InvalidMapException extends WebServiceException { - QName name; - QName subsubcode; - - public InvalidMapException(QName name, QName subsubcode) { - this.name = name; - this.subsubcode = subsubcode; - } - - public QName getMapQName() { - return name; - } - - public QName getSubsubcode() { - return subsubcode; - } -}
--- a/src/share/classes/com/sun/xml/internal/ws/addressing/model/MapRequiredException.java Mon Aug 17 13:33:49 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -/* - * Copyright 2005-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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.xml.internal.ws.addressing.model; - -import javax.xml.ws.WebServiceException; -import javax.xml.namespace.QName; - -/** - * @author Arun Gupta - */ -public class MapRequiredException extends WebServiceException { - QName name; - - public MapRequiredException(QName name) { - this.name = name; - } - - public QName getMapQName() { - return name; - } -}
--- a/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java Mon Aug 17 13:33:49 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,118 +0,0 @@ -/* - * Copyright 2005-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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.xml.internal.ws.client; - -import com.sun.xml.internal.ws.util.CompletedFuture; - -import javax.xml.ws.AsyncHandler; -import javax.xml.ws.Response; -import java.util.Map; -import java.util.concurrent.Callable; -import java.util.concurrent.Future; -import java.util.concurrent.FutureTask; - -/** - * {@link Response} implementation. - * - * @author Kohsuke Kawaguchi - * @author Kathy Walsh - */ -public final class ResponseImpl<T> extends FutureTask<T> implements Response<T>, ResponseContextReceiver { - - /** - * Optional {@link AsyncHandler} that gets invoked - * at the completion of the task. - */ - private final AsyncHandler<T> handler; - private ResponseContext responseContext; - - private final Callable<T> callable; - - /** - * - * @param callable - * This {@link Callable} is executed asynchronously. - * @param handler - * Optional {@link AsyncHandler} to invoke at the end - * of the processing. Can be null. - */ - public ResponseImpl(Callable<T> callable, AsyncHandler<T> handler) { - super(callable); - this.callable = callable; - this.handler = handler; - } - - @Override - public void run() { - // override so that we call set() - try { - set(callable.call(), null); - } catch (Throwable t) { - set(null, t); - } - } - - protected void set(final T v, final Throwable t) { - // call the handler before we mark the future as 'done' - if (handler!=null) { - try { - /** - * {@link Response} object passed into the callback. - * We need a separate {@link Future} because we don't want {@link ResponseImpl} - * to be marked as 'done' before the callback finishes execution. - * (That would provide implicit synchronization between the application code - * in the main thread and the callback code, and is compatible with the JAX-RI 2.0 FCS. - */ - class CallbackFuture<T> extends CompletedFuture<T> implements Response<T> { - public CallbackFuture(T v, Throwable t) { - super(v, t); - } - - public Map<String, Object> getContext() { - return ResponseImpl.this.getContext(); - } - } - handler.handleResponse(new CallbackFuture<T>(v, t)); - } catch (Throwable e) { - super.setException(e); - return; - } - } - if (t != null) { - super.setException(t); - } else { - super.set(v); - } - } - - public ResponseContext getContext() { - return responseContext; - } - - public void setResponseContext(ResponseContext rc) { - responseContext = rc; - } -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/com/sun/xml/internal/ws/client/sei/pacakge-info.java Fri Aug 21 19:46:03 2009 +0100 @@ -0,0 +1,29 @@ +/* + * Copyright 2005-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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/** + * {@link SEIStub} and its supporting code. + */ +package com.sun.xml.internal.ws.client.sei;
--- a/src/share/classes/com/sun/xml/internal/ws/client/sei/package-info.java Mon Aug 17 13:33:49 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -/* - * Copyright 2005-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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -/** - * {@link SEIStub} and its supporting code. - */ -package com.sun.xml.internal.ws.client.sei;
--- a/src/share/classes/com/sun/xml/internal/ws/server/WSDLPatcher.java Mon Aug 17 13:33:49 2009 +0100 +++ b/src/share/classes/com/sun/xml/internal/ws/server/WSDLPatcher.java Fri Aug 21 19:46:03 2009 +0100 @@ -244,6 +244,6 @@ */ private String getAddressLocation() { return (portAddressResolver == null || portName == null) - ? null : portAddressResolver.getAddressFor(serviceName, portName.getLocalPart(), portAddress); + ? null : portAddressResolver.getAddressFor(serviceName, portName.getLocalPart(), portAddress); } }
--- a/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java Mon Aug 17 13:33:49 2009 +0100 +++ b/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java Fri Aug 21 19:46:03 2009 +0100 @@ -33,14 +33,20 @@ import com.sun.xml.internal.ws.api.server.PortAddressResolver; import com.sun.xml.internal.ws.api.server.WSEndpoint; import com.sun.xml.internal.ws.api.server.WebServiceContextDelegate; +import com.sun.xml.internal.ws.api.server.PortAddressResolver; +import com.sun.xml.internal.ws.transport.http.HttpAdapter; +import com.sun.xml.internal.ws.transport.http.WSHTTPConnection; import com.sun.xml.internal.ws.developer.JAXWSProperties; import com.sun.xml.internal.ws.resources.WsservletMessages; -import com.sun.xml.internal.ws.transport.http.HttpAdapter; -import com.sun.xml.internal.ws.transport.http.WSHTTPConnection; import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.MessageContext; -import java.io.*; +import javax.xml.ws.WebServiceException; +import java.io.FilterInputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.net.URI; import java.security.Principal; import java.util.ArrayList; @@ -85,6 +91,7 @@ for(Map.Entry <String, List<String>> entry : headers.entrySet()) { String name = entry.getKey(); List<String> values = entry.getValue(); + // ignore headers that interfere with our correct operations if (!name.equalsIgnoreCase("Content-Length") && !name.equalsIgnoreCase("Content-Type")) { r.put(name,new ArrayList<String>(values)); } @@ -113,6 +120,7 @@ } public @NotNull InputStream getInput() { + // Light weight http server's InputStream.close() throws exception if // all the bytes are not read. Work around until it is fixed. return new FilterInputStream(httpExchange.getRequestBody()) { @@ -157,6 +165,7 @@ out.write(buf, start, len); } }; + } public @NotNull WebServiceContextDelegate getWebServiceContextDelegate() { @@ -172,7 +181,7 @@ } public @NotNull String getEPRAddress(Packet request, WSEndpoint endpoint) { - //return WSHttpHandler.getRequestAddress(httpExchange); + //return WSHttpHandler.getRequestAddress(httpExchange); PortAddressResolver resolver = adapter.owner.createPortAddressResolver(getBaseAddress()); String address = resolver.getAddressFor(endpoint.getServiceName(), endpoint.getPortName().getLocalPart());
--- a/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java Mon Aug 17 13:33:49 2009 +0100 +++ b/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java Fri Aug 21 19:46:03 2009 +0100 @@ -22,6 +22,8 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ + + package com.sun.xml.internal.xsom.parser; /**
--- a/src/share/classes/javax/xml/bind/Element.java Mon Aug 17 13:33:49 2009 +0100 +++ b/src/share/classes/javax/xml/bind/Element.java Fri Aug 21 19:46:03 2009 +0100 @@ -35,7 +35,7 @@ * and 5.7.1 "Bind to Java Element Interface" of the specification. * * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul> - * @version $Revision: 1.2 $ + * @version $Revision: 1.1 $ * @since JAXB1.0 */
--- a/src/share/classes/javax/xml/bind/TypeConstraintException.java Mon Aug 17 13:33:49 2009 +0100 +++ b/src/share/classes/javax/xml/bind/TypeConstraintException.java Fri Aug 21 19:46:03 2009 +0100 @@ -41,7 +41,7 @@ * called. * * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul> - * @version $Revision: 1.2 $ + * @version $Revision: 1.1 $ * @see ValidationEvent * @since JAXB1.0 */
--- a/src/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java Mon Aug 17 13:33:49 2009 +0100 +++ b/src/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java Fri Aug 21 19:46:03 2009 +0100 @@ -70,7 +70,7 @@ * * @author Kohsuke Kawaguchi * @since JAXB2.1 - * @version $Revision: $ + * @version $Revision: 1.1 $ */ @Target({ElementType.TYPE}) @Retention(RUNTIME)
--- a/src/share/classes/javax/xml/bind/annotation/XmlTransient.java Mon Aug 17 13:33:49 2009 +0100 +++ b/src/share/classes/javax/xml/bind/annotation/XmlTransient.java Fri Aug 21 19:46:03 2009 +0100 @@ -89,7 +89,7 @@ * * @author Sekhar Vajjhala, Sun Microsystems, Inc. * @since JAXB2.0 - * @version $Revision$ + * @version $Revision: 1.10 $ */ @Retention(RUNTIME) @Target({FIELD, METHOD, TYPE})