zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix major update integrating with external wisemapping frond end

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2021-12-24 18:03:23 -08:00
parent 76ff1cc83d
commit b3e26caee4
1042 changed files with 1160 additions and 73432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wise-webapp/src/main/webapp/WEB-INF/app.properties
View File

@@ -124,7 +124,6 @@ security.ldap.server=ldap://localhost:389
# If anonymous password is required, change the wisemapping-security-ldap.xml removing the
security.ldap.server.user=cn=pveiga,dc=wisemapping,dc=com
security.ldap.server.password=password
security.ldap.basedn=dc=wisemapping,dc=com
@@ -146,17 +145,5 @@ documentation.services.basePath=http://localhost:8080/service
documentation.services.version=3.0.1
# OAuth2 Security
#spring.security.oauth2.client.registration.google.client-id=<your client id>
#spring.security.oauth2.client.registration.google.client-secret=<your client secret>
#spring.security.oauth2.client.registration.facebook.client-id=<your client id>
#spring.security.oauth2.client.registration.facebook.client-secret=<your client secret>

8
wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
View File

@@ -1,7 +1,7 @@
log4j.rootLogger=TRACE, stdout, R
log4j.logger.com.wisemapping=TRACE,stdout,R
log4j.logger.org.springframework=TRACE,stdout,R
log4j.logger.org.hibernate.engine.internal.StatefulPersistenceContext=ERROR,stdout,R
log4j.rootLogger=DEBUG, stdout, R
log4j.logger.com.wisemapping=DEBUG,R
log4j.logger.org.springframework=DEBUG,R
log4j.logger.org.hibernate.engine.internal.StatefulPersistenceContext=ERROR,R
# Stdout logger <20>
log4j.appender.stdout=org.apache.log4j.ConsoleAppender

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

