diff --git a/mifosng-provider/src/main/dist/How to run MifosX.txt b/mifosng-provider/src/main/dist/How to run MifosX.txt index 1546ce34f..00c26c824 100644 --- a/mifosng-provider/src/main/dist/How to run MifosX.txt +++ b/mifosng-provider/src/main/dist/How to run MifosX.txt @@ -6,10 +6,18 @@ Depending on the OS you're running, you should have "runmifosx.sh" (for Linux an run MifosX on your computer locally. To be able to run MifosX, just double-click on the script, that is, "runmifosx.sh" if you are on Linux or Mac, or "runmifosx.bat" if you are on Windows. -Note -==== If you have a web front-end that you want to use along with the backend server, put your index.html -inside the "web" folder along with all the other source files. -P.S.: the index.html should be in the "web" folder itself +along with all the other source files inside a (sub-folder of) the "apps" folder in the current +directory from where runmifosx.bat/.sh is launched. The web UI front-end is then accessible +under mifosng-provider/apps - for example: -We hope you'll have an amazing experience working with MifosX. + https://localhost:8443/mifosng-provider/apps/community-app/index.html + +We hope you'll have an amazing experience working with MifosX! + + +PS, internal note to Mifos developers preparing packages, only: For this to work, the WAR of +the Mifos X distribution ZIP package will (currently) have to be built using +the Gradle 'dev' environment profile - e.g. using this command: + + ./gradlew -Penv=dev clean war dist diff --git a/mifosng-provider/src/main/java/org/mifosplatform/ServerWithMariaDB4jApplication.java b/mifosng-provider/src/main/java/org/mifosplatform/ServerWithMariaDB4jApplication.java index 8c3f8d179..e0d9f3a34 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/ServerWithMariaDB4jApplication.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/ServerWithMariaDB4jApplication.java @@ -40,12 +40,13 @@ public class ServerWithMariaDB4jApplication { ConfigurableApplicationContext ctx = SpringApplication.run(Configuration.class, args); if (Desktop.isDesktopSupported()) { Resource resource = ctx.getResource("file:" + System.getProperty("user.dir") + - System.getProperty("file.separator") + "web" + + System.getProperty("file.separator") + "apps" + + System.getProperty("file.separator") + "community-app" + System.getProperty("file.separator") + "index.html"); if (resource.exists()) { try { Desktop.getDesktop().browse(URI.create("https://localhost:8443/mifosng-provider" + - "/web/index.html?baseApiUrl=https://localhost:8443" + + "/apps/community-app/index.html?baseApiUrl=https://localhost:8443" + "&tenantIdentifier=default#/")); } catch (IOException e) {} } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/boot/WebFrontEndConfiguration.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/boot/WebFrontEndConfiguration.java index 5c82d2b61..526ef2f5f 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/boot/WebFrontEndConfiguration.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/boot/WebFrontEndConfiguration.java @@ -16,9 +16,9 @@ public class WebFrontEndConfiguration extends WebMvcConfigurerAdapter { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("/web/**").addResourceLocations("file:" + + registry.addResourceHandler("/apps/**").addResourceLocations("file:" + System.getProperty("user.dir") + System.getProperty("file.separator") + - "web" + System.getProperty("file.separator")); + "apps" + System.getProperty("file.separator")); } }