Skip to content

Commit

Permalink
Several renamings
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maarc
Maarc committed Aug 15, 2017
1 parent 24a7248 commit c31561d
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 19 deletions.
4 changes: 2 additions & 2 deletions reporting/impl/src/main/resources/reports/templates/classloader.ftl
View file
Expand Up @@ -36,7 +36,7 @@
<li><a href="ejbs.html">EJBs</a></li>
<li><a href="hibernate.html">Hibernate</a></li>
<li><a href="spring.html">Spring</a></li>
<li><a href="server-resources.html">Server Resources</a></li>
<li><a href="server-resources.html">Server resources</a></li>
<li><a href="classloader-blacklists.html">Blacklists</a></li>
<li><a href="classloader-duplicate.html">Duplicates</a></li>
<li><a href="classloader-notfound.html">Not Found</a></li>
Expand Down Expand Up @@ -86,4 +86,4 @@
<script src="https://code.jquery.com/jquery.js"></script>
<script src="../../resources/js/bootstrap.min.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions ...rc/main/java/org/jboss/windup/rules/apps/javaee/rules/CreateRemoteReportRuleProvider.java
View file
Expand Up @@ -36,7 +36,7 @@
/**
* Creates a report of EJB data (eg, a list of EJB session beans).
*/
@RuleMetadata(phase = ReportGenerationPhase.class, id = "Create Remote Service Report")
@RuleMetadata(phase = ReportGenerationPhase.class, id = "Create Remote services report")
public class CreateRemoteReportRuleProvider extends AbstractRuleProvider
{
public static final String TEMPLATE_EJB_REPORT = "/reports/templates/remote.ftl";
Expand Down Expand Up @@ -112,7 +112,7 @@ else if (remoteServiceModel instanceof RMIServiceModel)
ApplicationReportModel applicationReportModel = applicationReportService.create();
applicationReportModel.setReportPriority(300);
applicationReportModel.setDisplayInApplicationReportIndex(true);
applicationReportModel.setReportName("Remote Services");
applicationReportModel.setReportName("Remote services");
applicationReportModel.setDescription(REPORT_DESCRIPTION);
applicationReportModel.setReportIconClass("glyphicon service-nav-logo");
applicationReportModel.setProjectModel(projectModel);
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/jboss/windup/rules/apps/javaee/rules/CreateServerResourcesReportRuleProvider.java
View file
Expand Up @@ -127,7 +127,7 @@ else if (jndi instanceof JmsConnectionFactoryModel)
ApplicationReportModel applicationReportModel = applicationReportService.create();
applicationReportModel.setReportPriority(400);
applicationReportModel.setDisplayInApplicationReportIndex(true);
applicationReportModel.setReportName("Server Resources");
applicationReportModel.setReportName("Server resources");
applicationReportModel.setDescription(REPORT_DESCRIPTION);
applicationReportModel.setReportIconClass("glyphicon server-resource-nav-logo");
applicationReportModel.setProjectModel(application);
Expand Down
6 changes: 3 additions & 3 deletions rules-java-ee/addon/src/main/resources/reports/templates/remote.ftl
View file
Expand Up @@ -6,7 +6,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>${reportModel.projectModel.name} - Remote Service Report</title>
<title>${reportModel.projectModel.name} - Remote services</title>
<link href="resources/css/bootstrap.min.css" rel="stylesheet">
<link href="resources/css/windup.css" rel="stylesheet" media="screen">
<link href="resources/img/rhamt-icon-128.png" rel="shortcut icon" type="image/x-icon"/>
Expand All @@ -28,7 +28,7 @@
<div class="row">
<div class="page-header page-header-no-border">
<h1>
<div class="main">Remote Service Report</div>
<div class="main">Remote services</div>
<div class="path">${reportModel.projectModel.rootFileModel.fileName}</div>
</h1>
<div class="desc">
Expand Down Expand Up @@ -138,4 +138,4 @@
<script src="resources/js/jquery-1.10.1.min.js"></script>
<script src="resources/js/bootstrap.min.js"></script>
</body>
</html>
</html>
6 changes: 3 additions & 3 deletions rules-java-ee/addon/src/main/resources/reports/templates/server.ftl
View file
Expand Up @@ -6,7 +6,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>${reportModel.projectModel.name} - Server Resource Report</title>
<title>${reportModel.projectModel.name} - Server resources</title>
<link href="resources/css/bootstrap.min.css" rel="stylesheet">
<link href="resources/css/windup.css" rel="stylesheet" media="screen">
<link href="resources/img/rhamt-icon-128.png" rel="shortcut icon" type="image/x-icon"/>
Expand All @@ -28,7 +28,7 @@
<div class="row">
<div class="page-header page-header-no-border">
<h1>
<div class="main">Server Resource Report</div>
<div class="main">Server resources</div>
<div class="path">${reportModel.projectModel.rootFileModel.fileName}</div>
</h1>
<div class="desc">
Expand Down Expand Up @@ -166,4 +166,4 @@
<script src="resources/js/jquery-1.10.1.min.js"></script>
<script src="resources/js/bootstrap.min.js"></script>
</body>
</html>
</html>
7 changes: 2 additions & 5 deletions ...boss/windup/rules/apps/java/reporting/rules/CreateJavaIgnoredFilesReportRuleProvider.java
View file
Expand Up @@ -37,12 +37,9 @@
@RuleMetadata(phase = ReportGenerationPhase.class)
public class CreateJavaIgnoredFilesReportRuleProvider extends AbstractRuleProvider
{
public static final String TITLE = "Ignored Files";
public static final String TITLE = "Ignored files";
public static final String TEMPLATE_REPORT = "/reports/templates/ignored_files.ftl";
public static final String DESCRIPTION = "This report lists the files which were found in the application,\n" +
" but based on certain rules and the " + Util.WINDUP_BRAND_NAME_LONG + " configuration, both built-in and local,\n" +
" they were not processed.\n" +
" See the <code>--userIgnorePath</code> option in the <a href=\"https://access.redhat.com/documentation/en/red-hat-jboss-migration-toolkit/\">User Guide</a>.";
public static final String DESCRIPTION = "This report lists the files in the application that have not been processed based on certain rules and the " + Util.WINDUP_BRAND_NAME_LONG + " configuration. See the <code>--userIgnorePath</code> option in the <a href=\"https://access.redhat.com/documentation/en/red-hat-jboss-migration-toolkit/\">User Guide</a>.";

// @formatter:off
@Override
Expand Down
4 changes: 2 additions & 2 deletions .../java/org/jboss/windup/rules/apps/java/reporting/rules/CreateReportIndexRuleProvider.java
View file
Expand Up @@ -27,7 +27,7 @@
@RuleMetadata(phase = ReportGenerationPhase.class)
public class CreateReportIndexRuleProvider extends AbstractRuleProvider
{
public static final String REPORT_INDEX = "Report Index";
public static final String REPORT_INDEX = "Dashboard";
public static final String TEMPLATE = "/reports/templates/report_index.ftl";

// @formatter:off
Expand Down Expand Up @@ -56,7 +56,7 @@ private void createReportIndex(GraphContext context, ProjectModel projectModel)
applicationReportModel.setReportPriority(100);
applicationReportModel.setDisplayInApplicationReportIndex(true);
applicationReportModel.setReportName(REPORT_INDEX);
applicationReportModel.setReportIconClass("glyphicon glyphicon-th-list");
applicationReportModel.setReportIconClass("glyphicon glyphicon-dashboard");
applicationReportModel.setMainApplicationReport(true);
applicationReportModel.setTemplatePath(TEMPLATE);
applicationReportModel.setTemplateType(TemplateType.FREEMARKER);
Expand Down
2 changes: 1 addition & 1 deletion tests/src/test/java/org/jboss/windup/tests/application/WindupArchitectureJEEExampleTest.java
View file
Expand Up @@ -174,7 +174,7 @@ private void validateParentOfSourceReports(GraphContext context)
{
List<ReportModel> parents = sourceReportModel.getAllParentsInReversedOrder();
Assert.assertTrue(parents.size() == 2);
Assert.assertTrue(parents.get(0).getReportName().equals("Report Index"));
Assert.assertTrue(parents.get(0).getReportName().equals("Dahsboard"));
Assert.assertTrue(parents.get(0).getReportFilename().contains("report_index"));
}
}
Expand Down

0 comments on commit c31561d

Please sign in to comment.