From 154a4424289051342beda91c389f043441565ea0 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sat, 1 Sep 2012 14:30:32 -0300 Subject: [PATCH] Add support for homepage configuration. --- .../src/main/webapp/WEB-INF/app.properties | 3 + .../webapp/WEB-INF/wisemapping-servlet.xml | 2 + wise-webapp/src/main/webapp/index.html | 2 +- wise-webapp/src/main/webapp/index.jsp | 2 +- wise-webapp/src/main/webapp/jsp/header.jsp | 2 +- .../src/main/webapp/jsp/mindmapEditor.jsp | 2 +- .../src/main/webapp/jsp/mindmapEmbed.jsp | 2 +- .../src/main/webapp/jsp/mindmapPrint.jsp | 2 +- .../resources/data/freemind/XMLcharacter.mm | 78 +++++++++++++++++++ 9 files changed, 89 insertions(+), 6 deletions(-) create mode 100644 wise-webapp/src/test/resources/data/freemind/XMLcharacter.mm diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties index e757b5ed..4a77d6f0 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/app.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties @@ -82,6 +82,9 @@ admin.user = admin@wisemapping.org # Site URL. This url will be used during sharing emails and public views. site.baseurl = http://localhost:8080 +# Site Homepage URL. This will be used as URL for homepage location. +site.homepage = c/home + ################################################################################## # Google Analytics Settings ################################################################################## diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml index 4d999cfb..b150a358 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml @@ -47,6 +47,8 @@ + + diff --git a/wise-webapp/src/main/webapp/index.html b/wise-webapp/src/main/webapp/index.html index ad1662cb..02dcf806 100644 --- a/wise-webapp/src/main/webapp/index.html +++ b/wise-webapp/src/main/webapp/index.html @@ -1,6 +1,6 @@ - + diff --git a/wise-webapp/src/main/webapp/index.jsp b/wise-webapp/src/main/webapp/index.jsp index f5c10307..a444398c 100644 --- a/wise-webapp/src/main/webapp/index.jsp +++ b/wise-webapp/src/main/webapp/index.jsp @@ -1,3 +1,3 @@ <% - response.sendRedirect("c/home"); + response.sendRedirect("c/maps/"); %> \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/header.jsp b/wise-webapp/src/main/webapp/jsp/header.jsp index bd23ff41..0564d167 100644 --- a/wise-webapp/src/main/webapp/jsp/header.jsp +++ b/wise-webapp/src/main/webapp/jsp/header.jsp @@ -53,7 +53,7 @@
- + diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index 36ea5967..6b211674 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -77,7 +77,7 @@ code="REGISTER"/>
- + diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp index 0ddbff91..5fafa58a 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp @@ -70,7 +70,7 @@
- + diff --git a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp index 541537a7..dfd0df63 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp @@ -105,7 +105,7 @@
- + diff --git a/wise-webapp/src/test/resources/data/freemind/XMLcharacter.mm b/wise-webapp/src/test/resources/data/freemind/XMLcharacter.mm new file mode 100644 index 00000000..b1035fd0 --- /dev/null +++ b/wise-webapp/src/test/resources/data/freemind/XMLcharacter.mm @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +