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

Update to HSQLDB driver

Browse Source 
Remove DWR
Remove native SVG tables
Add new REST services for persistence.
This commit is contained in:
Paulo Gustavo Veiga
2012-02-21 14:22:43 -03:00
parent 89f7fd8d3c
commit fb3f9946ae
58 changed files with 419 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@
# HSQL Configuration properties
database.url=jdbc:hsqldb:file:target/db/wisemapping
database.driver=org.hsqldb.jdbcDriver
database.driver=org.hsqldb.jdbc.JDBCDriver
database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
database.username=sa
database.password=

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

@@ -1,8 +1,7 @@
log4j.rootLogger=WARN, stdout, R
log4j.logger.net.sf=FATAL,stdout, R
log4j.logger.com.wisemapping=WARN,stdout,R
log4j.logger.org.springframework=WARN,stdout,R
log4j.logger.org.codehaus.jackson=WARN,stdout,R
# Stdout logger <20>
log4j.appender.stdout=org.apache.log4j.ConsoleAppender

17
wise-webapp/src/main/webapp/WEB-INF/dwr.xml
View File

@@ -1,17 +0,0 @@
<!DOCTYPE dwr PUBLIC "-//GetAhead Limited//DTD Direct Web Remoting 2.0//EN" "http://getahead.org/dwr//dwr20.dtd">
<dwr>
<allow>
<create creator="spring" javascript="MapEditorService">
<param name="beanName" value="mapEditorService"/>
<include method="saveMap"/>
<include method="loadMap"/>
</create>
<create creator="spring" javascript="LoggerService">
<param name="beanName" value="loggerService"/>
<include method="logError"/>
</create>
<convert converter="bean" match="com.wisemapping.dwr.ResponseMessage"/>
</allow>
</dwr>

11
wise-webapp/src/main/webapp/WEB-INF/jsp-rest/responseView.jsp Normal file
View File

@@ -0,0 +1,11 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<h1>Message: ${message}</h1>
<br/>
</body>
</html>

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

@@ -110,15 +110,6 @@
</servlet>
<servlet>
<servlet-name>dwr-invoker</servlet-name>
<servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
<init-param>
<param-name>debug</param-name>
<param-value>true</param-value>
</init-param>
</servlet>
<servlet-mapping>
<servlet-name>mvc-servlet</servlet-name>
<url-pattern>*.htm</url-pattern>
@@ -129,11 +120,6 @@
<url-pattern>/service/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>dwr-invoker</servlet-name>
<url-pattern>/dwr/*</url-pattern>
</servlet-mapping>
<welcome-file-list>
<welcome-file>
index.jsp

3
wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml
View File

@@ -24,11 +24,10 @@
<property name="dataSource" ref="wiseDataSource"/>
<property name="mappingResources">
<list>
<value>com/wisemapping/model/Colaborator.hbm.xml</value>
<value>com/wisemapping/model/Collaborator.hbm.xml</value>
<value>com/wisemapping/model/MindMap.hbm.xml</value>
<value>com/wisemapping/model/MindmapUser.hbm.xml</value>
<value>com/wisemapping/model/UserLogin.hbm.xml</value>
<value>com/wisemapping/model/MindmapNative.hbm.xml</value>
<value>com/wisemapping/model/MindMapHistory.hbm.xml</value>
</list>
</property>

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

@@ -20,6 +20,7 @@
<list>
<value>com.wisemapping.rest.model.RestMindmap</value>
<value>com.wisemapping.rest.model.RestMindmapList</value>
<value>com.wisemapping.rest.model.RestUser</value>
</list>
</property>
</bean>

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

@@ -14,6 +14,7 @@
<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.htm" security="none"/>
<sec:http pattern="/c/userregistration.htm" security="none"/>
@@ -26,12 +27,10 @@
<sec:http pattern="/c/embeddedview.htm" security="none"/>
<sec:http pattern="/c/export.htm" security="none"/>
<sec:http pattern="/c/publicview.htm" security="none"/>
<sec:http pattern="/dwr/engine.js" security="none"/>
<sec:http pattern="/dwr/interface/loggerservice.js" security="none"/>
<sec:http pattern="/dwr/call/plaincall/loggerservice.logerror.dwr" security="none"/>
<sec:http pattern="/service/transform.*" security="none"/>
<sec:http use-expressions="true" create-session="never" pattern="/service/**">
<sec:http use-expressions="true" create-session="never" pattern="/service/**">
<sec:intercept-url pattern="/service/admin/users/**" access="isAuthenticated() and hasRole('ROLE_ADMIN')"/>
<sec:intercept-url pattern="/service/**" access="isAuthenticated()"/>
<sec:http-basic/>
</sec:http>

18
wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml
View File

@@ -40,24 +40,6 @@
<property name="target" ref="mindMapServiceTarget"/>
</bean>
<bean id="mapEditorService" class="com.wisemapping.dwr.MapEditorService">
<property name="mindmapService">
<ref local="mindmapService"/>
</property>
<property name="userService">
<ref local="userService"/>
</property>
</bean>
<bean id="loggerService" class="com.wisemapping.dwr.JavaScriptErrorLoggerService">
<property name="mindmapService">
<ref local="mindmapService"/>
</property>
<property name="userService">
<ref local="userService"/>
</property>
</bean>
<bean id="smtpAuthenticator" class="com.wisemapping.mail.SmtpAuthenticator">
<constructor-arg value="${mail.user}"/>
<constructor-arg value="${mail.password}"/>

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

@@ -13,7 +13,7 @@
Native XML:
</td>
<td>
<textarea name="nativeXml" id="xml" rows="20" cols="70">${mindmap.nativeXml}</textarea>
<textarea name="xml" id="xml" rows="20" cols="70">${mindmap.xml}</textarea>
</td>
</tr>
<tr>

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

@@ -33,7 +33,7 @@
// Configure designer options ...
var options = loadDesignerOptions();
options.persistenceManager = "mindplot.DwrPersitenceManager";
options.persistenceManager = new mindplot.RESTPersistenceManager("service/maps/");
var userOptions = ${mindmap.properties};
options.zoom = userOptions.zoom;