Return-Path: Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org Received: (qmail 64056 invoked from network); 25 Mar 2004 19:30:22 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 25 Mar 2004 19:30:22 -0000 Received: (qmail 56069 invoked by uid 500); 25 Mar 2004 19:30:09 -0000 Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org Received: (qmail 56029 invoked by uid 500); 25 Mar 2004 19:30:08 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 55984 invoked from network); 25 Mar 2004 19:30:08 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 25 Mar 2004 19:30:08 -0000 Received: (qmail 64003 invoked by uid 1203); 25 Mar 2004 19:30:17 -0000 Date: 25 Mar 2004 19:30:17 -0000 Message-ID: <20040325193017.64002.qmail@minotaur.apache.org> From: dims@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/java/src/org/apache/axis/transport/http ServletEndpointContextImpl.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dims 2004/03/25 11:30:17 Modified: java/src/javax/xml/soap MimeHeaders.java SOAPElementFactory.java SOAPMessage.java java/src/javax/xml/namespace QName.java java/src/javax/xml/rpc ServiceFactory.java java/src/org/apache/axis/client ServiceFactory.java java/src/javax/xml/rpc/server ServletEndpointContext.java java/src/org/apache/axis/transport/http ServletEndpointContextImpl.java Log: Sync up with the JWSDP Revision Changes Path 1.8 +1 -1 ws-axis/java/src/javax/xml/soap/MimeHeaders.java Index: MimeHeaders.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/javax/xml/soap/MimeHeaders.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- MimeHeaders.java 25 Feb 2004 14:02:27 -0000 1.7 +++ MimeHeaders.java 25 Mar 2004 19:30:16 -0000 1.8 @@ -306,5 +306,5 @@ * A Vector containing the headers as MimeHeader * instances. */ - protected Vector headers; + private Vector headers; } 1.11 +0 -1 ws-axis/java/src/javax/xml/soap/SOAPElementFactory.java Index: SOAPElementFactory.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/javax/xml/soap/SOAPElementFactory.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- SOAPElementFactory.java 25 Feb 2004 14:02:27 -0000 1.10 +++ SOAPElementFactory.java 25 Mar 2004 19:30:16 -0000 1.11 @@ -101,7 +101,6 @@ * SOAPElementFactory * @throws SOAPException if there was an error creating * the default SOAPElementFactory - * @deprecated */ public static SOAPElementFactory newInstance() throws SOAPException { 1.9 +13 -5 ws-axis/java/src/javax/xml/soap/SOAPMessage.java Index: SOAPMessage.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/javax/xml/soap/SOAPMessage.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- SOAPMessage.java 25 Feb 2004 14:02:27 -0000 1.8 +++ SOAPMessage.java 25 Mar 2004 19:30:16 -0000 1.9 @@ -307,7 +307,9 @@ * @throws SOAPException if the SOAP Body does not exist or cannot be * retrieved */ - public abstract SOAPBody getSOAPBody() throws SOAPException; + public SOAPBody getSOAPBody() throws SOAPException { + throw new UnsupportedOperationException("getSOAPBody must be overridden in subclasses of SOAPMessage"); + } /** * Gets the SOAP Header contained in this SOAPMessage object. @@ -317,7 +319,9 @@ * @throws SOAPException if the SOAP Header does not exist or cannot be * retrieved */ - public abstract SOAPHeader getSOAPHeader() throws SOAPException; + public SOAPHeader getSOAPHeader() throws SOAPException { + throw new UnsupportedOperationException("getSOAPHeader must be overridden in subclasses of SOAPMessage"); + } /** * Associates the specified value with the specified property. If there was @@ -347,8 +351,10 @@ * @param value the value to be associated with the specified property * @throws SOAPException if the property name is not recognized */ - public abstract void setProperty(String property, Object value) - throws SOAPException; + public void setProperty(String property, Object value) + throws SOAPException { + throw new UnsupportedOperationException("setProperty must be overridden in subclasses of SOAPMessage"); + } /** * Retrieves value of the specified property. @@ -358,7 +364,9 @@ * property exists * @throws SOAPException if the property name is not recognized */ - public abstract Object getProperty(String property) throws SOAPException; + public Object getProperty(String property) throws SOAPException { + throw new UnsupportedOperationException("getProperty must be overridden in subclasses of SOAPMessage"); + } /** Specifies the character type encoding for the SOAP Message. */ public static final String CHARACTER_SET_ENCODING 1.12 +2 -2 ws-axis/java/src/javax/xml/namespace/QName.java Index: QName.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/javax/xml/namespace/QName.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- QName.java 25 Feb 2004 14:02:25 -0000 1.11 +++ QName.java 25 Mar 2004 19:30:16 -0000 1.12 @@ -142,7 +142,7 @@ * @return true if the given object is identical to this * QName: false otherwise. */ - public final boolean equals(Object obj) { + public boolean equals(Object obj) { if (obj == this) { return true; @@ -207,7 +207,7 @@ * * @return a hash code value for this Qname object */ - public final int hashCode() { + public int hashCode() { return namespaceURI.hashCode() ^ localPart.hashCode(); } 1.10 +13 -0 ws-axis/java/src/javax/xml/rpc/ServiceFactory.java Index: ServiceFactory.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/javax/xml/rpc/ServiceFactory.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ServiceFactory.java 25 Feb 2004 14:02:26 -0000 1.9 +++ ServiceFactory.java 25 Mar 2004 19:30:16 -0000 1.10 @@ -91,5 +91,18 @@ */ public abstract Service createService(QName serviceName) throws ServiceException; + + public abstract Service loadService(java.lang.Class class1) + throws ServiceException; + + public abstract Service loadService(java.net.URL url, + java.lang.Class class1, + java.util.Properties properties) + throws ServiceException; + + public abstract Service loadService(java.net.URL url, + QName qname, + java.util.Properties properties) + throws ServiceException; } 1.23 +16 -0 ws-axis/java/src/org/apache/axis/client/ServiceFactory.java Index: ServiceFactory.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/client/ServiceFactory.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ServiceFactory.java 25 Feb 2004 14:02:30 -0000 1.22 +++ ServiceFactory.java 25 Mar 2004 19:30:16 -0000 1.23 @@ -33,6 +33,7 @@ import java.net.URL; import java.util.Hashtable; import java.util.Map; +import java.util.Properties; /** * Helper class for obtaining Services from JNDI. @@ -208,4 +209,19 @@ throws ServiceException { return new Service(serviceName); } // createService + + public javax.xml.rpc.Service loadService(Class class1) throws ServiceException { + // TODO: Not yet implemented + return null; + } + + public javax.xml.rpc.Service loadService(URL url, Class class1, Properties properties) throws ServiceException { + // TODO: Not yet implemented + return null; + } + + public javax.xml.rpc.Service loadService(URL url, QName qname, Properties properties) throws ServiceException { + // TODO: Not yet implemented + return null; + } } 1.8 +2 -0 ws-axis/java/src/javax/xml/rpc/server/ServletEndpointContext.java Index: ServletEndpointContext.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/javax/xml/rpc/server/ServletEndpointContext.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ServletEndpointContext.java 25 Feb 2004 14:02:27 -0000 1.7 +++ ServletEndpointContext.java 25 Mar 2004 19:30:16 -0000 1.8 @@ -111,4 +111,6 @@ * @return the current ServletContext */ public ServletContext getServletContext(); + + public boolean isUserInRole(java.lang.String s); } 1.8 +5 -0 ws-axis/java/src/org/apache/axis/transport/http/ServletEndpointContextImpl.java Index: ServletEndpointContextImpl.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/transport/http/ServletEndpointContextImpl.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ServletEndpointContextImpl.java 25 Feb 2004 14:02:45 -0000 1.7 +++ ServletEndpointContextImpl.java 25 Mar 2004 19:30:17 -0000 1.8 @@ -41,6 +41,11 @@ return (srv == null) ? null : srv.getServletContext(); } + public boolean isUserInRole(String s) { + // TODO: Not yet implemented + return false; + } + public Principal getUserPrincipal() { HttpServletRequest srvreq = (HttpServletRequest) getMessageContext().getProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST);