diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 00000000..3ceb14ea --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,21 @@ +version: '3' +services: + wise-api: + build: + context: ./wise-api + dockerfile: Dockerfile + ports: + - "8080:8080" + environment: + SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/product + SPRING_DATASOURCE_USERNAME: product_user + SPRING_DATASOURCE_PASSWORD: product_user_password + + react-app: + build: + context: ./wise-ui + dockerfile: Dockerfile + depends_on: + - wise-api + ports: + - "3000:80" \ No newline at end of file diff --git a/wise-webapp/Dockerfile b/wise-api/Dockerfile similarity index 100% rename from wise-webapp/Dockerfile rename to wise-api/Dockerfile diff --git a/wise-webapp/doc/Compile.md b/wise-api/doc/Compile.md similarity index 100% rename from wise-webapp/doc/Compile.md rename to wise-api/doc/Compile.md diff --git a/wise-webapp/doc/REST Services.md b/wise-api/doc/REST Services.md similarity index 100% rename from wise-webapp/doc/REST Services.md rename to wise-api/doc/REST Services.md diff --git a/wise-webapp/docker/compose.yaml b/wise-api/docker/compose.yaml similarity index 100% rename from wise-webapp/docker/compose.yaml rename to wise-api/docker/compose.yaml diff --git a/wise-webapp/pom.xml b/wise-api/pom.xml similarity index 98% rename from wise-webapp/pom.xml rename to wise-api/pom.xml index 2c2cfad0..c3785424 100644 --- a/wise-webapp/pom.xml +++ b/wise-api/pom.xml @@ -9,11 +9,11 @@ org.wisemapping - wise-webapp + wise-api 5.1.0-SNAPSHOT - WiseMapping Webapp - http://www.wisemapping.org + WiseMapping API + https://www.wisemapping.org 5.1.0-SNAPSHOT diff --git a/wise-webapp/src/main/java/com/wisemapping/Application.java b/wise-api/src/main/java/com/wisemapping/Application.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/Application.java rename to wise-api/src/main/java/com/wisemapping/Application.java diff --git a/wise-webapp/src/main/java/com/wisemapping/config/common/CommonConfig.java b/wise-api/src/main/java/com/wisemapping/config/common/CommonConfig.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/config/common/CommonConfig.java rename to wise-api/src/main/java/com/wisemapping/config/common/CommonConfig.java diff --git a/wise-webapp/src/main/java/com/wisemapping/config/common/JPAConfig.java b/wise-api/src/main/java/com/wisemapping/config/common/JPAConfig.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/config/common/JPAConfig.java rename to wise-api/src/main/java/com/wisemapping/config/common/JPAConfig.java diff --git a/wise-webapp/src/main/java/com/wisemapping/config/common/SecurityConfig.java b/wise-api/src/main/java/com/wisemapping/config/common/SecurityConfig.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/config/common/SecurityConfig.java rename to wise-api/src/main/java/com/wisemapping/config/common/SecurityConfig.java diff --git a/wise-webapp/src/main/java/com/wisemapping/config/mvc/InterceptorsConfig.java b/wise-api/src/main/java/com/wisemapping/config/mvc/InterceptorsConfig.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/config/mvc/InterceptorsConfig.java rename to wise-api/src/main/java/com/wisemapping/config/mvc/InterceptorsConfig.java diff --git a/wise-webapp/src/main/java/com/wisemapping/config/mvc/MvcAppConfig.java b/wise-api/src/main/java/com/wisemapping/config/mvc/MvcAppConfig.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/config/mvc/MvcAppConfig.java rename to wise-api/src/main/java/com/wisemapping/config/mvc/MvcAppConfig.java diff --git a/wise-webapp/src/main/java/com/wisemapping/config/mvc/MvcSecurityConfig.java b/wise-api/src/main/java/com/wisemapping/config/mvc/MvcSecurityConfig.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/config/mvc/MvcSecurityConfig.java rename to wise-api/src/main/java/com/wisemapping/config/mvc/MvcSecurityConfig.java diff --git a/wise-webapp/src/main/java/com/wisemapping/config/rest/InterceptorsConfig.java b/wise-api/src/main/java/com/wisemapping/config/rest/InterceptorsConfig.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/config/rest/InterceptorsConfig.java rename to wise-api/src/main/java/com/wisemapping/config/rest/InterceptorsConfig.java diff --git a/wise-webapp/src/main/java/com/wisemapping/config/rest/RestAppConfig.java b/wise-api/src/main/java/com/wisemapping/config/rest/RestAppConfig.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/config/rest/RestAppConfig.java rename to wise-api/src/main/java/com/wisemapping/config/rest/RestAppConfig.java diff --git a/wise-webapp/src/main/java/com/wisemapping/config/rest/ServletConfig.java b/wise-api/src/main/java/com/wisemapping/config/rest/ServletConfig.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/config/rest/ServletConfig.java rename to wise-api/src/main/java/com/wisemapping/config/rest/ServletConfig.java diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/LabelManager.java b/wise-api/src/main/java/com/wisemapping/dao/LabelManager.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/dao/LabelManager.java rename to wise-api/src/main/java/com/wisemapping/dao/LabelManager.java diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/LabelManagerImpl.java b/wise-api/src/main/java/com/wisemapping/dao/LabelManagerImpl.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/dao/LabelManagerImpl.java rename to wise-api/src/main/java/com/wisemapping/dao/LabelManagerImpl.java diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java b/wise-api/src/main/java/com/wisemapping/dao/MindmapManager.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java rename to wise-api/src/main/java/com/wisemapping/dao/MindmapManager.java diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java b/wise-api/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java rename to wise-api/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java b/wise-api/src/main/java/com/wisemapping/dao/UserManager.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java rename to wise-api/src/main/java/com/wisemapping/dao/UserManager.java diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java b/wise-api/src/main/java/com/wisemapping/dao/UserManagerImpl.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java rename to wise-api/src/main/java/com/wisemapping/dao/UserManagerImpl.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/AccessDeniedSecurityException.java b/wise-api/src/main/java/com/wisemapping/exceptions/AccessDeniedSecurityException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/AccessDeniedSecurityException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/AccessDeniedSecurityException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/ClientException.java b/wise-api/src/main/java/com/wisemapping/exceptions/ClientException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/ClientException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/ClientException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/EditionSessionExpiredException.java b/wise-api/src/main/java/com/wisemapping/exceptions/EditionSessionExpiredException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/EditionSessionExpiredException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/EditionSessionExpiredException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java b/wise-api/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/InvalidEmailException.java b/wise-api/src/main/java/com/wisemapping/exceptions/InvalidEmailException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/InvalidEmailException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/InvalidEmailException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/InvalidMindmapException.java b/wise-api/src/main/java/com/wisemapping/exceptions/InvalidMindmapException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/InvalidMindmapException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/InvalidMindmapException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/LabelCouldNotFoundException.java b/wise-api/src/main/java/com/wisemapping/exceptions/LabelCouldNotFoundException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/LabelCouldNotFoundException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/LabelCouldNotFoundException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/LockException.java b/wise-api/src/main/java/com/wisemapping/exceptions/LockException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/LockException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/LockException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/MapCouldNotFoundException.java b/wise-api/src/main/java/com/wisemapping/exceptions/MapCouldNotFoundException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/MapCouldNotFoundException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/MapCouldNotFoundException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/MapNotPublicSecurityException.java b/wise-api/src/main/java/com/wisemapping/exceptions/MapNotPublicSecurityException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/MapNotPublicSecurityException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/MapNotPublicSecurityException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/OAuthAuthenticationException.java b/wise-api/src/main/java/com/wisemapping/exceptions/OAuthAuthenticationException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/OAuthAuthenticationException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/OAuthAuthenticationException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/OwnerCannotChangeException.java b/wise-api/src/main/java/com/wisemapping/exceptions/OwnerCannotChangeException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/OwnerCannotChangeException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/OwnerCannotChangeException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/PasswordTooLongException.java b/wise-api/src/main/java/com/wisemapping/exceptions/PasswordTooLongException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/PasswordTooLongException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/PasswordTooLongException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/SessionExpiredException.java b/wise-api/src/main/java/com/wisemapping/exceptions/SessionExpiredException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/SessionExpiredException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/SessionExpiredException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/Severity.java b/wise-api/src/main/java/com/wisemapping/exceptions/Severity.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/Severity.java rename to wise-api/src/main/java/com/wisemapping/exceptions/Severity.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/TooManyInactiveAccountsExceptions.java b/wise-api/src/main/java/com/wisemapping/exceptions/TooManyInactiveAccountsExceptions.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/TooManyInactiveAccountsExceptions.java rename to wise-api/src/main/java/com/wisemapping/exceptions/TooManyInactiveAccountsExceptions.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/ValidationException.java b/wise-api/src/main/java/com/wisemapping/exceptions/ValidationException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/ValidationException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/ValidationException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/WiseMappingException.java b/wise-api/src/main/java/com/wisemapping/exceptions/WiseMappingException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/exceptions/WiseMappingException.java rename to wise-api/src/main/java/com/wisemapping/exceptions/WiseMappingException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/CorsFilter.java b/wise-api/src/main/java/com/wisemapping/filter/CorsFilter.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/filter/CorsFilter.java rename to wise-api/src/main/java/com/wisemapping/filter/CorsFilter.java diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java b/wise-api/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java rename to wise-api/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java b/wise-api/src/main/java/com/wisemapping/filter/SupportedUserAgent.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java rename to wise-api/src/main/java/com/wisemapping/filter/SupportedUserAgent.java diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java b/wise-api/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java rename to wise-api/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java diff --git a/wise-webapp/src/main/java/com/wisemapping/listener/UnlockOnExpireListener.java b/wise-api/src/main/java/com/wisemapping/listener/UnlockOnExpireListener.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/listener/UnlockOnExpireListener.java rename to wise-api/src/main/java/com/wisemapping/listener/UnlockOnExpireListener.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/AccessAuditory.java b/wise-api/src/main/java/com/wisemapping/model/AccessAuditory.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/AccessAuditory.java rename to wise-api/src/main/java/com/wisemapping/model/AccessAuditory.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/AuthenticationType.java b/wise-api/src/main/java/com/wisemapping/model/AuthenticationType.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/AuthenticationType.java rename to wise-api/src/main/java/com/wisemapping/model/AuthenticationType.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java b/wise-api/src/main/java/com/wisemapping/model/Collaboration.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java rename to wise-api/src/main/java/com/wisemapping/model/Collaboration.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/CollaborationEmail.java b/wise-api/src/main/java/com/wisemapping/model/CollaborationEmail.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/CollaborationEmail.java rename to wise-api/src/main/java/com/wisemapping/model/CollaborationEmail.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/CollaborationProperties.java b/wise-api/src/main/java/com/wisemapping/model/CollaborationProperties.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/CollaborationProperties.java rename to wise-api/src/main/java/com/wisemapping/model/CollaborationProperties.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/CollaborationRole.java b/wise-api/src/main/java/com/wisemapping/model/CollaborationRole.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/CollaborationRole.java rename to wise-api/src/main/java/com/wisemapping/model/CollaborationRole.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Collaborator.java b/wise-api/src/main/java/com/wisemapping/model/Collaborator.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/Collaborator.java rename to wise-api/src/main/java/com/wisemapping/model/Collaborator.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Constants.java b/wise-api/src/main/java/com/wisemapping/model/Constants.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/Constants.java rename to wise-api/src/main/java/com/wisemapping/model/Constants.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Label.java b/wise-api/src/main/java/com/wisemapping/model/Label.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/Label.java rename to wise-api/src/main/java/com/wisemapping/model/Label.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindMapCriteria.java b/wise-api/src/main/java/com/wisemapping/model/MindMapCriteria.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/MindMapCriteria.java rename to wise-api/src/main/java/com/wisemapping/model/MindMapCriteria.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindMapHistory.java b/wise-api/src/main/java/com/wisemapping/model/MindMapHistory.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/MindMapHistory.java rename to wise-api/src/main/java/com/wisemapping/model/MindMapHistory.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java b/wise-api/src/main/java/com/wisemapping/model/Mindmap.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java rename to wise-api/src/main/java/com/wisemapping/model/Mindmap.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindmapUtils.java b/wise-api/src/main/java/com/wisemapping/model/MindmapUtils.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/MindmapUtils.java rename to wise-api/src/main/java/com/wisemapping/model/MindmapUtils.java diff --git a/wise-webapp/src/main/java/com/wisemapping/model/User.java b/wise-api/src/main/java/com/wisemapping/model/User.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/model/User.java rename to wise-api/src/main/java/com/wisemapping/model/User.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java b/wise-api/src/main/java/com/wisemapping/rest/AccountController.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java rename to wise-api/src/main/java/com/wisemapping/rest/AccountController.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java b/wise-api/src/main/java/com/wisemapping/rest/AdminController.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java rename to wise-api/src/main/java/com/wisemapping/rest/AdminController.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java b/wise-api/src/main/java/com/wisemapping/rest/BaseController.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java rename to wise-api/src/main/java/com/wisemapping/rest/BaseController.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/JsonHttpMessageNotReadableException.java b/wise-api/src/main/java/com/wisemapping/rest/JsonHttpMessageNotReadableException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/JsonHttpMessageNotReadableException.java rename to wise-api/src/main/java/com/wisemapping/rest/JsonHttpMessageNotReadableException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/LabelController.java b/wise-api/src/main/java/com/wisemapping/rest/LabelController.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/LabelController.java rename to wise-api/src/main/java/com/wisemapping/rest/LabelController.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-api/src/main/java/com/wisemapping/rest/MindmapController.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java rename to wise-api/src/main/java/com/wisemapping/rest/MindmapController.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java b/wise-api/src/main/java/com/wisemapping/rest/MindmapFilter.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java rename to wise-api/src/main/java/com/wisemapping/rest/MindmapFilter.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/OAuth2Controller.java b/wise-api/src/main/java/com/wisemapping/rest/OAuth2Controller.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/OAuth2Controller.java rename to wise-api/src/main/java/com/wisemapping/rest/OAuth2Controller.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/UserController.java b/wise-api/src/main/java/com/wisemapping/rest/UserController.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/UserController.java rename to wise-api/src/main/java/com/wisemapping/rest/UserController.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaboration.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestCollaboration.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaboration.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestCollaboration.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborator.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestCollaborator.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborator.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestCollaborator.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestErrors.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestErrors.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestErrors.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestErrors.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestLabel.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestLabel.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabelList.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestLabelList.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabelList.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestLabelList.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLockInfo.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestLockInfo.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestLockInfo.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestLockInfo.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLogItem.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestLogItem.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestLogItem.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestLogItem.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestMindmap.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestMindmap.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistoryList.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestMindmapHistoryList.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistoryList.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestMindmapHistoryList.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapList.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestMindmapList.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapList.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestMindmapList.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestOath2CallbackResponse.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestOath2CallbackResponse.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestOath2CallbackResponse.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestOath2CallbackResponse.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestResetPasswordAction.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestResetPasswordAction.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestResetPasswordAction.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestResetPasswordAction.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestResetPasswordResponse.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestResetPasswordResponse.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestResetPasswordResponse.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestResetPasswordResponse.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestUser.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestUser.java diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestUserRegistration.java b/wise-api/src/main/java/com/wisemapping/rest/model/RestUserRegistration.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/rest/model/RestUserRegistration.java rename to wise-api/src/main/java/com/wisemapping/rest/model/RestUserRegistration.java diff --git a/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationProvider.java b/wise-api/src/main/java/com/wisemapping/security/AuthenticationProvider.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/security/AuthenticationProvider.java rename to wise-api/src/main/java/com/wisemapping/security/AuthenticationProvider.java diff --git a/wise-webapp/src/main/java/com/wisemapping/security/DefaultPasswordEncoderFactories.java b/wise-api/src/main/java/com/wisemapping/security/DefaultPasswordEncoderFactories.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/security/DefaultPasswordEncoderFactories.java rename to wise-api/src/main/java/com/wisemapping/security/DefaultPasswordEncoderFactories.java diff --git a/wise-webapp/src/main/java/com/wisemapping/security/GoogleAuthenticationProvider.java b/wise-api/src/main/java/com/wisemapping/security/GoogleAuthenticationProvider.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/security/GoogleAuthenticationProvider.java rename to wise-api/src/main/java/com/wisemapping/security/GoogleAuthenticationProvider.java diff --git a/wise-webapp/src/main/java/com/wisemapping/security/LegacyPasswordEncoder.java b/wise-api/src/main/java/com/wisemapping/security/LegacyPasswordEncoder.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/security/LegacyPasswordEncoder.java rename to wise-api/src/main/java/com/wisemapping/security/LegacyPasswordEncoder.java diff --git a/wise-webapp/src/main/java/com/wisemapping/security/MapAccessPermission.java b/wise-api/src/main/java/com/wisemapping/security/MapAccessPermission.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/security/MapAccessPermission.java rename to wise-api/src/main/java/com/wisemapping/security/MapAccessPermission.java diff --git a/wise-webapp/src/main/java/com/wisemapping/security/MapAccessPermissionEvaluation.java b/wise-api/src/main/java/com/wisemapping/security/MapAccessPermissionEvaluation.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/security/MapAccessPermissionEvaluation.java rename to wise-api/src/main/java/com/wisemapping/security/MapAccessPermissionEvaluation.java diff --git a/wise-webapp/src/main/java/com/wisemapping/security/MapPermissionsSecurityAdvice.java b/wise-api/src/main/java/com/wisemapping/security/MapPermissionsSecurityAdvice.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/security/MapPermissionsSecurityAdvice.java rename to wise-api/src/main/java/com/wisemapping/security/MapPermissionsSecurityAdvice.java diff --git a/wise-webapp/src/main/java/com/wisemapping/security/ReadSecurityAdvise.java b/wise-api/src/main/java/com/wisemapping/security/ReadSecurityAdvise.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/security/ReadSecurityAdvise.java rename to wise-api/src/main/java/com/wisemapping/security/ReadSecurityAdvise.java diff --git a/wise-webapp/src/main/java/com/wisemapping/security/UpdateSecurityAdvise.java b/wise-api/src/main/java/com/wisemapping/security/UpdateSecurityAdvise.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/security/UpdateSecurityAdvise.java rename to wise-api/src/main/java/com/wisemapping/security/UpdateSecurityAdvise.java diff --git a/wise-webapp/src/main/java/com/wisemapping/security/UserDetails.java b/wise-api/src/main/java/com/wisemapping/security/UserDetails.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/security/UserDetails.java rename to wise-api/src/main/java/com/wisemapping/security/UserDetails.java diff --git a/wise-webapp/src/main/java/com/wisemapping/security/UserDetailsService.java b/wise-api/src/main/java/com/wisemapping/security/UserDetailsService.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/security/UserDetailsService.java rename to wise-api/src/main/java/com/wisemapping/security/UserDetailsService.java diff --git a/wise-webapp/src/main/java/com/wisemapping/security/Utils.java b/wise-api/src/main/java/com/wisemapping/security/Utils.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/security/Utils.java rename to wise-api/src/main/java/com/wisemapping/security/Utils.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/CollaborationException.java b/wise-api/src/main/java/com/wisemapping/service/CollaborationException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/CollaborationException.java rename to wise-api/src/main/java/com/wisemapping/service/CollaborationException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/HibernateUtil.java b/wise-api/src/main/java/com/wisemapping/service/HibernateUtil.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/HibernateUtil.java rename to wise-api/src/main/java/com/wisemapping/service/HibernateUtil.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/InvalidActivationCodeException.java b/wise-api/src/main/java/com/wisemapping/service/InvalidActivationCodeException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/InvalidActivationCodeException.java rename to wise-api/src/main/java/com/wisemapping/service/InvalidActivationCodeException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/InvalidAuthSchemaException.java b/wise-api/src/main/java/com/wisemapping/service/InvalidAuthSchemaException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/InvalidAuthSchemaException.java rename to wise-api/src/main/java/com/wisemapping/service/InvalidAuthSchemaException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/InvalidUserEmailException.java b/wise-api/src/main/java/com/wisemapping/service/InvalidUserEmailException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/InvalidUserEmailException.java rename to wise-api/src/main/java/com/wisemapping/service/InvalidUserEmailException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LabelService.java b/wise-api/src/main/java/com/wisemapping/service/LabelService.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/LabelService.java rename to wise-api/src/main/java/com/wisemapping/service/LabelService.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LabelServiceImpl.java b/wise-api/src/main/java/com/wisemapping/service/LabelServiceImpl.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/LabelServiceImpl.java rename to wise-api/src/main/java/com/wisemapping/service/LabelServiceImpl.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LockInfo.java b/wise-api/src/main/java/com/wisemapping/service/LockInfo.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/LockInfo.java rename to wise-api/src/main/java/com/wisemapping/service/LockInfo.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LockManager.java b/wise-api/src/main/java/com/wisemapping/service/LockManager.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/LockManager.java rename to wise-api/src/main/java/com/wisemapping/service/LockManager.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java b/wise-api/src/main/java/com/wisemapping/service/LockManagerImpl.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java rename to wise-api/src/main/java/com/wisemapping/service/LockManagerImpl.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/MailerService.java b/wise-api/src/main/java/com/wisemapping/service/MailerService.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/MailerService.java rename to wise-api/src/main/java/com/wisemapping/service/MailerService.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java b/wise-api/src/main/java/com/wisemapping/service/MindmapService.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java rename to wise-api/src/main/java/com/wisemapping/service/MindmapService.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java b/wise-api/src/main/java/com/wisemapping/service/MindmapServiceImpl.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java rename to wise-api/src/main/java/com/wisemapping/service/MindmapServiceImpl.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/NotificationService.java b/wise-api/src/main/java/com/wisemapping/service/NotificationService.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/NotificationService.java rename to wise-api/src/main/java/com/wisemapping/service/NotificationService.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/NotifierFilter.java b/wise-api/src/main/java/com/wisemapping/service/NotifierFilter.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/NotifierFilter.java rename to wise-api/src/main/java/com/wisemapping/service/NotifierFilter.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/RecaptchaService.java b/wise-api/src/main/java/com/wisemapping/service/RecaptchaService.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/RecaptchaService.java rename to wise-api/src/main/java/com/wisemapping/service/RecaptchaService.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/RegistrationException.java b/wise-api/src/main/java/com/wisemapping/service/RegistrationException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/RegistrationException.java rename to wise-api/src/main/java/com/wisemapping/service/RegistrationException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/UserService.java b/wise-api/src/main/java/com/wisemapping/service/UserService.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/UserService.java rename to wise-api/src/main/java/com/wisemapping/service/UserService.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java b/wise-api/src/main/java/com/wisemapping/service/UserServiceImpl.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java rename to wise-api/src/main/java/com/wisemapping/service/UserServiceImpl.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/google/GoogleAccountBasicData.java b/wise-api/src/main/java/com/wisemapping/service/google/GoogleAccountBasicData.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/google/GoogleAccountBasicData.java rename to wise-api/src/main/java/com/wisemapping/service/google/GoogleAccountBasicData.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/google/GoogleService.java b/wise-api/src/main/java/com/wisemapping/service/google/GoogleService.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/google/GoogleService.java rename to wise-api/src/main/java/com/wisemapping/service/google/GoogleService.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/google/http/HttpInvoker.java b/wise-api/src/main/java/com/wisemapping/service/google/http/HttpInvoker.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/google/http/HttpInvoker.java rename to wise-api/src/main/java/com/wisemapping/service/google/http/HttpInvoker.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/google/http/HttpInvokerContentType.java b/wise-api/src/main/java/com/wisemapping/service/google/http/HttpInvokerContentType.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/google/http/HttpInvokerContentType.java rename to wise-api/src/main/java/com/wisemapping/service/google/http/HttpInvokerContentType.java diff --git a/wise-webapp/src/main/java/com/wisemapping/service/google/http/HttpInvokerException.java b/wise-api/src/main/java/com/wisemapping/service/google/http/HttpInvokerException.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/service/google/http/HttpInvokerException.java rename to wise-api/src/main/java/com/wisemapping/service/google/http/HttpInvokerException.java diff --git a/wise-webapp/src/main/java/com/wisemapping/util/TimeUtils.java b/wise-api/src/main/java/com/wisemapping/util/TimeUtils.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/util/TimeUtils.java rename to wise-api/src/main/java/com/wisemapping/util/TimeUtils.java diff --git a/wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineUtils.java b/wise-api/src/main/java/com/wisemapping/util/VelocityEngineUtils.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineUtils.java rename to wise-api/src/main/java/com/wisemapping/util/VelocityEngineUtils.java diff --git a/wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineWrapper.java b/wise-api/src/main/java/com/wisemapping/util/VelocityEngineWrapper.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineWrapper.java rename to wise-api/src/main/java/com/wisemapping/util/VelocityEngineWrapper.java diff --git a/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java b/wise-api/src/main/java/com/wisemapping/util/ZipUtils.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java rename to wise-api/src/main/java/com/wisemapping/util/ZipUtils.java diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/LabelValidator.java b/wise-api/src/main/java/com/wisemapping/validator/LabelValidator.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/validator/LabelValidator.java rename to wise-api/src/main/java/com/wisemapping/validator/LabelValidator.java diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/MapInfoValidator.java b/wise-api/src/main/java/com/wisemapping/validator/MapInfoValidator.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/validator/MapInfoValidator.java rename to wise-api/src/main/java/com/wisemapping/validator/MapInfoValidator.java diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java b/wise-api/src/main/java/com/wisemapping/validator/Messages.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/validator/Messages.java rename to wise-api/src/main/java/com/wisemapping/validator/Messages.java diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java b/wise-api/src/main/java/com/wisemapping/validator/UserValidator.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java rename to wise-api/src/main/java/com/wisemapping/validator/UserValidator.java diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/Utils.java b/wise-api/src/main/java/com/wisemapping/validator/Utils.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/validator/Utils.java rename to wise-api/src/main/java/com/wisemapping/validator/Utils.java diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/ValidatorUtils.java b/wise-api/src/main/java/com/wisemapping/validator/ValidatorUtils.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/validator/ValidatorUtils.java rename to wise-api/src/main/java/com/wisemapping/validator/ValidatorUtils.java diff --git a/wise-webapp/src/main/java/com/wisemapping/view/ChangePasswordBean.java b/wise-api/src/main/java/com/wisemapping/view/ChangePasswordBean.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/view/ChangePasswordBean.java rename to wise-api/src/main/java/com/wisemapping/view/ChangePasswordBean.java diff --git a/wise-webapp/src/main/java/com/wisemapping/view/CollaboratorBean.java b/wise-api/src/main/java/com/wisemapping/view/CollaboratorBean.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/view/CollaboratorBean.java rename to wise-api/src/main/java/com/wisemapping/view/CollaboratorBean.java diff --git a/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java b/wise-api/src/main/java/com/wisemapping/view/MindMapBean.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java rename to wise-api/src/main/java/com/wisemapping/view/MindMapBean.java diff --git a/wise-webapp/src/main/java/com/wisemapping/view/MindMapInfoBean.java b/wise-api/src/main/java/com/wisemapping/view/MindMapInfoBean.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/view/MindMapInfoBean.java rename to wise-api/src/main/java/com/wisemapping/view/MindMapInfoBean.java diff --git a/wise-webapp/src/main/java/com/wisemapping/view/UserBean.java b/wise-api/src/main/java/com/wisemapping/view/UserBean.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/view/UserBean.java rename to wise-api/src/main/java/com/wisemapping/view/UserBean.java diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/ApplicationContextInitializer.java b/wise-api/src/main/java/com/wisemapping/webmvc/ApplicationContextInitializer.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/webmvc/ApplicationContextInitializer.java rename to wise-api/src/main/java/com/wisemapping/webmvc/ApplicationContextInitializer.java diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/MvcLoginController.java b/wise-api/src/main/java/com/wisemapping/webmvc/MvcLoginController.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/webmvc/MvcLoginController.java rename to wise-api/src/main/java/com/wisemapping/webmvc/MvcLoginController.java diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/MvcMindmapController.java b/wise-api/src/main/java/com/wisemapping/webmvc/MvcMindmapController.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/webmvc/MvcMindmapController.java rename to wise-api/src/main/java/com/wisemapping/webmvc/MvcMindmapController.java diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/MvcUsersController.java b/wise-api/src/main/java/com/wisemapping/webmvc/MvcUsersController.java similarity index 100% rename from wise-webapp/src/main/java/com/wisemapping/webmvc/MvcUsersController.java rename to wise-api/src/main/java/com/wisemapping/webmvc/MvcUsersController.java diff --git a/wise-webapp/src/main/resources/Bundle.properties b/wise-api/src/main/resources/Bundle.properties similarity index 100% rename from wise-webapp/src/main/resources/Bundle.properties rename to wise-api/src/main/resources/Bundle.properties diff --git a/wise-webapp/src/main/resources/application.yml b/wise-api/src/main/resources/application.yml similarity index 100% rename from wise-webapp/src/main/resources/application.yml rename to wise-api/src/main/resources/application.yml diff --git a/wise-webapp/src/main/resources/banner.txt b/wise-api/src/main/resources/banner.txt similarity index 100% rename from wise-webapp/src/main/resources/banner.txt rename to wise-api/src/main/resources/banner.txt diff --git a/wise-webapp/src/main/resources/data-hsqldb.sql b/wise-api/src/main/resources/data-hsqldb.sql similarity index 100% rename from wise-webapp/src/main/resources/data-hsqldb.sql rename to wise-api/src/main/resources/data-hsqldb.sql diff --git a/wise-webapp/src/main/resources/ehcache.xml b/wise-api/src/main/resources/ehcache.xml similarity index 100% rename from wise-webapp/src/main/resources/ehcache.xml rename to wise-api/src/main/resources/ehcache.xml diff --git a/wise-webapp/src/main/resources/mail/baseLayout.vm b/wise-api/src/main/resources/mail/baseLayout.vm similarity index 100% rename from wise-webapp/src/main/resources/mail/baseLayout.vm rename to wise-api/src/main/resources/mail/baseLayout.vm diff --git a/wise-webapp/src/main/resources/mail/confirmationMail.vm b/wise-api/src/main/resources/mail/confirmationMail.vm similarity index 100% rename from wise-webapp/src/main/resources/mail/confirmationMail.vm rename to wise-api/src/main/resources/mail/confirmationMail.vm diff --git a/wise-webapp/src/main/resources/mail/newCollaboration.vm b/wise-api/src/main/resources/mail/newCollaboration.vm similarity index 100% rename from wise-webapp/src/main/resources/mail/newCollaboration.vm rename to wise-api/src/main/resources/mail/newCollaboration.vm diff --git a/wise-webapp/src/main/resources/messages.properties b/wise-api/src/main/resources/messages.properties similarity index 100% rename from wise-webapp/src/main/resources/messages.properties rename to wise-api/src/main/resources/messages.properties diff --git a/wise-webapp/src/main/resources/messages_de.properties b/wise-api/src/main/resources/messages_de.properties similarity index 100% rename from wise-webapp/src/main/resources/messages_de.properties rename to wise-api/src/main/resources/messages_de.properties diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-api/src/main/resources/messages_en.properties similarity index 100% rename from wise-webapp/src/main/resources/messages_en.properties rename to wise-api/src/main/resources/messages_en.properties diff --git a/wise-webapp/src/main/resources/messages_es.properties b/wise-api/src/main/resources/messages_es.properties similarity index 100% rename from wise-webapp/src/main/resources/messages_es.properties rename to wise-api/src/main/resources/messages_es.properties diff --git a/wise-webapp/src/main/resources/messages_fr.properties b/wise-api/src/main/resources/messages_fr.properties similarity index 100% rename from wise-webapp/src/main/resources/messages_fr.properties rename to wise-api/src/main/resources/messages_fr.properties diff --git a/wise-webapp/src/main/resources/messages_ru.properties b/wise-api/src/main/resources/messages_ru.properties similarity index 100% rename from wise-webapp/src/main/resources/messages_ru.properties rename to wise-api/src/main/resources/messages_ru.properties diff --git a/wise-webapp/src/main/resources/messages_zh.properties b/wise-api/src/main/resources/messages_zh.properties similarity index 100% rename from wise-webapp/src/main/resources/messages_zh.properties rename to wise-api/src/main/resources/messages_zh.properties diff --git a/wise-webapp/src/main/resources/mindmap.xsd b/wise-api/src/main/resources/mindmap.xsd similarity index 100% rename from wise-webapp/src/main/resources/mindmap.xsd rename to wise-api/src/main/resources/mindmap.xsd diff --git a/wise-webapp/src/main/resources/public/ads.txt b/wise-api/src/main/resources/public/ads.txt similarity index 100% rename from wise-webapp/src/main/resources/public/ads.txt rename to wise-api/src/main/resources/public/ads.txt diff --git a/wise-webapp/src/main/resources/public/css/viewonly.css b/wise-api/src/main/resources/public/css/viewonly.css similarity index 100% rename from wise-webapp/src/main/resources/public/css/viewonly.css rename to wise-api/src/main/resources/public/css/viewonly.css diff --git a/wise-webapp/src/main/resources/public/favicon.ico b/wise-api/src/main/resources/public/favicon.ico similarity index 100% rename from wise-webapp/src/main/resources/public/favicon.ico rename to wise-api/src/main/resources/public/favicon.ico diff --git a/wise-webapp/src/main/resources/public/favicon.png b/wise-api/src/main/resources/public/favicon.png similarity index 100% rename from wise-webapp/src/main/resources/public/favicon.png rename to wise-api/src/main/resources/public/favicon.png diff --git a/wise-webapp/src/main/resources/public/images/add.svg b/wise-api/src/main/resources/public/images/add.svg similarity index 100% rename from wise-webapp/src/main/resources/public/images/add.svg rename to wise-api/src/main/resources/public/images/add.svg diff --git a/wise-webapp/src/main/resources/public/images/center_focus.svg b/wise-api/src/main/resources/public/images/center_focus.svg similarity index 100% rename from wise-webapp/src/main/resources/public/images/center_focus.svg rename to wise-api/src/main/resources/public/images/center_focus.svg diff --git a/wise-webapp/src/main/resources/public/images/logo-icon.png b/wise-api/src/main/resources/public/images/logo-icon.png similarity index 100% rename from wise-webapp/src/main/resources/public/images/logo-icon.png rename to wise-api/src/main/resources/public/images/logo-icon.png diff --git a/wise-webapp/src/main/resources/public/images/logo-icon.svg b/wise-api/src/main/resources/public/images/logo-icon.svg similarity index 100% rename from wise-webapp/src/main/resources/public/images/logo-icon.svg rename to wise-api/src/main/resources/public/images/logo-icon.svg diff --git a/wise-webapp/src/main/resources/public/images/logo-small.png b/wise-api/src/main/resources/public/images/logo-small.png similarity index 100% rename from wise-webapp/src/main/resources/public/images/logo-small.png rename to wise-api/src/main/resources/public/images/logo-small.png diff --git a/wise-webapp/src/main/resources/public/images/logo-text-black.svg b/wise-api/src/main/resources/public/images/logo-text-black.svg similarity index 100% rename from wise-webapp/src/main/resources/public/images/logo-text-black.svg rename to wise-api/src/main/resources/public/images/logo-text-black.svg diff --git a/wise-webapp/src/main/resources/public/images/minus.svg b/wise-api/src/main/resources/public/images/minus.svg similarity index 100% rename from wise-webapp/src/main/resources/public/images/minus.svg rename to wise-api/src/main/resources/public/images/minus.svg diff --git a/wise-webapp/src/main/resources/public/index.html b/wise-api/src/main/resources/public/index.html similarity index 100% rename from wise-webapp/src/main/resources/public/index.html rename to wise-api/src/main/resources/public/index.html diff --git a/wise-webapp/src/main/resources/public/robots.txt b/wise-api/src/main/resources/public/robots.txt similarity index 100% rename from wise-webapp/src/main/resources/public/robots.txt rename to wise-api/src/main/resources/public/robots.txt diff --git a/wise-webapp/src/main/resources/public/static/mindplot b/wise-api/src/main/resources/public/static/mindplot similarity index 100% rename from wise-webapp/src/main/resources/public/static/mindplot rename to wise-api/src/main/resources/public/static/mindplot diff --git a/wise-webapp/src/main/resources/public/static/webapp b/wise-api/src/main/resources/public/static/webapp similarity index 100% rename from wise-webapp/src/main/resources/public/static/webapp rename to wise-api/src/main/resources/public/static/webapp diff --git a/wise-webapp/src/main/resources/samples/tutorial.vm b/wise-api/src/main/resources/samples/tutorial.vm similarity index 100% rename from wise-webapp/src/main/resources/samples/tutorial.vm rename to wise-api/src/main/resources/samples/tutorial.vm diff --git a/wise-webapp/src/main/resources/schema-hsqldb.sql b/wise-api/src/main/resources/schema-hsqldb.sql similarity index 100% rename from wise-webapp/src/main/resources/schema-hsqldb.sql rename to wise-api/src/main/resources/schema-hsqldb.sql diff --git a/wise-webapp/src/main/resources/spring.tld b/wise-api/src/main/resources/spring.tld similarity index 100% rename from wise-webapp/src/main/resources/spring.tld rename to wise-api/src/main/resources/spring.tld diff --git a/wise-webapp/src/main/resources/spring/wisemapping-mail.xml b/wise-api/src/main/resources/spring/wisemapping-mail.xml similarity index 100% rename from wise-webapp/src/main/resources/spring/wisemapping-mail.xml rename to wise-api/src/main/resources/spring/wisemapping-mail.xml diff --git a/wise-webapp/src/main/resources/spring/wisemapping-messages.xml b/wise-api/src/main/resources/spring/wisemapping-messages.xml similarity index 100% rename from wise-webapp/src/main/resources/spring/wisemapping-messages.xml rename to wise-api/src/main/resources/spring/wisemapping-messages.xml diff --git a/wise-webapp/src/main/resources/spring/wisemapping-rest.xml b/wise-api/src/main/resources/spring/wisemapping-rest.xml similarity index 100% rename from wise-webapp/src/main/resources/spring/wisemapping-rest.xml rename to wise-api/src/main/resources/spring/wisemapping-rest.xml diff --git a/wise-webapp/src/main/webapp/WEB-INF/jsp/init.jsp b/wise-api/src/main/webapp/WEB-INF/jsp/init.jsp similarity index 100% rename from wise-webapp/src/main/webapp/WEB-INF/jsp/init.jsp rename to wise-api/src/main/webapp/WEB-INF/jsp/init.jsp diff --git a/wise-webapp/src/main/webapp/WEB-INF/jsp/mindmapEditor.jsp b/wise-api/src/main/webapp/WEB-INF/jsp/mindmapEditor.jsp similarity index 100% rename from wise-webapp/src/main/webapp/WEB-INF/jsp/mindmapEditor.jsp rename to wise-api/src/main/webapp/WEB-INF/jsp/mindmapEditor.jsp diff --git a/wise-webapp/src/main/webapp/WEB-INF/jsp/mindmapViewonly.jsp b/wise-api/src/main/webapp/WEB-INF/jsp/mindmapViewonly.jsp similarity index 100% rename from wise-webapp/src/main/webapp/WEB-INF/jsp/mindmapViewonly.jsp rename to wise-api/src/main/webapp/WEB-INF/jsp/mindmapViewonly.jsp diff --git a/wise-webapp/src/main/webapp/WEB-INF/jsp/pageHeaders.jsf b/wise-api/src/main/webapp/WEB-INF/jsp/pageHeaders.jsf similarity index 100% rename from wise-webapp/src/main/webapp/WEB-INF/jsp/pageHeaders.jsf rename to wise-api/src/main/webapp/WEB-INF/jsp/pageHeaders.jsf diff --git a/wise-webapp/src/main/webapp/WEB-INF/jsp/reactInclude.jsp b/wise-api/src/main/webapp/WEB-INF/jsp/reactInclude.jsp similarity index 100% rename from wise-webapp/src/main/webapp/WEB-INF/jsp/reactInclude.jsp rename to wise-api/src/main/webapp/WEB-INF/jsp/reactInclude.jsp diff --git a/wise-webapp/src/test/java/com/wisemapping/test/rest/RestAccountControllerTest.java b/wise-api/src/test/java/com/wisemapping/test/rest/RestAccountControllerTest.java similarity index 100% rename from wise-webapp/src/test/java/com/wisemapping/test/rest/RestAccountControllerTest.java rename to wise-api/src/test/java/com/wisemapping/test/rest/RestAccountControllerTest.java diff --git a/wise-webapp/src/test/java/com/wisemapping/test/rest/RestHelper.java b/wise-api/src/test/java/com/wisemapping/test/rest/RestHelper.java similarity index 100% rename from wise-webapp/src/test/java/com/wisemapping/test/rest/RestHelper.java rename to wise-api/src/test/java/com/wisemapping/test/rest/RestHelper.java diff --git a/wise-webapp/src/test/java/com/wisemapping/test/rest/RestLabelControllerTest.java b/wise-api/src/test/java/com/wisemapping/test/rest/RestLabelControllerTest.java similarity index 100% rename from wise-webapp/src/test/java/com/wisemapping/test/rest/RestLabelControllerTest.java rename to wise-api/src/test/java/com/wisemapping/test/rest/RestLabelControllerTest.java diff --git a/wise-webapp/src/test/java/com/wisemapping/test/rest/RestMindmapControllerTest.java b/wise-api/src/test/java/com/wisemapping/test/rest/RestMindmapControllerTest.java similarity index 100% rename from wise-webapp/src/test/java/com/wisemapping/test/rest/RestMindmapControllerTest.java rename to wise-api/src/test/java/com/wisemapping/test/rest/RestMindmapControllerTest.java diff --git a/wise-ui/Dockerfile b/wise-ui/Dockerfile new file mode 100644 index 00000000..f5a432a5 --- /dev/null +++ b/wise-ui/Dockerfile @@ -0,0 +1,26 @@ +FROM node:18.12.1-buster-slim AS builder + +# Set the working directory in the container +WORKDIR /app + +ARG VERSION="5.1.2" + +## Install dependencies +RUN mkdir webapp && npm pack @wisemapping/webapp@${VERSION} && tar -xvzf wisemapping-webapp-${VERSION}.tgz -C webapp +RUN mkdir mindplot && npm pack @wisemapping/mindplot@${VERSION} && tar -xvzf wisemapping-mindplot-${VERSION}.tgz -C mindplot +ADD index.html . + +# Use Nginx as the production server +FROM nginx:stable-alpine +LABEL maintainer="Paulo Gustavo Veiga " + +## Copy the built React app to Nginx's web server directory +COPY --from=builder /app /usr/share/nginx/html +COPY --from=builder /app/webapp/package/dist/* /usr/share/nginx/html/webapp/ +COPY --from=builder /app/mindplot/package/dist/* /usr/share/nginx/html/mindplot/ + +# Expose port 80 for the Nginx server +EXPOSE 80 + +# Start Nginx when the container runs +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/wise-ui/index.html b/wise-ui/index.html new file mode 100644 index 00000000..e17927fe --- /dev/null +++ b/wise-ui/index.html @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + +
+ + + + + + diff --git a/wise-ui/pom.xml b/wise-ui/pom.xml index 3353e7c4..89e28f2c 100644 --- a/wise-ui/pom.xml +++ b/wise-ui/pom.xml @@ -58,21 +58,6 @@ - - org.apache.maven.plugins - maven-war-plugin - 3.4.0 - - false - - - target - - wisemapping-*/**/dist/* - - - - diff --git a/wise-webapp/config b/wise-webapp/config deleted file mode 120000 index 40885268..00000000 --- a/wise-webapp/config +++ /dev/null @@ -1 +0,0 @@ -../config/ \ No newline at end of file diff --git a/wise-webapp/webdefault.xml b/wise-webapp/webdefault.xml deleted file mode 100644 index 9cecd06d..00000000 --- a/wise-webapp/webdefault.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - default - org.eclipse.jetty.servlet.DefaultServlet - - aliases - true - - - \ No newline at end of file