Add wisemapping support for import.

wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties

@@ -231,11 +231,9 @@ UNEXPECTED_ERROR_SERVER_ERROR=We're sorry, an error has occurred and we can't pr
 NO_ENOUGH_PERMISSIONS=Outch!!. This  map is not available anymore.
 NO_ENOUGH_PERMISSIONS_DETAILS=You do not have enough right access to see this map. This map has been changed to private or deleted.
 SHARING=Sharing
-IMPORT_MINDMAP=Import map
-IMPORT_MINDMAP_DETAILS=Do you already have maps created with FreeMind?.No problem, Import them!.
-IMPORT_MINDMAP_INFO=You can import FreeMind 0.9 version maps to WiseMapping. Please, select the FreeMind map that want to import. <br/>Fields marked with an asterisk <span class="fieldRequired">*</span> are required.
+IMPORT_MINDMAP_INFO=You can import FreeMind 0.9 maps and WiseMapping maps to your list of maps. Select the file you want to import.
 PRINT=Print
-FREE_MIND_FILE=FreeMind File
+MIND_FILE=File
 IMPORT_MAP_ERROR=FreeMind file could not be imported. {0}
 MAP_TITLE_ALREADY_EXISTS=A map already exists with this name.
 EMBEDDED_VIEWER=Embed a map viewer in your own web site, blog or post!

wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties

@@ -215,9 +215,8 @@ NO_ENOUGH_PERMISSIONS_DETAILS=No tiene suficiente permisos de acceso para ver es
 SHARING=Colaboración
 IMPORT_MINDMAP=Importar mapa
 IMPORT_MINDMAP_DETAILS=Tiene mapas creados con FreeMind?. Ningun problema, los puede importar!.
-IMPORT_MINDMAP_INFO=Ahora puedes importar mapas de FreeMind a WiseMapping. Por favor, seleccione el mapa FreeMind que desea importar. <br/>Los campos marcados con un asterisco <span class="fieldRequired">*</span> son requeridos.
 PRINT=Imprimir
-FREE_MIND_FILE=Archivo FreeMind
+FREE_MIND_FILE=Archivo de mapa mentaa
 IMPORT_MAP_ERROR=El archivo importado no parece ser un archivo FreeMind v&aacute;lido
 MAP_TITLE_ALREADY_EXISTS=Nombre de mapa ya existente.
 EMBEDDED_VIEWER=Incluya un visor de mapa en su sitio web, blog o post.

wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.properties

@@ -230,9 +230,7 @@ NO_ENOUGH_PERMISSIONS_DETAILS = Vous ne pouvez pas acc\u00e9der \u00e0 cette car
 SHARING = Partager
 IMPORT_MINDMAP = Importer une carte
 IMPORT_MINDMAP_DETAILS = Vous avez d\u00e9j\u00e0 cr\u00e9\u00e9 des cartes sur FreeMind ou FreePlane? Pas de probl\u00e9me, importez-les!
-IMPORT_MINDMAP_INFO=Vous pouvez importer les cartes FreeMind dans WiseMapping. Choisissez la carte que vous souhaiez importer. <br/>Les champs avec une ast\u00e9risque sont requis.
 PRINT = Imprimer
-FREE_MIND_FILE = Fichier FreeMind
 IMPORT_MAP_ERROR = Le fichier import\u00e9 ne semble pas \u00eatre un fichier FreeMind valide.
 MAP_TITLE_ALREADY_EXISTS = Le titre de la carte existe d\u00e9j\u00e0.
 EMBEDDED_VIEWER = Int\u00e9grer un visualiseur de carte dans votre propre site internet, blog ou billet.

wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml

@@ -164,9 +164,7 @@
         <put name="body" value="/jsp/keyboard.jsp"/>
     </definition>
 
-    <definition name="mindmapImport" extends="pageTemplate">
-        <put name="title" value="IMPORT_MINDMAP"/>
-        <put name="details" value="IMPORT_MINDMAP_INFO"/>
+    <definition name="mindmapImport" extends="dialogTemplate">
         <put name="body" value="/jsp/mindmapImport.jsp"/>
     </definition>
 

wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml

@@ -27,12 +27,6 @@
     </bean>
 
 
-    <bean id="cookerController" class="com.wisemapping.controller.MindmapCooker">
-        <property name="methodNameResolver" ref="paramResolverByAction"/>
-        <property name="mindmapService" ref="mindmapService"/>
-        <property name="userService" ref="userService"/>
-    </bean>
-
     <bean id="loginController" class="com.wisemapping.controller.LoginController">
         <property name="methodNameResolver" ref="paramResolverByAction"/>
         <property name="mindmapService" ref="mindmapService"/>
@@ -131,11 +125,6 @@
         <property name="userService" ref="userService"/>
     </bean>
 
-    <bean id="publicView" class="com.wisemapping.controller.PublicViewController">
-        <property name="methodNameResolver" ref="paramResolverByAction"/>
-        <property name="mindmapService" ref="mindmapService"/>
-    </bean>
-
     <bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
         <property name="interceptors">
             <list>
@@ -145,9 +134,6 @@
         </property>
         <property name="mappings">
             <props>
-                <!-- Review -->
-                <prop key="publicView">publicView</prop>
-
                 <!-- Forms based -->
                 <prop key="userRegistration">userController</prop>
                 <prop key="sharing">sharingController</prop>
@@ -155,7 +141,6 @@
                 <prop key="forgotPassword">forgotPasswordController</prop>
                 <prop key="activation">activationController</prop>
                 <prop key="changePassword">changePasswordController</prop>
-                <prop key="cooker">cookerController</prop>
                 <prop key="settings">settingsController</prop>
                 <prop key="editProfile">editProfileController</prop>
                 <prop key="history">historyController</prop>