- * Don't rely on the fact that this class extends from {@link ConcurrentLinkedQueue}.
- */
-- public abstract class ImplJAX-WS 2.0.1 Tools
-+ * JAX-WS 2.1 Tools
- * This document describes the tools included with JAX-WS 2.0.1.
- *
- * {@DotDiagram
-@@ -42,7 +42,7 @@
-
- // libraries
- node [style=filled,color=lightblue];
-- CompileTool; "WSAP"; WebServiceAP; Processor; Modeler; ProcessorActions;
-+ WsimportTool; WsgenTool;"WSAP"; WebServiceAP; WSDLModeler;WSDLParser;SeiGenerator;ServiceGenerator;ExceptionGenerator;"JAXB XJC APIs";CodeModel;
-
- // aps
- # node [style=filled,color=lightpink];
-@@ -49,15 +49,17 @@
- # "JAX-WS"; tools; runtime; SPI; "Annotation Processor";
-
- "Apt ANT Task" -> APT;
-- "WsGen ANT Task" -> wsgen -> CompileTool;
-- "WsImport ANT Task" -> wsimport -> CompileTool;
-+ "WsGen ANT Task" -> wsgen -> WsgenTool;
-+ "WsImport ANT Task" -> wsimport -> WsimportTool;
-
-- CompileTool -> APT -> WSAP -> WebServiceAP;
-- CompileTool -> Processor -> Modeler;
-- Processor -> ProcessorActions;
-- CompileTool -> WebServiceAP;
--
-- Modeler -> WSDLModeler;
-+ WsgenTool -> APT -> WSAP -> WebServiceAP;
-+ WsimportTool -> WSDLModeler;
-+ WSDLModeler->WSDLParser;
-+ WSDLModeler->"JAXB XJC APIs"
-+ WsimportTool->SeiGenerator->CodeModel;
-+ WsimportTool->ServiceGenerator->CodeModel;
-+ WsimportTool->ExceptionGenerator->CodeModel;
-+ WebServiceAP->CodeModel
- }
- * }
- * features parameter will have their default values.");
-- ret.add("returns "+retType.name());
-+ ret.add("returns " + retType.name());
- m.varParam(WebServiceFeature.class, "features");
- JBlock body = m.body();
-- StringBuffer statement = new StringBuffer("return (");
-+ StringBuffer statement = new StringBuffer("return ");
-+ statement.append("super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
- statement.append(retType.name());
-- statement.append(")super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
-- statement.append(retType.name());
- statement.append(".class, features);");
- body.directStatement(statement.toString());
- writeWebEndpoint(port, m);
- }
-
-- private void writeDefaultGetPort(Port port, JDefinedClass cls) {
-- JType retType = getClass(port.getJavaInterface().getName(), ClassType.INTERFACE);
-+ private void writeDefaultGetPort(Port port, JType retType, JDefinedClass cls) {
- String portGetter = port.getPortGetter();
- JMethod m = cls.method(JMod.PUBLIC, retType, portGetter);
- JDocComment methodDoc = m.javadoc();
-- if(port.getJavaDoc() != null)
-+ if (port.getJavaDoc() != null)
- methodDoc.add(port.getJavaDoc());
- JCommentPart ret = methodDoc.addReturn();
-- ret.add("returns "+retType.name());
-+ ret.add("returns " + retType.name());
- JBlock body = m.body();
-- StringBuffer statement = new StringBuffer("return (");
-+ StringBuffer statement = new StringBuffer("return ");
-+ statement.append("super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
- statement.append(retType.name());
-- statement.append(")super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
-- statement.append(retType.name());
- statement.append(".class);");
- body.directStatement(statement.toString());
- writeWebEndpoint(port, m);
- }
-
--
-- protected JDefinedClass getClass(String className, ClassType type) {
-- JDefinedClass cls;
-- try {
-- cls = cm._class(className, type);
-- } catch (JClassAlreadyExistsException e){
-- cls = cm._getClass(className);
-- }
-- return cls;
-- }
--
- private void writeWebServiceClientAnnotation(Service service, JAnnotationUse wsa) {
- String serviceName = service.getName().getLocalPart();
-- String serviceNS= service.getName().getNamespaceURI();
-+ String serviceNS = service.getName().getNamespaceURI();
- wsa.param("name", serviceName);
- wsa.param("targetNamespace", serviceNS);
- wsa.param("wsdlLocation", wsdlLocation);
---- old/src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java Tue Aug 4 09:28:29 2009
-+++ new/src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java Tue Aug 4 09:28:29 2009
-@@ -22,9 +22,6 @@
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
--/*
-- * $Id: W3CAddressingJavaGeneratorExtension.java,v 1.1.2.4 2006/10/31 19:57:28 vivekp Exp $
-- */
-
- package com.sun.tools.internal.ws.processor.generator;
-
---- old/src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java Tue Aug 4 09:28:31 2009
-+++ new/src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java Tue Aug 4 09:28:31 2009
-@@ -26,6 +26,7 @@
- package com.sun.tools.internal.ws.processor.model;
-
- import com.sun.tools.internal.ws.processor.model.java.JavaInterface;
-+import com.sun.tools.internal.ws.wsdl.document.PortType;
- import com.sun.tools.internal.ws.wsdl.document.soap.SOAPStyle;
- import com.sun.tools.internal.ws.wsdl.framework.Entity;
-
-@@ -174,4 +175,5 @@
- private String _address;
- private String _serviceImplName;
- private Map