vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-09-12 07:10:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Migrate to Tile2.0 removing the dependecy with Struts.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-06-16 14:32:26 -03:00
parent 65db1acf6a
commit 8a638e8de6
8 changed files with 237 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wise-webapp/pom.xml
View File

@ -101,12 +101,6 @@
<version>${org.springframework.version}</version> <version>${org.springframework.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-struts</artifactId>
<version>${org.springframework.version}</version>
<scope>runtime</scope>
</dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
@ -141,16 +135,10 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.struts</groupId> <groupId>org.apache.tiles</groupId>
<artifactId>struts-tiles</artifactId> <artifactId>tiles-jsp</artifactId>
<version>1.3.8</version> <version>2.1.4</version>
<scope>runtime</scope> <scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>

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

@ -1,174 +1,171 @@
<?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE tiles-definitions PUBLIC
"-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
<!DOCTYPE tiles-definitions PUBLIC "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd"> <tiles-definitions>
<tiles-definitions> <definition name="homepage" template="/jsp/homepage.jsp"/>
<definition name="mindmapList" template="/jsp/mindmapList.jsp"/>
<definition name="homepage" page="/jsp/homepage.jsp"/> <definition name="mindmapEmbedded" template="/jsp/mindmapEmbed.jsp"/>
<definition name="mindmapList" page="/jsp/mindmapList.jsp"/> <definition name="mindmapEditor" template="/jsp/mindmapEditor.jsp"/>
<definition name="mindmapEmbedded" page="/jsp/mindmapEmbed.jsp"/> <definition name="mindmapPrint" template="/jsp/mindmapPrint.jsp"/>
<definition name="mindmapEditor" page="/jsp/mindmapEditor.jsp"/>
<definition name="mindmapPrint" page="/jsp/mindmapPrint.jsp"/> <!-- Template Declaration -->
<definition name="pageTemplate" template="/jsp/template.jsp">
<!-- Template Declaration --> <put-attribute name="title" value="" type="string"/>
<definition name="pageTemplate" page="/jsp/template.jsp"> <put-attribute name="details" value="" type="string"/>
<put name="title" value="" type="string"/> <put-attribute name="body" value="/jsp/error.jsp" type="page"/>
<put name="details" value="" type="string"/> </definition>
<put name="body" value="/jsp/error.jsp" type="page"/>
</definition> <definition name="dialogTemplate" template="/jsp/dialogTemplate.jsp">
<put-attribute name="title" value="title" type="string"/>
<definition name="dialogTemplate" page="/jsp/dialogTemplate.jsp"> <put-attribute name="details" value="details" type="string"/>
<put name="title" value="title" type="string"/> <put-attribute name="body" value="/jsp/error.jsp" type="page"/>
<put name="details" value="details" type="string"/> </definition>
<put name="body" value="/jsp/error.jsp" type="page"/>
</definition> <definition name="dialogFullTemplate" template="/jsp/dialogFullTemplate.jsp">
<put-attribute name="title" value="title" type="string"/>
<definition name="dialogFullTemplate" page="/jsp/dialogFullTemplate.jsp"> <put-attribute name="details" value="details" type="string"/>
<put name="title" value="title" type="string"/> <put-attribute name="body" value="/jsp/error.jsp" type="page"/>
<put name="details" value="details" type="string"/> </definition>
<put name="body" value="/jsp/error.jsp" type="page"/>
</definition> <definition name="errorTemplate" extends="pageTemplate">
<put-attribute name="body" value="/jsp/errorTemplate.jsp" type="page"/>
<definition name="errorTemplate" extends="pageTemplate"> </definition>
<put name="body" value="/jsp/errorTemplate.jsp" type="page"/>
</definition> <definition name="iframeWrapper" template="/jsp/iframeWrapper.jsp"/>
<definition name="iframeWrapper" page="/jsp/iframeWrapper.jsp"/> <!-- Error Pages -->
<definition name="gcfPluginNeeded" extends="pageTemplate">
<!-- Error Pages --> <put-attribute name="body" value="/jsp/gcfPluginNeeded.jsp" type="page"/>
<definition name="gcfPluginNeeded" extends="pageTemplate"> <put-attribute name="title" value="INSTALL_CFG"/>
<put name="body" value="/jsp/gcfPluginNeeded.jsp" type="page"/> </definition>
<put name="title" value="INSTALL_CFG"/>
</definition> <definition name="installCFG" extends="pageTemplate">
<put-attribute name="body" value="/jsp/installCFG.jsp" type="page"/>
<definition name="installCFG" extends="pageTemplate"> <put-attribute name="title" value="INSTALL_CFG"/>
<put name="body" value="/jsp/installCFG.jsp" type="page"/> </definition>
<put name="title" value="INSTALL_CFG"/>
</definition> <definition name="unexpectedError" extends="errorTemplate">
<put-attribute name="title" value="UNEXPECTED_ERROR"/>
<definition name="unexpectedError" extends="errorTemplate"> <put-attribute name="details" value="UNEXPECTED_ERROR_DETAILS"/>
<put name="title" value="UNEXPECTED_ERROR"/> </definition>
<put name="details" value="UNEXPECTED_ERROR_DETAILS"/>
</definition> <definition name="securityError" extends="errorTemplate">
<put-attribute name="title" value="NO_ENOUGH_PERMISSIONS"/>
<definition name="securityError" extends="errorTemplate"> <put-attribute name="details" value="NO_ENOUGH_PERMISSIONS_DETAILS"/>
<put name="title" value="NO_ENOUGH_PERMISSIONS"/> </definition>
<put name="details" value="NO_ENOUGH_PERMISSIONS_DETAILS"/>
</definition> <definition name="emailNotExistsError" extends="errorTemplate">
<put-attribute name="title" value="INVALID_EMAIL_ERROR"/>
<definition name="emailNotExistsError" extends="errorTemplate"> <put-attribute name="body" value="/jsp/emailNotExistsError.jsp"/>
<put name="title" value="INVALID_EMAIL_ERROR"/> </definition>
<put name="body" value="/jsp/emailNotExistsError.jsp"/>
</definition> <!-- Main Pages -->
<definition name="forgotPassword" extends="pageTemplate">
<!-- Main Pages --> <put-attribute name="title" value="FORGOT_PASSWORD"/>
<definition name="forgotPassword" extends="pageTemplate"> <put-attribute name="body" value="/jsp/forgotPassword.jsp"/>
<put name="title" value="FORGOT_PASSWORD"/> </definition>
<put name="body" value="/jsp/forgotPassword.jsp"/>
</definition> <definition name="userRegistration" extends="pageTemplate">
<put-attribute name="title" value="USER_REGISTRATION"/>
<definition name="userRegistration" extends="pageTemplate"> <put-attribute name="body" value="/jsp/userRegistration.jsp"/>
<put name="title" value="USER_REGISTRATION"/> </definition>
<put name="body" value="/jsp/userRegistration.jsp"/>
</definition> <definition name="userRegistrationConfirmation" extends="pageTemplate">
<put-attribute name="title" value="USER_REGISTRATION"/>
<definition name="userRegistrationConfirmation" extends="pageTemplate"> <put-attribute name="body" value="/jsp/userRegistrationConfirmation.jsp"/>
<put name="title" value="USER_REGISTRATION"/> </definition>
<put name="body" value="/jsp/userRegistrationConfirmation.jsp"/>
</definition> <definition name="login" extends="pageTemplate">
<put-attribute name="title" value="LOGIN"/>
<definition name="login" extends="pageTemplate"> <put-attribute name="body" value="/jsp/login.jsp"/>
<put name="title" value="LOGIN"/> </definition>
<put name="body" value="/jsp/login.jsp"/>
</definition> <!-- Dialog Forms -->
<!-- Dialog Forms --> <definition name="mindmapDetail" extends="dialogTemplate">
<put-attribute name="title" value="MINDMAP_DETAIL"/>
<definition name="mindmapDetail" extends="dialogTemplate"> <put-attribute name="body" value="/jsp/mindmapDetail.jsp"/>
<put name="title" value="MINDMAP_DETAIL"/> </definition>
<put name="body" value="/jsp/mindmapDetail.jsp"/>
</definition> <definition name="setting" extends="dialogTemplate">
<put-attribute name="title" value="SETTINGS"/>
<definition name="setting" extends="dialogTemplate"> <put-attribute name="details" value="SETTINGS_MSG"/>
<put name="title" value="SETTINGS"/> <put-attribute name="body" value="/jsp/setting.jsp"/>
<put name="details" value="SETTINGS_MSG"/> </definition>
<put name="body" value="/jsp/setting.jsp"/>
</definition> <definition name="editProfile" extends="dialogTemplate">
<put-attribute name="title" value="EDIT_PROFILE"/>
<definition name="editProfile" extends="dialogTemplate"> <put-attribute name="details" value="FIELD_REQUIRED_MSG"/>
<put name="title" value="EDIT_PROFILE"/> <put-attribute name="body" value="/jsp/editProfile.jsp"/>
<put name="details" value="FIELD_REQUIRED_MSG"/> </definition>
<put name="body" value="/jsp/editProfile.jsp"/>
</definition> <definition name="changePassword" extends="dialogTemplate">
<put-attribute name="title" value="CHANGE_PASSWORD"/>
<definition name="changePassword" extends="dialogTemplate"> <put-attribute name="details" value="FIELD_REQUIRED_MSG"/>
<put name="title" value="CHANGE_PASSWORD"/> <put-attribute name="body" value="/jsp/changePassword.jsp"/>
<put name="details" value="FIELD_REQUIRED_MSG"/> </definition>
<put name="body" value="/jsp/changePassword.jsp"/>
</definition> <definition name="mindmapExport" extends="dialogTemplate">
<put-attribute name="title" value=""/>
<definition name="mindmapExport" extends="dialogTemplate"> <put-attribute name="details" value=""/>
<put name="title" value=""/> <put-attribute name="body" value="/jsp/mindmapExport.jsp"/>
<put name="details" value=""/> </definition>
<put name="body" value="/jsp/mindmapExport.jsp"/>
</definition> <definition name="mindmapExportFull" extends="dialogFullTemplate">
<put-attribute name="title" value=""/>
<definition name="mindmapExportFull" extends="dialogFullTemplate"> <put-attribute name="details" value=""/>
<put name="title" value=""/> <put-attribute name="body" value="/jsp/mindmapExport.jsp"/>
<put name="details" value=""/> </definition>
<put name="body" value="/jsp/mindmapExport.jsp"/>
</definition> <definition name="mindmapPublish" extends="dialogTemplate">
<put-attribute name="title" value=""/>
<definition name="mindmapPublish" extends="dialogTemplate"> <put-attribute name="details" value=""/>
<put name="title" value=""/> <put-attribute name="body" value="/jsp/mindmapPublish.jsp"/>
<put name="details" value=""/> </definition>
<put name="body" value="/jsp/mindmapPublish.jsp"/>
</definition> <definition name="mindmapPublishFull" extends="dialogFullTemplate">
<put-attribute name="title" value=""/>
<definition name="mindmapPublishFull" extends="dialogFullTemplate"> <put-attribute name="details" value=""/>
<put name="title" value=""/> <put-attribute name="body" value="/jsp/mindmapPublish.jsp"/>
<put name="details" value=""/> </definition>
<put name="body" value="/jsp/mindmapPublish.jsp"/>
</definition> <definition name="mindmapShare" extends="dialogTemplate">
<put-attribute name="title" value=""/>
<definition name="mindmapShare" extends="dialogTemplate"> <put-attribute name="details" value=""/>
<put name="title" value=""/> <put-attribute name="body" value="/jsp/mindmapShare.jsp"/>
<put name="details" value=""/> </definition>
<put name="body" value="/jsp/mindmapShare.jsp"/>
</definition> <definition name="mindmapShareFull" extends="dialogFullTemplate">
<put-attribute name="title" value=""/>
<definition name="mindmapShareFull" extends="dialogFullTemplate"> <put-attribute name="details" value=""/>
<put name="title" value=""/> <put-attribute name="body" value="/jsp/mindmapShare.jsp"/>
<put name="details" value=""/> </definition>
<put name="body" value="/jsp/mindmapShare.jsp"/>
</definition> <definition name="keyboard" extends="dialogTemplate">
<put-attribute name="title" value="KEYBOARD"/>
<definition name="keyboard" extends="dialogTemplate"> <put-attribute name="details" value="KEYBOARD_MSG"/>
<put name="title" value="KEYBOARD"/> <put-attribute name="body" value="/jsp/keyboard.jsp"/>
<put name="details" value="KEYBOARD_MSG"/> </definition>
<put name="body" value="/jsp/keyboard.jsp"/>
</definition> <definition name="mindmapImport" extends="dialogTemplate">
<put-attribute name="body" value="/jsp/mindmapImport.jsp"/>
<definition name="mindmapImport" extends="dialogTemplate"> </definition>
<put name="body" value="/jsp/mindmapImport.jsp"/>
</definition> <definition name="activationAccountConfirmation" extends="pageTemplate">
<put-attribute name="title" value="ACCOUNT_ACTIVED"/>
<definition name="activationAccountConfirmation" extends="pageTemplate"> <put-attribute name="body" value="/jsp/activationAccountConfirmation.jsp"/>
<put name="title" value="ACCOUNT_ACTIVED"/> </definition>
<put name="body" value="/jsp/activationAccountConfirmation.jsp"/>
</definition> <definition name="activationAccountConfirmationFail" extends="pageTemplate">
<put-attribute name="title" value="ACCOUNT_ACTIVED_FAIL"/>
<definition name="activationAccountConfirmationFail" extends="pageTemplate"> <put-attribute name="body" value="/jsp/activationAccountConfirmationFail.jsp"/>
<put name="title" value="ACCOUNT_ACTIVED_FAIL"/> </definition>
<put name="body" value="/jsp/activationAccountConfirmationFail.jsp"/>
</definition> <definition name="mindmapHistory" extends="dialogTemplate">
<put-attribute name="title" value="HISTORY"/>
<definition name="mindmapHistory" extends="dialogTemplate"> <put-attribute name="details" value="HISTORY_INFO"/>
<put name="title" value="HISTORY"/> <put-attribute name="body" value="/jsp/mindmapHistory.jsp"/>
<put name="details" value="HISTORY_INFO"/> </definition>
<put name="body" value="/jsp/mindmapHistory.jsp"/> </tiles-definitions>
</definition>
</tiles-definitions>

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

@ -33,11 +33,11 @@
</property> </property>
</bean> </bean>
<bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"> <bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
<property name="viewClass" value="org.springframework.web.servlet.view.tiles.TilesJstlView"/> <property name="viewClass" value="org.springframework.web.servlet.view.tiles2.TilesView"/>
</bean> </bean>
<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles.TilesConfigurer"> <bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
<property name="definitions"> <property name="definitions">
<list> <list>
<value>/WEB-INF/defs/definitions.xml</value> <value>/WEB-INF/defs/definitions.xml</value>
@ -76,7 +76,7 @@
<value>/c/keyboard</value> <value>/c/keyboard</value>
<value>/c/renameMap</value> <value>/c/renameMap</value>
<value>/c/embeddedView</value> <value>/c/embeddedView</value>
<value>/c/forgotPassword</value> <value>/c/user/resetPassword</value>
</list> </list>
</property> </property>
</bean> </bean>

42
wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp
View File

@ -1,21 +1,21 @@
<%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %> <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<%@ include file="/jsp/init.jsp" %> <%@ include file="/jsp/init.jsp" %>
<tiles:importAttribute name="title" scope="page"/> <tiles:importAttribute name="title" scope="page"/>
<tiles:importAttribute name="details" scope="page"/> <tiles:importAttribute name="details" scope="page"/>
<html> <html>
<head> <head>
<base href="${pageContext.request.contextPath}/"/> <base href="${pageContext.request.contextPath}/"/>
<meta http-equiv="Content-type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
<script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script> <script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
<script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script> <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css"/> <link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap-responsive.min.css"/> <link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap-responsive.min.css"/>
<body> <body>
<div style="padding-top:20px"> <div style="padding-top:20px">
<tiles:insert name="body"/> <tiles:insertAttribute name="body"/>
</div> </div>
</body> </body>
</html> </html>

19
wise-webapp/src/main/webapp/jsp/dialogTemplate.jsp
View File

@ -1,11 +1,10 @@
<%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %> <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<%@ include file="/jsp/init.jsp" %> <%@ include file="/jsp/init.jsp" %>
<tiles:importAttribute name="title" scope="page"/> <tiles:importAttribute name="title" scope="page"/>
<tiles:importAttribute name="details" scope="page"/> <tiles:importAttribute name="details" scope="page"/>
<div> <div>
<!-- Header can be customized --> <tiles:insertAttribute name="body"/>
<tiles:insert name="body"/>
</div> </div>

52
wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp
View File

@ -1,27 +1,27 @@
<%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %> <!DOCTYPE HTML>
<%@ include file="/jsp/init.jsp" %> <%@ include file="/jsp/init.jsp" %>
<div> <div>
<iframe src='${url}' style="border: 0;width: 100%;height:100%" id="dialogContentIframe"></iframe> <iframe src='${url}' style="border: 0;width: 100%;height:100%" id="dialogContentIframe"></iframe>
<div style="float: right;margin-right: 25px"> <div style="float: right;margin-right: 25px">
<input type="button" class="btn-primary" value="Accept" id="submitBtn"/> <input type="button" class="btn-primary" value="Accept" id="submitBtn"/>
<input type="button" class="btn-secondary" value="Cancel" id="cancelBtn"/> <input type="button" class="btn-secondary" value="Cancel" id="cancelBtn"/>
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$('submitBtn').addEvent('click', function() { $('submitBtn').addEvent('click', function() {
var iframeWindow = $('dialogContentIframe').contentWindow; var iframeWindow = $('dialogContentIframe').contentWindow;
iframeWindow.submitDialogForm(); iframeWindow.submitDialogForm();
if (MooDialog.Request.active) { if (MooDialog.Request.active) {
MooDialog.Request.active.close(); MooDialog.Request.active.close();
} }
}); });
$('cancelBtn').addEvent('click', function() { $('cancelBtn').addEvent('click', function() {
if (MooDialog.Request.active) { if (MooDialog.Request.active) {
MooDialog.Request.active.close(); MooDialog.Request.active.close();
} }
}); });
</script> </script>

2
wise-webapp/src/main/webapp/jsp/login.jsp
View File

@ -55,7 +55,7 @@
</div> </div>
</fieldset> </fieldset>
</form> </form>
<a href="<c:url value="/c/forgotPassword"/>"><spring:message code="FORGOT_PASSWORD"/></a> <a href="<c:url value="/c/user/resetPassword"/>"><spring:message code="FORGOT_PASSWORD"/></a>
</div> </div>
</div> </div>

4
wise-webapp/src/main/webapp/jsp/template.jsp
View File

@ -1,6 +1,6 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<%@page pageEncoding="UTF-8" %> <%@page pageEncoding="UTF-8" %>
<%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %> <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<%@ include file="/jsp/init.jsp" %> <%@ include file="/jsp/init.jsp" %>
<tiles:importAttribute name="title" scope="request"/> <tiles:importAttribute name="title" scope="request"/>
@ -37,7 +37,7 @@
<div class="pageBody"> <div class="pageBody">
<div class="pageBodyContent"> <div class="pageBodyContent">
<tiles:insert name="body"/> <tiles:insertAttribute name="body"/>
</div> </div>
</div> </div>