@@ -1,15 +1,16 @@
<!DOCTYPE tiles-definitions PUBLIC
"-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
"http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<tiles-definitions>
<definition name="homepage" template="/jsp/homepage.jsp"/>
<definition name="mindmapList" template="/jsp/mindmapList.jsp"/>
<definition name="mindmapEmbedded" template="/jsp/mindmapEmbed.jsp"/>
<definition name="mindmapEditor" template="/jsp/mindmapEditor.jsp"/>
<definition name="mindmapPrint" template="/jsp/mindmapPrint.jsp"/>
<definition name="login" template="/jsp/reactInclude.jsp"/>
<definition name="registration" template="/jsp/reactInclude.jsp"/>
<definition name="forgot-password" template="/jsp/reactInclude.jsp"/>
<definition name="mindmapList" template="/jsp/reactInclude.jsp"/>
<!-- Template Declaration -->
<definition name="pageTemplate" template="/jsp/template.jsp">
@@ -18,24 +19,11 @@
<put-attribute name="body" value="/jsp/error.jsp" type="page"/>
</definition>
<definition name="dialogTemplate" template="/jsp/dialogTemplate.jsp">
<put-attribute name="title" value="title" type="string"/>
<put-attribute name="details" value="details" type="string"/>
<put-attribute name="body" value="/jsp/error.jsp" type="page"/>
</definition>
<definition name="dialogFullTemplate" template="/jsp/dialogFullTemplate.jsp">
<put-attribute name="title" value="title" type="string"/>
<put-attribute name="details" value="details" type="string"/>
<put-attribute name="body" value="/jsp/error.jsp" type="page"/>
</definition>
<definition name="errorTemplate" extends="pageTemplate">
<put-attribute name="body" value="/jsp/errorTemplate.jsp"/>
</definition>
<definition name="iframeWrapper" template="/jsp/iframeWrapper.jsp"/>
<!-- Error Pages -->
<definition name="unexpectedError" extends="errorTemplate">
<put-attribute name="title" value="UNEXPECTED_ERROR"/>
@@ -48,135 +36,4 @@
<put-attribute name="details" value="NO_ENOUGH_PERMISSIONS_DETAILS"/>
</definition>
<definition name="forgotPasswordError" extends="errorTemplate">
<put-attribute name="title" value="INVALID_EMAIL_ERROR"/>
<put-attribute name="body" value="/jsp/userForgotPasswordError.jsp"/>
</definition>
<definition name="forgotPasswordSuccess" extends="errorTemplate">
<put-attribute name="title" value="FORGOT_PASSWORD"/>
<put-attribute name="body" value="/jsp/userForgotPasswordSuccess.jsp"/>
</definition>
<definition name="login" extends="pageTemplate">
<put-attribute name="title" value="LOGIN"/>
<put-attribute name="body" value="/jsp/login.jsp"/>
<put-attribute name="removeSignin" value="true"/>
</definition>
<definition name="termsOfUse" extends="pageTemplate">
<put-attribute name="title" value="TERM_OF_USE"/>
<put-attribute name="body" value="/jsp/termsOfUse.jsp"/>
</definition>
<definition name="forgotPassword" extends="pageTemplate">
<put-attribute name="title" value="FORGOT_PASSWORD"/>
<put-attribute name="body" value="/jsp/userForgotPassword.jsp"/>
</definition>
<definition name="userRegistration" extends="pageTemplate">
<put-attribute name="title" value="USER_REGISTRATION"/>
<put-attribute name="body" value="/jsp/userRegistration.jsp"/>
</definition>
<definition name="userRegistrationSuccess" extends="pageTemplate">
<put-attribute name="title" value="USER_REGISTRATION"/>
<put-attribute name="body" value="/jsp/userRegistrationSuccess.jsp"/>
</definition>
<definition name="userRegistrationSuccess" extends="pageTemplate">
<put-attribute name="title" value="USER_REGISTRATION"/>
<put-attribute name="body" value="/jsp/userRegistrationSuccess.jsp"/>
</definition>
<definition name="browserNotSupported" extends="pageTemplate">
<put-attribute name="title" value="BROWSER_NOT_SUPPORTED_TITLE"/>
<put-attribute name="body" value="/jsp/browserNotSupported.jsp"/>
</definition>
<!-- Dialog Forms -->
<definition name="mindmapDetail" extends="dialogTemplate">
<put-attribute name="title" value="MINDMAP_DETAIL"/>
<put-attribute name="body" value="/jsp/mindmapDetail.jsp"/>
</definition>
<definition name="accountSettings" extends="dialogTemplate">
<put-attribute name="title" value="SETTINGS"/>
<put-attribute name="body" value="/jsp/accountSettings.jsp"/>
</definition>
<definition name="editProfile" extends="dialogTemplate">
<put-attribute name="title" value="EDIT_PROFILE"/>
<put-attribute name="details" value="FIELD_REQUIRED_MSG"/>
<put-attribute name="body" value="/jsp/editProfile.jsp"/>
</definition>
<definition name="mindmapExport" extends="dialogTemplate">
<put-attribute name="title" value=""/>
<put-attribute name="details" value=""/>
<put-attribute name="body" value="/jsp/mindmapExport.jsp"/>
</definition>
<definition name="mindmapExportFull" extends="dialogFullTemplate">
<put-attribute name="title" value=""/>
<put-attribute name="details" value=""/>
<put-attribute name="body" value="/jsp/mindmapExport.jsp"/>
</definition>
<definition name="mindmapPublish" extends="dialogTemplate">
<put-attribute name="title" value=""/>
<put-attribute name="details" value=""/>
<put-attribute name="body" value="/jsp/mindmapPublish.jsp"/>
</definition>
<definition name="mindmapPublishFull" extends="dialogFullTemplate">
<put-attribute name="title" value=""/>
<put-attribute name="details" value=""/>
<put-attribute name="body" value="/jsp/mindmapPublish.jsp"/>
</definition>
<definition name="mindmapShare" extends="dialogTemplate">
<put-attribute name="title" value=""/>
<put-attribute name="details" value=""/>
<put-attribute name="body" value="/jsp/mindmapShare.jsp"/>
</definition>
<definition name="mindmapShareFull" extends="dialogFullTemplate">
<put-attribute name="title" value=""/>
<put-attribute name="details" value=""/>
<put-attribute name="body" value="/jsp/mindmapShare.jsp"/>
</definition>
<definition name="mindmapImport" extends="dialogTemplate">
<put-attribute name="body" value="/jsp/mindmapImport.jsp"/>
</definition>
<definition name="mindmapHistory" extends="dialogTemplate">
<put-attribute name="title" value="HISTORY"/>
<put-attribute name="details" value="HISTORY_INFO"/>
<put-attribute name="body" value="/jsp/mindmapHistory.jsp"/>
</definition>
<definition name="mindmapHistoryFull" extends="dialogFullTemplate">
<put-attribute name="title" value="HISTORY"/>
<put-attribute name="details" value="HISTORY_INFO"/>
<put-attribute name="body" value="/jsp/mindmapHistory.jsp"/>
</definition>
<definition name="activationAccountConfirmation" extends="pageTemplate">
<put-attribute name="title" value="ACCOUNT_ACTIVED"/>
<put-attribute name="body" value="/jsp/activationAccountConfirmation.jsp"/>
</definition>
<definition name="activationAccountConfirmationFail" extends="pageTemplate">
<put-attribute name="title" value="ACCOUNT_ACTIVED_FAIL"/>
<put-attribute name="body" value="/jsp/activationAccountConfirmationFail.jsp"/>
</definition>
<definition name="keyboard" extends="dialogTemplate">
<put-attribute name="title" value="KEYBOARD"/>
<put-attribute name="details" value="KEYBOARD_MSG"/>
<put-attribute name="body" value="/jsp/mindmapEditorKeyboard.jsp"/>
</definition>
</tiles-definitions>

5
wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml
View File

@@ -46,6 +46,7 @@
<value>com.wisemapping.rest.model.RestLockInfo</value>
<value>com.wisemapping.rest.model.RestLabel</value>
<value>com.wisemapping.rest.model.RestLabelList</value>
<value>com.wisemapping.rest.model.RestUserRegistration</value>
</list>
</property>
</bean>
@@ -152,10 +153,6 @@
</list>
</property>
</bean>
<!-- Configuration Bean -->
<context:property-placeholder location="/WEB-INF/app.properties" ignore-unresolvable="true"/>
<bean id="documentationConfig" class="com.mangofactory.swagger.configuration.DocumentationConfig"/>
<!-- Custom extensibility module (bean) Has override methods to customize the document generation-->
<!--<bean id="extensibilityModule" class="com.mangofactory.swagger.springmvc.example.config.ExampleExtensibilityModule" />-->
</beans>

