[Windup-commits] [windup/windup] 850052: Fix issue introduced by merge conflict

Branch: refs/heads/master Home: https://github.com/windup/windup Commit: 850052268ee9ba6519063d71be127022358788e9 https://github.com/windup/windup/commit/850052268ee9ba6519063d71be1270223... Author: OndraZizka <zizka(a)seznam.cz&gt; Date: 2014-08-06 (Wed, 06 Aug 2014) Changed paths: M reporting/impl/src/main/java/org/jboss/windup/reporting/rules/RenderOverviewPageRuleProvider.java Log Message: ----------- Fix issue introduced by merge conflict Commit: 24270b17cfa120555e39bd0c824f0866a35c7876 https://github.com/windup/windup/commit/24270b17cfa120555e39bd0c824f0866a... Author: Jess Sightler <jesse.sightler(a)gmail.com&gt; Date: 2014-08-06 (Wed, 06 Aug 2014) Changed paths: M reporting/api/src/main/java/org/jboss/windup/reporting/model/ApplicationReportModel.java A reporting/api/src/main/java/org/jboss/windup/reporting/model/MainNavigationIndexModel.java M reporting/api/src/main/java/org/jboss/windup/reporting/model/ReportModel.java A reporting/api/src/main/java/org/jboss/windup/reporting/service/ApplicationReportModelService.java A reporting/api/src/main/java/org/jboss/windup/reporting/service/MainNavigationIndexModelService.java M reporting/api/src/main/java/org/jboss/windup/reporting/service/ReportModelService.java M reporting/impl/src/main/java/org/jboss/windup/reporting/freemarker/FileModelToSourceReportModelMethod.java R reporting/impl/src/main/java/org/jboss/windup/reporting/rules/CreateApplicationReportRuleProvider.java A reporting/impl/src/main/java/org/jboss/windup/reporting/rules/CreateMainApplicationReportRuleProvider.java M reporting/impl/src/main/java/org/jboss/windup/reporting/rules/CreateSourceReportRuleProvider.java M reporting/impl/src/main/java/org/jboss/windup/reporting/rules/RenderApplicationReportRuleProvider.java M reporting/impl/src/main/java/org/jboss/windup/reporting/rules/RenderSourceReportRuleProvider.java M reporting/impl/src/main/resources/reports/templates/application.ftl A reporting/impl/src/main/resources/reports/templates/include/navbar.ftl M reporting/impl/src/main/resources/reports/templates/overview.ftl M reporting/impl/src/main/resources/reports/templates/source.ftl R reporting/tests/src/test/java/org/jboss/windup/reporting/ApplicationReport.java R reporting/tests/src/test/java/org/jboss/windup/reporting/ApplicationReportTest.java A reporting/tests/src/test/java/org/jboss/windup/reporting/MainNavigationIndexModelServiceTest.java Log Message: ----------- WINDUP-143: Make the navigationbar in freemarker reports dynamic Commit: 777759c22537b6d17314d3e79b67d6c8b1d2efb7 https://github.com/windup/windup/commit/777759c22537b6d17314d3e79b67d6c8b... Author: Jess Sightler <jesse.sightler(a)gmail.com&gt; Date: 2014-08-06 (Wed, 06 Aug 2014) Changed paths: M graph/api/src/main/java/org/jboss/windup/graph/GraphContext.java M graph/api/src/main/java/org/jboss/windup/graph/service/GraphService.java M graph/api/src/main/java/org/jboss/windup/graph/service/Service.java M graph/impl/src/main/java/org/jboss/windup/graph/GraphContextFactoryImpl.java M graph/impl/src/main/java/org/jboss/windup/graph/GraphContextImpl.java A tests/core/src/test/java/org/jboss/windup/tests/application/GraphServiceLookupTest.java A tests/core/src/test/java/org/jboss/windup/tests/application/model/SampleModel.java Log Message: ----------- WINDUP-146: Expose generic services via GraphContext.getService(Model.class) Commit: 064e098eaf42d7d0d6e77ac6d3a1fc007e90b1f0 https://github.com/windup/windup/commit/064e098eaf42d7d0d6e77ac6d3a1fc007... Author: Matej Briskar <mbriskar(a)redhat.com&gt; Date: 2014-08-06 (Wed, 06 Aug 2014) Changed paths: M config/api/src/main/java/org/jboss/windup/config/Variables.java Log Message: ----------- WINDUP-151: Use Collections.singletonList() in Variables.setSingletonVariable() Compare: https://github.com/windup/windup/compare/f350fd388fb5...064e098eaf42