Merge pull request #1964 from turkeylurkey/issue-1963

Pass the generateToSrc option when generating features

Author: turkeylurkey

liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java

@@ -446,7 +446,7 @@ public void libertyCreate() throws PluginExecutionException {
         }
 
         @Override
-        public boolean libertyGenerateFeatures(Collection<String> classes, boolean optimize, boolean useTmpDirOut, boolean useTmpDirIn) {
+        public boolean libertyGenerateFeatures(Collection<String> classes, boolean optimize, boolean genToSrc, boolean useTmpDirOut, boolean useTmpDirIn) {
             try {
                 if (classes != null) {
                     Element[] classesElem = new Element[classes.size()];
@@ -456,10 +456,10 @@ public boolean libertyGenerateFeatures(Collection<String> classes, boolean optim
                         i++;
                     }
                     // generate features for only the classFiles passed
-                    runLibertyMojoGenerateFeatures(element(name("classFiles"), classesElem), optimize, useTmpDirOut, useTmpDirIn);
+                    runLibertyMojoGenerateFeatures(element(name("classFiles"), classesElem), optimize, genToSrc, useTmpDirOut, useTmpDirIn);
                 } else {
                     // pass null for classFiles so that features are generated for ALL of the classes
-                    runLibertyMojoGenerateFeatures(null, optimize, useTmpDirOut, useTmpDirIn);
+                    runLibertyMojoGenerateFeatures(null, optimize, genToSrc, useTmpDirOut, useTmpDirIn);
                 }
                 return true; // successfully generated features
             } catch (MojoExecutionException e) {
@@ -778,7 +778,7 @@ public boolean updateArtifactPaths(ProjectModule projectModule, boolean redeploy
                             getLog().debug("Detected a change in the compile dependencies for "
                                     + buildFile + " , regenerating features");
                             // If generateToSrc is false then we must copy new generated features file from temp dir to server dir after install
-                            boolean generateFeaturesSuccess = libertyGenerateFeatures(null, true, !generateToSrc, false);
+                            boolean generateFeaturesSuccess = libertyGenerateFeatures(null, true, generateToSrc, !generateToSrc, false);
                             if (generateFeaturesSuccess) {
                                 util.getJavaSourceClassPaths().clear();
                             }
@@ -1107,7 +1107,7 @@ public boolean recompileBuildFile(File buildFile, Set<String> compileArtifactPat
                     getLog().debug("Detected a change in the compile dependencies, regenerating features");
                     // always optimize generate features on dependency change
                     // If generateToSrc is false then we must copy new generated features file from temp dir to server dir after install
-                    generateFeaturesSuccess = libertyGenerateFeatures(null, true, !generateToSrc, false);
+                    generateFeaturesSuccess = libertyGenerateFeatures(null, true, generateToSrc, !generateToSrc, false);
                     if (generateFeaturesSuccess) {
                         util.getJavaSourceClassPaths().clear();
                     } else {
@@ -1695,7 +1695,7 @@ private void generateFeaturesOnStartup() throws MojoExecutionException {
                             + generatedFileCanonicalPath);
             // During dev mode start up the server is not running yet so we will generate features to the correct
             // output directory and then install features in the next step.
-            runLibertyMojoGenerateFeatures(null, true, false, false);
+            runLibertyMojoGenerateFeatures(null, true, generateToSrc, false, false);
         } catch (MojoExecutionException e) {
             if (e.getCause() != null && e.getCause() instanceof PluginExecutionException) {
                 // PluginExecutionException indicates that the binary scanner jar could not be found
@@ -2192,7 +2192,7 @@ protected void runLibertyMojoCreate() throws MojoExecutionException {
      * @throws MojoExecutionException
      */
     @Override
-    protected void runLibertyMojoGenerateFeatures(Element classFiles, boolean optimize, boolean useTmpDirOut, boolean useTmpDirIn) throws MojoExecutionException {
-        super.runLibertyMojoGenerateFeatures(classFiles, optimize, useTmpDirOut, useTmpDirIn);
+    protected void runLibertyMojoGenerateFeatures(Element classFiles, boolean optimize, boolean genToSrc, boolean useTmpDirOut, boolean useTmpDirIn) throws MojoExecutionException {
+        super.runLibertyMojoGenerateFeatures(classFiles, optimize, genToSrc, useTmpDirOut, useTmpDirIn);
     }
 }

liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/StartDebugMojoSupport.java

@@ -291,12 +291,13 @@ protected void runLibertyMojoInstallFeature(Element features, File serverDir, St
         runLibertyMojo("install-feature", config);
     }
 
-    protected void runLibertyMojoGenerateFeatures(Element classFiles, boolean optimize, boolean useTmpDirOut, boolean useTmpDirIn) throws MojoExecutionException {
+    protected void runLibertyMojoGenerateFeatures(Element classFiles, boolean optimize, boolean generateToSrc, boolean useTmpDirOut, boolean useTmpDirIn) throws MojoExecutionException {
         Xpp3Dom config = ExecuteMojoUtil.getPluginGoalConfig(getLibertyPlugin(), "generate-features", getLog());
         if (classFiles != null) {
             config = Xpp3Dom.mergeXpp3Dom(configuration(classFiles), config);
         }
         config.addChild(element(name("optimize"), Boolean.toString(optimize)).toDom());
+        config.addChild(element(name("generateToSrc"), Boolean.toString(generateToSrc)).toDom());
         config.addChild(element(name("useTempDirAsOutput"), Boolean.toString(useTmpDirOut)).toDom());
         config.addChild(element(name("useTempDirAsContext"), Boolean.toString(useTmpDirIn)).toDom());
         runLibertyMojo("generate-features", config);