23
wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
View File

@@ -8,15 +8,17 @@
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd">
<sec:http pattern="/static/webapp/**" security="none"/>
<sec:http pattern="/static/mindplot/**" security="none"/>
<sec:http pattern="/c/login" security="none"/>
<sec:http pattern="/c/registration" security="none"/>
<sec:http pattern="/c/forgot-password" security="none"/>
<sec:http pattern="/css/**" security="none"/>
<sec:http pattern="/js/**" security="none"/>
<sec:http pattern="/images/**" security="none"/>
<sec:http pattern="/icons/**" security="none"/>
<sec:http pattern="/favicon.ico" security="none"/>
<sec:http pattern="/c/login" security="none"/>
<sec:http pattern="/c/user/registration" security="none"/>
<sec:http pattern="/c/user/resetPassword" security="none"/>
<sec:http pattern="/c/home" security="none"/>
<sec:http pattern="/c/maps/*/embed" security="none"/>
@@ -32,13 +34,21 @@
<sec:http pattern="/c/activation" security="none"/>
<sec:http pattern="/c/try" security="none"/>
<!-- Admin related services that required admin role-->
<sec:http use-expressions="true" create-session="stateless" pattern="/service/**">
<sec:csrf disabled="true"/>
<!-- Enabled only for cors -->
<sec:intercept-url pattern="/service/users" method="OPTIONS" access="permitAll"/>
<sec:intercept-url pattern="/service/users/resetPassword" method="OPTIONS" access="permitAll"/>
<sec:intercept-url pattern="/service/users/" method="POST" access="permitAll"/>
<sec:intercept-url pattern="/service/users/resetPassword" method="PUT" access="permitAll"/>
<sec:intercept-url pattern="/service/admin/users/**" access="isAuthenticated() and hasRole('ROLE_ADMIN')"/>
<sec:intercept-url pattern="/service/admin/database/**" access="isAuthenticated() and hasRole('ROLE_ADMIN')"/>
<sec:intercept-url pattern="/service/**" access="isAuthenticated() and hasRole('ROLE_USER')"/>
<sec:http-basic/>
</sec:http>
@@ -56,7 +66,8 @@
authentication-failure-url="/c/login?login_error=2"
login-processing-url="/c/perform-login"/>
<sec:remember-me key="wisemapping-hashed-key"/>
<!-- Expire in 28 days -->
<sec:remember-me token-validity-seconds="2419200" remember-me-parameter="remember-me"/>
<sec:logout logout-url="/c/logout" invalidate-session="true" logout-success-url="/c/login"/>
</sec:http>

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

@@ -18,24 +18,6 @@
<!-- Interceptors Registration -->
<mvc:interceptors>
<bean id="browserSupportInterceptor" class="com.wisemapping.filter.BrowserSupportInterceptor">
<property name="exclude">
<set>
<value>/</value>
<value>/index.jsp</value>
<value>/c/home</value>
<value>/c/j_spring_security</value>
<value>/c/login</value>
<value>/c/GCFInstall</value>
<value>/service/</value>
<value>/c/maps/*/embed</value>
<value>/c/maps/*/public</value>
<value>/c/embeddedView</value>
<value>/c/user/resetPassword</value>
<value>/c/user/registration</value>
</set>
</property>
</bean>
<bean id="userLocaleInterceptor" class="com.wisemapping.filter.UserLocaleInterceptor"/>
<bean id="requestInterceptor" class="com.wisemapping.filter.RequestPropertiesInterceptor"/>
@@ -47,24 +29,27 @@
</bean>
</mvc:interceptors>
<bean id="exceptionHandlerResolver"
class="com.wisemapping.mail.NotifyingExceptionResolver">
<property name="defaultStatusCode" value="500"/>
<property name="defaultErrorView" value="unexpectedError"/>
<property name="exceptionMappings">
<props>
<prop key="com.wisemapping.exceptions.UnsupportedBrowserException">browserNotSupported</prop>
<prop key="com.wisemapping.exceptions.GoogleChromeFrameRequiredException">GCFPluginRequired</prop>
<!-- Security exceptions are wrapped in this exceptions -->
<prop key="java.lang.reflect.UndeclaredThrowableException">securityError</prop>
</props>
</property>
<property name="statusCodes">
<props>
<!-- Handle missing found pages. Avoid generation of errors -->
<prop key="securityError">200</prop>
</props>
</property>
<property name="exclude">
<set>
<value>java.lang.reflect.UndeclaredThrowableException</value>
<value>com.wisemapping.exceptions.GoogleChromeFrameRequiredException</value>
<value>com.wisemapping.exceptions.UnsupportedBrowserException</value>
</set>
</property>
<property name="notificationService" ref="notificationService"/>