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

Login Migrated to MVC 3.0

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-06-16 17:03:17 -03:00
parent 7d6b82c626
commit ea2bff60f7
6 changed files with 60 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/webapp/WEB-INF/web.xml
View File

@@ -90,8 +90,8 @@
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>
<!--/WEB-INF/wisemapping-servlet.xml-->
/WEB-INF/wisemapping-nservlet.xml
/WEB-INF/wisemapping-servlet.xml
</param-value>
</init-param>

7
wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml
View File

@@ -15,6 +15,7 @@
<context:annotation-config/>
<mvc:annotation-driven/>
<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="/WEB-INF/app.properties"/>
</bean>
@@ -60,6 +61,12 @@
<property name="includeNoscript" value="false"/>
</bean>
<bean id="multipartResolver"
class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
<!-- one of the properties available; the maximum file size in bytes -->
<property name="maxUploadSize" value="522240"/>
</bean>
<bean id="browserSupportInterceptor" class="com.wisemapping.filter.BrowserSupportInterceptor">
<property name="exclude">
<list>

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

@@ -3,37 +3,7 @@
<beans>
<bean id="paramResolverByAction"
class="org.springframework.web.servlet.mvc.multiaction.ParameterMethodNameResolver">
<property name="paramName" value="action"/>
</bean>
<bean id="paramResolverByAction2"
class="org.springframework.web.servlet.mvc.multiaction.ParameterMethodNameResolver">
<property name="paramName" value="actionId"/>
</bean>
<!--<bean id="localeResolver"-->
<!--class="org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver">-->
<!--</bean>-->
<bean id="homeResolver" class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver">
<property name="mappings">
<props>
<prop key="try">tryEditor</prop>
<prop key="installCFG">installCFG</prop>
</props>
</property>
</bean>
<bean id="loginController" class="com.wisemapping.controller.LoginController">
<property name="methodNameResolver" ref="paramResolverByAction"/>
<property name="mindmapService" ref="mindmapService"/>
<property name="userService" ref="userService"/>
<property name="driver" value="${database.driver}"/>
</bean>
<bean id="userValidator" class="com.wisemapping.validator.UserValidator">
<bean id="userValidator" class="com.wisemapping.validator.UserValidator">
<property name="userService" ref="userService"/>
<property name="captchaService" ref="reCaptcha"/>
</bean>
@@ -88,19 +58,6 @@
<property name="userService" ref="userService"/>
</bean>
<bean id="historyController" class="com.wisemapping.controller.HistoryController">
<property name="methodNameResolver" ref="paramResolverByAction"/>
<property name="mindmapService" ref="mindmapService"/>
<property name="userService" ref="userService"/>
</bean>
<bean id="multipartResolver"
class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
<!-- one of the properties available; the maximum file size in bytes -->
<property name="maxUploadSize" value="522240"/>
</bean>
<bean id="activationController" class="com.wisemapping.controller.ActivationController">
<property name="userService" ref="userService"/>
</bean>
@@ -121,7 +78,6 @@
<prop key="changePassword">changePasswordController</prop>
<prop key="settings">settingsController</prop>
<prop key="editProfile">editProfileController</prop>
<prop key="history">historyController</prop>
</props>
</property>
</bean>