From 7c514ad73eded0fb1faf95fda30dfa4f786c169f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Novotn=C3=BD?= Date: Wed, 15 Jun 2016 15:45:26 +0200 Subject: [PATCH] WINDUP-1086 adding one level of directory in mavenized dir for specific Application --- .../apps/mavenize/MavenStructureRenderer.java | 17 ++++++++++------- .../apps/mavenize/MavenizeRuleProviderTest.java | 2 -- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/rules-java/api/src/main/java/org/jboss/windup/rules/apps/mavenize/MavenStructureRenderer.java b/rules-java/api/src/main/java/org/jboss/windup/rules/apps/mavenize/MavenStructureRenderer.java index 7c0397a350..bbfd295356 100644 --- a/rules-java/api/src/main/java/org/jboss/windup/rules/apps/mavenize/MavenStructureRenderer.java +++ b/rules-java/api/src/main/java/org/jboss/windup/rules/apps/mavenize/MavenStructureRenderer.java @@ -1,10 +1,6 @@ package org.jboss.windup.rules.apps.mavenize; -import freemarker.core.ParseException; -import freemarker.template.DefaultObjectWrapperBuilder; -import freemarker.template.MalformedTemplateNameException; -import freemarker.template.Template; -import freemarker.template.TemplateException; +import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.nio.file.Files; @@ -15,12 +11,18 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; + import org.apache.commons.lang3.exception.ExceptionUtils; import org.jboss.windup.graph.model.WindupConfigurationModel; import org.jboss.windup.reporting.freemarker.FurnaceFreeMarkerTemplateLoader; import org.jboss.windup.util.Logging; import org.jboss.windup.util.exception.WindupException; +import freemarker.core.ParseException; +import freemarker.template.DefaultObjectWrapperBuilder; +import freemarker.template.Template; +import freemarker.template.TemplateException; + /** * Recursively renders the previously created Maven project structure into pom.xml's in a directory tree. * @@ -43,15 +45,16 @@ public class MavenStructureRenderer void createMavenProjectDirectoryTree() { try { + Path mavenizedAppPath = (new File(mavCtx.getMavenizedBaseDir().toString(), mavCtx.getUnifiedAppName())).toPath(); // Root POM - renderPomXml(mavCtx, mavCtx.getRootPom(), mavCtx.getMavenizedBaseDir().resolve("pom.xml")); + renderPomXml(mavCtx, mavCtx.getRootPom(), mavenizedAppPath.resolve("pom.xml")); List exceptions = new ArrayList<>(); for (Map.Entry entry : mavCtx.getRootPom().submodules.entrySet()) { try { String subDir = entry.getKey(); - Path resultPomXmlPath = mavCtx.getMavenizedBaseDir().resolve(subDir).resolve("pom.xml"); + Path resultPomXmlPath = mavenizedAppPath.resolve(subDir).resolve("pom.xml"); LOG.info("Writing " + subDir + "/pom.xml" + "\n > " + entry.getValue()); renderPomXml(mavCtx, entry.getValue(), resultPomXmlPath); } diff --git a/rules-java/tests/src/test/java/org/jboss/windup/rules/apps/mavenize/MavenizeRuleProviderTest.java b/rules-java/tests/src/test/java/org/jboss/windup/rules/apps/mavenize/MavenizeRuleProviderTest.java index ff758b7832..327c406621 100644 --- a/rules-java/tests/src/test/java/org/jboss/windup/rules/apps/mavenize/MavenizeRuleProviderTest.java +++ b/rules-java/tests/src/test/java/org/jboss/windup/rules/apps/mavenize/MavenizeRuleProviderTest.java @@ -24,8 +24,6 @@ import org.jboss.windup.exec.configuration.WindupConfiguration; import org.jboss.windup.graph.GraphContext; import org.jboss.windup.graph.GraphContextFactory; -import org.jboss.windup.graph.model.ProjectModel; -import org.jboss.windup.graph.model.resource.FileModel; import org.jboss.windup.rules.apps.java.archives.identify.CompositeArchiveIdentificationService; import org.jboss.windup.rules.apps.java.archives.identify.InMemoryArchiveIdentificationService; import org.jboss.windup.rules.apps.java.archives.model.IdentifiedArchiveModel;