diff --git a/README.asciidoc b/README.asciidoc index 19507ab0ec..7201ab7099 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -26,7 +26,7 @@ After that, follow the link:https://github.com/windup/windup/wiki/Execute[User G Windup distribution contains a sample file to try Windup with. Try the following command in a console: - bin/mta-cli --target eap7 --input samples/jee-example-app-1.0.0.ear + bin/windup-cli --target eap7 --input samples/jee-example-app-1.0.0.ear This will create a report next to the scanned archive: diff --git a/bootstrap/src/main/java/org/jboss/windup/bootstrap/Bootstrap.java b/bootstrap/src/main/java/org/jboss/windup/bootstrap/Bootstrap.java index 5504b37ebe..cdb90907ff 100644 --- a/bootstrap/src/main/java/org/jboss/windup/bootstrap/Bootstrap.java +++ b/bootstrap/src/main/java/org/jboss/windup/bootstrap/Bootstrap.java @@ -92,7 +92,7 @@ public static void main(final String[] args) { runtimeLabelsDir.mkdirs(); } - final String defaultLog = new File(getUserWindupDir(), "log/mta.log").getAbsolutePath(); + final String defaultLog = new File(getUserWindupDir(), "log/windup.log").getAbsolutePath(); final String logDir = System.getProperty("org.jboss.forge.log.file", defaultLog); System.setProperty("org.jboss.forge.log.file", logDir); @@ -232,7 +232,7 @@ public static File getUserWindupDir() { Path path = new File("").toPath(); return path.toFile(); } - return Paths.get(userHome).resolve(".mta").toFile(); + return Paths.get(userHome).resolve(".windup").toFile(); } private static File getUserAddonsDir() { diff --git a/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/DisplayHelpCommand.java b/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/DisplayHelpCommand.java index df9abc78f4..485d5dd0da 100644 --- a/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/DisplayHelpCommand.java +++ b/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/DisplayHelpCommand.java @@ -14,7 +14,7 @@ public CommandResult execute() { Theme theme = ThemeProvider.getInstance().getTheme(); StringBuilder sb = new StringBuilder(); - sb.append("Usage: " + theme.getCliName() + " [OPTION]... PARAMETER ... ").append(System.lineSeparator()); + sb.append("Usage: windup-cli [OPTION]... PARAMETER ... ").append(System.lineSeparator()); sb.append("Extendable migration analysis, at your fingertips. ").append(System.lineSeparator()); sb.append(System.lineSeparator()); diff --git a/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/RunWindupCommand.java b/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/RunWindupCommand.java index 6758e2572a..f7d7356497 100644 --- a/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/RunWindupCommand.java +++ b/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/RunWindupCommand.java @@ -281,7 +281,7 @@ private void runWindup(List arguments) { + " Access it at this URL: " + indexHtmlPath.toUri()); } else { System.out.println("Generating reports were disabled by option --skipReports"); - System.out.println("If using that option was unintentional, please run MTA again to generate reports."); + System.out.println("If using that option was unintentional, please run Windup again to generate reports."); } } catch (Exception e) { System.err.println("Execution failed due to: " + e.getMessage()); diff --git a/pom.xml b/pom.xml index 10cece09fa..db76877b50 100644 --- a/pom.xml +++ b/pom.xml @@ -572,12 +572,34 @@ - mta + windup !downstream + + Windup Migration Toolkit for Applications + WINDUP + https://github.com/windup/windup + windup-cli + + + + + src/main/resources-windup + + + + + + mta + + + downstream + mta + + Migration Toolkit for Applications by Red Hat (MTA) MTA diff --git a/reporting/impl/src/main/resources-mta/reports/templates/include/about.ftl b/reporting/impl/src/main/resources-mta/reports/templates/include/about.ftl index c82135f3db..f658d44d3a 100644 --- a/reporting/impl/src/main/resources-mta/reports/templates/include/about.ftl +++ b/reporting/impl/src/main/resources-mta/reports/templates/include/about.ftl @@ -12,14 +12,18 @@
- <#if reportModel.relatedResources.windupAbout.windupRuntimeVersion?has_content> -
Generated By
-
${getWindupBrandName()} ${reportModel.relatedResources.windupAbout.windupRuntimeVersion}
- +
GitHub Source
+
https://github.com/windup/windup
-
Website
-
https://developers.redhat.com/products/mta/overview/
+
GitHub Wiki
+
https://github.com/windup/windup/wiki
-
Documentation
-
https://access.redhat.com/documentation/en-us/migration_toolkit_for_applications/
+
Discussion Forum
+
https://developer.jboss.org/en/windup
+ +
Mailing List
+
https://lists.jboss.org/mailman/listinfo/windup-dev
+ +
Issues Tracking
+
https://issues.jboss.org/browse/WINDUP
\ No newline at end of file diff --git a/reporting/impl/src/main/resources-windup/reports/resources/img/brand-horizontal.svg b/reporting/impl/src/main/resources-windup/reports/resources/img/brand-horizontal.svg new file mode 100644 index 0000000000..06517f6a0a --- /dev/null +++ b/reporting/impl/src/main/resources-windup/reports/resources/img/brand-horizontal.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/reporting/impl/src/main/resources-windup/reports/resources/img/favicon.png b/reporting/impl/src/main/resources-windup/reports/resources/img/favicon.png new file mode 100644 index 0000000000..e1d644ac66 Binary files /dev/null and b/reporting/impl/src/main/resources-windup/reports/resources/img/favicon.png differ diff --git a/reporting/impl/src/main/resources-windup/reports/templates/include/about.ftl b/reporting/impl/src/main/resources-windup/reports/templates/include/about.ftl new file mode 100644 index 0000000000..a72b02f227 --- /dev/null +++ b/reporting/impl/src/main/resources-windup/reports/templates/include/about.ftl @@ -0,0 +1,29 @@ +
+ <#if reportModel.relatedResources.windupAbout.windupRuntimeVersion?has_content> +
Generated By
+
${getWindupBrandName()} ${reportModel.relatedResources.windupAbout.windupRuntimeVersion}
+ + +
Website
+
https://windup.github.io/
+ +
Documentation
+
https://windup.github.io/
+
+ +
+
GitHub Source
+
https://github.com/windup/windup
+ +
GitHub Wiki
+
https://github.com/windup/windup/wiki
+ +
Discussion Forum
+
https://developer.jboss.org/en/windup
+ +
Mailing List
+
https://lists.jboss.org/mailman/listinfo/windup-dev
+ +
Issues Tracking
+
https://issues.jboss.org/browse/WINDUP
+
\ No newline at end of file diff --git a/reporting/impl/src/main/resources-windup/reports/templates/include/navbar_left_brand.ftl b/reporting/impl/src/main/resources-windup/reports/templates/include/navbar_left_brand.ftl new file mode 100644 index 0000000000..634df1b0a8 --- /dev/null +++ b/reporting/impl/src/main/resources-windup/reports/templates/include/navbar_left_brand.ftl @@ -0,0 +1,2 @@ +Windup + \ No newline at end of file diff --git a/ui/addon/src/main/java/org/jboss/windup/ui/WindupUpdateDistributionCommand.java b/ui/addon/src/main/java/org/jboss/windup/ui/WindupUpdateDistributionCommand.java index 63020f3940..42e1d9f691 100644 --- a/ui/addon/src/main/java/org/jboss/windup/ui/WindupUpdateDistributionCommand.java +++ b/ui/addon/src/main/java/org/jboss/windup/ui/WindupUpdateDistributionCommand.java @@ -70,7 +70,7 @@ public Result execute(UIExecutionContext context) throws Exception { distUpdater.replaceWindupDirectoryWithDistribution(latestDist); - return Results.success("Sucessfully updated " + theme.getBrandNameAcronym() + " CLI to version " + latestDist.getVersion() + ". Please restart MTA CLI."); + return Results.success("Sucessfully updated " + theme.getBrandNameAcronym() + " CLI to version " + latestDist.getVersion() + ". Please restart Windup CLI."); } diff --git a/utils/src/main/java/org/jboss/windup/util/PathUtil.java b/utils/src/main/java/org/jboss/windup/util/PathUtil.java index 3e81c66d0e..3196eddfff 100644 --- a/utils/src/main/java/org/jboss/windup/util/PathUtil.java +++ b/utils/src/main/java/org/jboss/windup/util/PathUtil.java @@ -34,7 +34,7 @@ public class PathUtil { public static String BINARY_DIRECTORY_NAME = "bin"; /** - * The path $USER_HOME/.rhamt + * The path $USER_HOME/.windup */ public static Path getWindupUserDir() { String userHome = System.getProperty("user.home"); @@ -43,7 +43,7 @@ public static Path getWindupUserDir() { LOG.warning("$USER_HOME not set, using [" + path.toAbsolutePath().toString() + "] instead."); return path; } - return Paths.get(userHome).resolve(".mta"); + return Paths.get(userHome).resolve(".windup"); } /** diff --git a/utils/src/test/java/org/jboss/windup/util/PathUtilTest.java b/utils/src/test/java/org/jboss/windup/util/PathUtilTest.java index 1aa8706f8b..764de63658 100644 --- a/utils/src/test/java/org/jboss/windup/util/PathUtilTest.java +++ b/utils/src/test/java/org/jboss/windup/util/PathUtilTest.java @@ -62,13 +62,13 @@ public void testWindupHomeIgnoreListDir() { public void testWindupUserDir() { Assert.assertEquals(Paths.get(""), PathUtil.getWindupUserDir()); setUserHome("/foo"); - Assert.assertEquals(Paths.get("/foo", ".mta"), PathUtil.getWindupUserDir()); + Assert.assertEquals(Paths.get("/foo", ".windup"), PathUtil.getWindupUserDir()); } @Test public void testWindupIgnoreDir() { Assert.assertEquals(Paths.get("ignore"), PathUtil.getUserIgnoreDir()); setUserHome("/foo"); - Assert.assertEquals(Paths.get("/foo", ".mta", "ignore"), PathUtil.getUserIgnoreDir()); + Assert.assertEquals(Paths.get("/foo", ".windup", "ignore"), PathUtil.getUserIgnoreDir()); } }