jdk8-mips64-public/jaxws: comparison src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java

-:8c0b6bccfe47
+:0989ad8c0860
 /*
-* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2013, Oracle and/or its affiliates. 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.  Oracle designates this
 import com.sun.tools.internal.ws.wsdl.document.schema.SchemaKinds;
 import com.sun.tools.internal.ws.wsdl.framework.Entity;
 import com.sun.tools.internal.ws.wsdl.framework.ParserListener;
 import com.sun.tools.internal.ws.wsdl.framework.TWSDLParserContextImpl;
 import com.sun.xml.internal.ws.util.ServiceFinder;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import org.w3c.dom.Node;
 /**
 * A parser for WSDL documents. This parser is used only at the tool time.
 * Extensions should extend TWSDLExtensionHandler, so that it will be called during
 * parsing wsdl to handle wsdl extenisbility elements. Generally these extensions
 this.options = options;
 this.errReceiver = errReceiver;
 if (forest == null) {
 forest = new MetadataFinder(new WSDLInternalizationLogic(), options, errReceiver);
 forest.parseWSDL();
-if (forest.isMexMetadata)
+if (forest.isMexMetadata) {
 errReceiver.reset();
+}
 }
 this.forest = forest;
 // register handlers for default extensions
 register(new SOAPExtensionHandler(extensionHandlers));
 register(new HTTPExtensionHandler(extensionHandlers));
 register(new MIMEExtensionHandler(extensionHandlers));
 register(new JAXWSBindingExtensionHandler(extensionHandlers));
 register(new SOAP12ExtensionHandler(extensionHandlers));
-register(new MemberSubmissionAddressingExtensionHandler(extensionHandlers, errReceiver));
+// MemberSubmission Addressing not supported by WsImport anymore see JAX_WS-1040 for details
+//register(new MemberSubmissionAddressingExtensionHandler(extensionHandlers, errReceiver, options.isExtensionMode()));
 register(new W3CAddressingExtensionHandler(extensionHandlers, errReceiver));
 register(new W3CAddressingMetadataExtensionHandler(extensionHandlers, errReceiver));
 register(new Policy12ExtensionHandler());
 register(new Policy15ExtensionHandler());
 for (TWSDLExtensionHandler te : ServiceFinder.find(TWSDLExtensionHandler.class)) {
 for (InputSource value : options.getWSDLBindings()) {
 errReceiver.pollAbort();
 Document root = forest.parse(value, false);
 if(root==null)       continue;   // error must have been reported
 Element binding = root.getDocumentElement();
-if (!fixNull(binding.getNamespaceURI()).equals(JAXWSBindingsConstants.NS_JAXWS_BINDINGS)
+if (!Internalizer.fixNull(binding.getNamespaceURI()).equals(JAXWSBindingsConstants.NS_JAXWS_BINDINGS)
 || !binding.getLocalName().equals("bindings")){
 errReceiver.error(forest.locatorTable.getStartLocation(binding), WsdlMessages.PARSER_NOT_A_BINDING_FILE(
 binding.getNamespaceURI(),
 binding.getLocalName()));
 continue;
 }
 return buildWSDLDocument();
 }
-private String fixNull(String s) {
-if(s==null) return "";
-else        return s;
-}
 public MetadataFinder getDOMForest() {
 return forest;
 }
 private WSDLDocument buildWSDLDocument(){
 context.pushWSDLLocation();
 context.setWSDLLocation(context.getDocument().getSystemId());
 new Internalizer(forest, options, errReceiver).transform();
-//print the wsdl
-//        try{
-//            forest.dump(System.out);
-//        }catch(IOException e){
-//            e.printStackTrace();
-//        }
 Definitions definitions = parseDefinitionsNoImport(context, root);
 if(definitions == null){
 Locator locator = forest.locatorTable.getStartLocation(root.getDocumentElement());
 errReceiver.error(locator, WsdlMessages.PARSING_NOT_AWSDL(locator.getSystemId()));
 processImports(context);
 context.popWSDLLocation();
 return definitions;
 }
-private void processMexDocs(TWSDLParserContextImpl context){
-for(String location : forest.listSystemIDs()){
-if (!context.getDocument().isImportedDocument(location)){
-Document doc = forest.get(location);
-if(doc == null)
-continue;
-Definitions importedDefinitions = parseDefinitionsNoImport(context, doc);
-if(importedDefinitions == null)
-continue;
-context.getDocument().addImportedEntity(importedDefinitions);
-context.getDocument().addImportedDocument(location);
-}
-}
-}
 private void processImports(TWSDLParserContextImpl context) {
 for(String location : forest.getExternalReferences()){
 if (!context.getDocument().isImportedDocument(location)){
 Document doc = forest.get(location);
 if(doc == null)
 e3.getLocalName().equals(Constants.ATTR_NAME))
 continue;
 // possible extensibility element -- must live outside the WSDL namespace
 checkNotWsdlAttribute(e3);
-if (!handleExtension(context, input, e3, e2)) {
+handleExtension(context, input, e3, e2);
-// ignore the extensiblity attribute
-// TODO throw a WARNING
-}
 }
 // verify that there is at most one child element and it is a documentation element
 boolean gotDocumentation2 = false;
 for (Iterator iter2 = XmlUtil.getAllChildren(e2);
 e3.getLocalName().equals(Constants.ATTR_NAME))
 continue;
 // possible extensibility element -- must live outside the WSDL namespace
 checkNotWsdlAttribute(e3);
-if (!handleExtension(context, output, e3, e2)) {
+handleExtension(context, output, e3, e2);
-// ignore the extensiblity attribute
-// TODO throw a WARNING
-}
 }
 // verify that there is at most one child element and it is a documentation element
 boolean gotDocumentation2 = false;
 for (Iterator iter2 = XmlUtil.getAllChildren(e2);
 e3.getLocalName().equals(Constants.ATTR_NAME))
 continue;
 // possible extensibility element -- must live outside the WSDL namespace
 checkNotWsdlAttribute(e3);
-if (!handleExtension(context, fault, e3, e2)) {
+handleExtension(context, fault, e3, e2);
-// ignore the extensiblity attribute
-// TODO throw a WARNING
-}
 }
 // verify that there is at most one child element and it is a documentation element
 boolean gotDocumentation2 = false;
 for (Iterator iter2 = XmlUtil.getAllChildren(e2);
 Constants.TAG_OPERATION,
 name));
 }
 /* Here we check for the use scenario */
