src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java

*** 1,7 ****
  /*
!  * 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
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2016, 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
*** 169,183 ****
      }
  
      @SuppressWarnings("CallToThreadDumpStack")
      protected void doPostProcessWebService(WebService webService, TypeElement d) {
          if (cm != null) {
-             File sourceDir = builder.getSourceDir();
-             assert(sourceDir != null);
              WsgenOptions options = builder.getOptions();
              try {
!                 CodeWriter cw = new FilerCodeWriter(sourceDir, options);
                  if(options.verbose)
                      cw = new ProgressCodeWriter(cw, System.out);
                  cm.build(cw);
              } catch (IOException e) {
                  e.printStackTrace();
--- 169,182 ----
      }
  
      @SuppressWarnings("CallToThreadDumpStack")
      protected void doPostProcessWebService(WebService webService, TypeElement d) {
          if (cm != null) {
              WsgenOptions options = builder.getOptions();
+             assert options.filer != null;
              try {
!                 CodeWriter cw = new FilerCodeWriter(options);
                  if(options.verbose)
                      cw = new ProgressCodeWriter(cw, System.out);
                  cm.build(cw);
              } catch (IOException e) {
                  e.printStackTrace();
*** 246,258 ****
              if (reqWrapper.targetNamespace().length() > 0)
                  reqNamespace = reqWrapper.targetNamespace();
          }
          builder.log("requestWrapper: "+requestClassName);
  ///// fix for wsgen CR 6442344
!         File file = new File(DirectoryUtil.getOutputDirectoryFor(requestClassName, builder.getSourceDir()),
!                 Names.stripQualifier(requestClassName) + GeneratorConstants.JAVA_SRC_SUFFIX.getValue());
!         builder.getOptions().addGeneratedFile(file);
  //////////
          boolean canOverwriteRequest = builder.canOverWriteClass(requestClassName);
          if (!canOverwriteRequest) {
              builder.log("Class " + requestClassName + " exists. Not overwriting.");
          }
--- 245,255 ----
              if (reqWrapper.targetNamespace().length() > 0)
                  reqNamespace = reqWrapper.targetNamespace();
          }
          builder.log("requestWrapper: "+requestClassName);
  ///// fix for wsgen CR 6442344
!         addGeneratedFile(requestClassName);
  //////////
          boolean canOverwriteRequest = builder.canOverWriteClass(requestClassName);
          if (!canOverwriteRequest) {
              builder.log("Class " + requestClassName + " exists. Not overwriting.");
          }
*** 280,292 ****
              }
              if (duplicateName(responseClassName) && canOverwriteResponse) {
                  builder.processError(WebserviceapMessages.WEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(
                          typeElement.getQualifiedName(), method.toString()));
              }
!             file = new File(DirectoryUtil.getOutputDirectoryFor(responseClassName, builder.getSourceDir()),
!                     Names.stripQualifier(responseClassName) + GeneratorConstants.JAVA_SRC_SUFFIX.getValue());
!             builder.getOptions().addGeneratedFile(file);
          }
          //ArrayList<MemberInfo> reqMembers = new ArrayList<MemberInfo>();
          //ArrayList<MemberInfo> resMembers = new ArrayList<MemberInfo>();
          WrapperInfo reqWrapperInfo = new WrapperInfo(requestClassName);
          //reqWrapperInfo.setMembers(reqMembers);
--- 277,287 ----
              }
              if (duplicateName(responseClassName) && canOverwriteResponse) {
                  builder.processError(WebserviceapMessages.WEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(
                          typeElement.getQualifiedName(), method.toString()));
              }
!             addGeneratedFile(responseClassName);
          }
          //ArrayList<MemberInfo> reqMembers = new ArrayList<MemberInfo>();
          //ArrayList<MemberInfo> resMembers = new ArrayList<MemberInfo>();
          WrapperInfo reqWrapperInfo = new WrapperInfo(requestClassName);
          //reqWrapperInfo.setMembers(reqMembers);
*** 332,341 ****
--- 327,342 ----
              throw new ModelerException("modeler.nestedGeneratorError",e);
          }
          return true;
      }
  
+     private void addGeneratedFile(String requestClassName) {
+         File file = new File(DirectoryUtil.getOutputDirectoryFor(requestClassName, builder.getSourceDir()),
+                 Names.stripQualifier(requestClassName) + GeneratorConstants.JAVA_SRC_SUFFIX.getValue());
+         builder.getOptions().addGeneratedFile(file);
+     }
+ 
  //    private List<Annotation> collectJAXBAnnotations(Declaration decl) {
  //        List<Annotation> jaxbAnnotation = new ArrayList<Annotation>();
  //        for(Class jaxbClass : jaxbAnns) {
  //            Annotation ann = decl.getAnnotation(jaxbClass);
  //            if (ann != null) {
*** 469,480 ****
          if (!canOverWriteBean) {
              builder.log("Class " + className + " exists. Not overwriting.");
              seiContext.addExceptionBeanEntry(thrownDecl.getQualifiedName(), faultInfo, builder);
              return false;
          }
!         if (seiContext.getExceptionBeanName(thrownDecl.getQualifiedName()) != null)
              return false;
  
          //write class comment - JAXWS warning
          JDocComment comment = cls.javadoc();
          for (String doc : GeneratorBase.getJAXWSClassComment(ToolVersion.VERSION.MAJOR_VERSION)) {
              comment.add(doc);
--- 470,484 ----
          if (!canOverWriteBean) {
              builder.log("Class " + className + " exists. Not overwriting.");
              seiContext.addExceptionBeanEntry(thrownDecl.getQualifiedName(), faultInfo, builder);
              return false;
          }
!         if (seiContext.getExceptionBeanName(thrownDecl.getQualifiedName()) != null) {
              return false;
+         }
+ 
+         addGeneratedFile(className);
  
          //write class comment - JAXWS warning
          JDocComment comment = cls.javadoc();
          for (String doc : GeneratorBase.getJAXWSClassComment(ToolVersion.VERSION.MAJOR_VERSION)) {
              comment.add(doc);