-Iterator itere2 = XmlUtil.getAllChildren(e2);
 context.push();
 context.registerNamespaces(e2);
 BindingInput input = new BindingInput(forest.locatorTable.getStartLocation(e2));
 String nameAttr =
 XmlUtil.getAttributeOrNull(e2, Constants.ATTR_NAME);
 if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_DOCUMENTATION)) {
 if (gotDocumentation) {
 errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
 }
 gotDocumentation = true;
-if(service.getDocumentation() == null)
+if (service.getDocumentation() == null) {
 service.setDocumentation(getDocumentationFor(e2));
+}
 } else if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_PORT)) {
 Port port = parsePort(context, definitions, e2);
 service.add(port);
 } else {
 // possible extensibility element -- must live outside the WSDL namespace
 boolean gotDocumentation = false;
 for (Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();) {
 Element e2 = Util.nextElement(iter);
-if (e2 == null)
+if (e2 == null) {
 break;
+}
 if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_DOCUMENTATION)) {
 if (gotDocumentation) {
 errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
 }
 gotDocumentation = true;
-if(port.getDocumentation() == null)
+if (port.getDocumentation() == null) {
 port.setDocumentation(getDocumentationFor(e2));
+}
 } else {
 // possible extensibility element -- must live outside the WSDL namespace
 checkNotWsdlElement(e2);
 if (!handleExtension(context, port, e2)) {
 checkNotWsdlRequired(e2);
 }
 private void validateSchemaImports(Element typesElement){
 for (Iterator iter = XmlUtil.getAllChildren(typesElement); iter.hasNext();) {
 Element e = Util.nextElement(iter);
-if (e == null)
+if (e == null) {
 break;
+}
 if (XmlUtil.matchesTagNS(e, SchemaConstants.QNAME_IMPORT)) {
 errReceiver.warning(forest.locatorTable.getStartLocation(e), WsdlMessages.WARNING_WSI_R_2003());
 }else{
 checkNotWsdlElement(e);
 //                if (XmlUtil.matchesTagNS(e, SchemaConstants.QNAME_SCHEMA)) {
 Element e) {
 TWSDLExtensionHandler h =
 (TWSDLExtensionHandler) extensionHandlers.get(e.getNamespaceURI());
 if (h == null) {
 context.fireIgnoringExtension(e, (Entity) entity);
+errReceiver.warning(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_UNKNOWN_EXTENSIBILITY_ELEMENT_OR_ATTRIBUTE(e.getLocalName(), e.getNamespaceURI()));
 return false;
 } else {
 return h.doHandleExtension(context, entity, e);
 }
 }
 Element e) {
 TWSDLExtensionHandler h =
 (TWSDLExtensionHandler) extensionHandlers.get(n.getNamespaceURI());
 if (h == null) {
 context.fireIgnoringExtension(e, (Entity) entity);
+errReceiver.warning(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_UNKNOWN_EXTENSIBILITY_ELEMENT_OR_ATTRIBUTE(n.getLocalName(), n.getNamespaceURI()));
 return false;
 } else {
 return h.doHandleExtension(context, entity, e);
 }
 }
 private void checkNotWsdlElement(Element e) {
 // possible extensibility element -- must live outside the WSDL namespace
-if (e.getNamespaceURI() != null && e.getNamespaceURI().equals(Constants.NS_WSDL))
+if (e.getNamespaceURI() != null && e.getNamespaceURI().equals(Constants.NS_WSDL)) {
 errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_INVALID_WSDL_ELEMENT(e.getTagName()));
+}
 }
 private void checkNotWsdlAttribute(Attr a) {
 // possible extensibility element -- must live outside the WSDL namespace
-if (a.getNamespaceURI().equals(Constants.NS_WSDL))
+if (Constants.NS_WSDL.equals(a.getNamespaceURI())) {
 errReceiver.error(forest.locatorTable.getStartLocation(a.getOwnerElement()), WsdlMessages.PARSING_INVALID_WSDL_ELEMENT(a.getLocalName()));
+}
 }
 private void checkNotWsdlRequired(Element e) {
 // check the wsdl:required attribute, fail if set to "true"
 String required =

Mercurial > jdk8-mips64-public > jaxws / file comparison

comparison: src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java

src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java