mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-22 14:17:57 +01:00
- Add missing changes.
This commit is contained in:
Paulo Gustavo Veiga
parent
fb3f9946ae
commit
7b6cae0fd2
@ -94,7 +94,7 @@
|
||||
<filelist dir="${basedir}/src/main/javascript/"
|
||||
files="XMLMindmapSerializerFactory.js"/>
|
||||
<filelist dir="${basedir}/src/main/javascript/" files="PersistenceManager.js"/>
|
||||
<filelist dir="${basedir}/src/main/javascript/" files="DwrPersistenceManager.js"/>
|
||||
<filelist dir="${basedir}/src/main/javascript/" files="RestPersistenceManager.js"/>
|
||||
<filelist dir="${basedir}/src/main/javascript/" files="LocalStorageManager.js"/>
|
||||
<filelist dir="${basedir}/src/main/javascript/" files="EditorProperties.js"/>
|
||||
<filelist dir="${basedir}/src/main/javascript/" files="IconGroup.js"/>
|
||||
|
||||
@ -16,66 +16,40 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
mindplot.DwrPersitenceManager = new Class({
|
||||
mindplot.RESTPersistenceManager = new Class({
|
||||
Extends:mindplot.PersistenceManager,
|
||||
initialize: function() {
|
||||
initialize: function(saveUrl) {
|
||||
this.parent();
|
||||
$assert(saveUrl, "saveUrl can not be null");
|
||||
this.saveUrl = saveUrl;
|
||||
},
|
||||
|
||||
saveMapXml : function(mapId, mapXml, pref, saveHistory, events) {
|
||||
window.MapEditorService.saveMap(mapId, mapXml, pref, saveHistory, {
|
||||
callback:function(response) {
|
||||
if (response.msgCode != "OK") {
|
||||
events.onError(response);
|
||||
} else {
|
||||
events.onSuccess(response);
|
||||
}
|
||||
},
|
||||
|
||||
errorHandler:function(message) {
|
||||
events.onError(message);
|
||||
},
|
||||
verb:"POST",
|
||||
async: true
|
||||
}
|
||||
)
|
||||
},
|
||||
var data = {
|
||||
id:mapId,
|
||||
xml: mapXml,
|
||||
properties: pref
|
||||
};
|
||||
|
||||
loadMapDom : function(mapId) {
|
||||
$assert(mapId, "mapId can not be null");
|
||||
throw "This must be implemented";
|
||||
var request = new Request({
|
||||
url:this.saveUrl + mapId,
|
||||
method: 'put',
|
||||
onSuccess:function(responseText, responseXML) {
|
||||
events.onSuccess();
|
||||
|
||||
// var result = {r:null};
|
||||
// window.MapEditorService.loadMap(mapId, {
|
||||
// callback:function(response) {
|
||||
//
|
||||
// if (response.msgCode == "OK") {
|
||||
// // Explorer Hack with local files ...
|
||||
// var xmlContent = response.content;
|
||||
// var domDocument = core.Utils.createDocumentFromText(xmlContent);
|
||||
// var serializer = mindplot.XMLMindmapSerializerFactory.getSerializerFromDocument(domDocument);
|
||||
// var mindmap = serializer.loadFromDom(domDocument);
|
||||
// mindmap.setId(mapId);
|
||||
//
|
||||
// result.r = mindmap;
|
||||
// } else {
|
||||
// // Handle error message ...
|
||||
// var msg = response.msgDetails;
|
||||
// var monitor = core.ToolbarNotifier.getInstance();
|
||||
// monitor.logFatal("We're sorry, an error has occurred and we can't load your map. Please try again in a few minutes.");
|
||||
//// wLogger.error(msg);
|
||||
// }
|
||||
// },
|
||||
// verb:"GET",
|
||||
// async: false,
|
||||
// errorHandler:function(msg) {
|
||||
// var monitor = core.ToolbarNotifier.getInstance();
|
||||
// monitor.logFatal("We're sorry, an error has occurred and we can't load your map. Please try again in a few minutes.");
|
||||
//// wLogger.error(msg);
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// return result.r;
|
||||
},
|
||||
onException:function(headerName, value) {
|
||||
events.onError();
|
||||
},
|
||||
onFailure:function(xhr) {
|
||||
events.onError();
|
||||
},
|
||||
headers: {"Content-Type":"application/json","Accept":"application/json"},
|
||||
emulation:false,
|
||||
urlEncoded:false
|
||||
});
|
||||
request.put(JSON.encode(data));
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
@ -59,7 +59,7 @@ mindplot.widget.IMenu = new Class({
|
||||
onError: function() {
|
||||
if (saveHistory) {
|
||||
saveElem.setStyle('cursor', 'pointer');
|
||||
$notify("Save could not be completed. Try latter");
|
||||
$notify("Save could not be completed. Try latter.");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@ -40,7 +40,12 @@ function buildDesigner(options) {
|
||||
// Configure default persistence manager ...
|
||||
var persistence;
|
||||
if (options.persistenceManager) {
|
||||
if(options.persistenceManager instanceof String) {
|
||||
persistence = eval("new " + options.persistenceManager + "()");
|
||||
}
|
||||
else {
|
||||
persistence = options.persistenceManager;
|
||||
}
|
||||
|
||||
} else {
|
||||
persistence = new mindplot.LocalStorageManager();
|
||||
|
||||
@ -18,11 +18,9 @@
|
||||
|
||||
package com.wisemapping.model;
|
||||
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import java.io.Serializable;
|
||||
import java.util.*;
|
||||
|
||||
@XmlRootElement(name = "user")
|
||||
public class User
|
||||
extends Collaborator
|
||||
implements Serializable {
|
||||
|
||||
@ -17,12 +17,12 @@ public class AuthenticationProvider implements org.springframework.security.auth
|
||||
|
||||
private PasswordEncoder encoder;
|
||||
|
||||
@Override
|
||||
@Override()
|
||||
public Authentication authenticate(@NotNull final Authentication auth) throws AuthenticationException {
|
||||
|
||||
// All your user authentication needs
|
||||
|
||||
final String email = auth.getName();
|
||||
|
||||
final User user = userManager.getUserBy(email);
|
||||
final String credentials = (String) auth.getCredentials();
|
||||
if (user == null || credentials == null || !encoder.isPasswordValid(user.getPassword(), credentials, null)) {
|
||||
|
||||
@ -2,6 +2,7 @@ package com.wisemapping.test.model;
|
||||
|
||||
|
||||
import com.wisemapping.rest.model.RestMindmap;
|
||||
import com.wisemapping.rest.model.RestUser;
|
||||
import org.codehaus.jackson.map.DeserializationConfig;
|
||||
import org.codehaus.jackson.map.ObjectMapper;
|
||||
import org.testng.annotations.Test;
|
||||
@ -13,10 +14,14 @@ public class JsonTest {
|
||||
|
||||
@Test
|
||||
void deserialize() throws IOException {
|
||||
String json = "{\"id\":\"1\",\"xml\":\"<map name=\\\"1\\\" version=\\\"tango\\\"><topic central=\\\"true\\\" text=\\\"ss\\\" id=\\\"1\\\"/></map>\",\"properties\":\"{\\\"zoom\\\":0.85}\"}";
|
||||
String mapJson = "{\"id\":\"1\",\"xml\":\"<map name=\\\"1\\\" version=\\\"tango\\\"><topic central=\\\"true\\\" text=\\\"ss\\\" id=\\\"1\\\"/></map>\",\"properties\":\"{\\\"zoom\\\":0.85}\"}";
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
final RestMindmap restMindmap = mapper.readValue(json, RestMindmap.class);
|
||||
final RestMindmap restMindmap = mapper.readValue(mapJson, RestMindmap.class);
|
||||
|
||||
String userJson = "{\"username\":\"admin\",\"email\":\"admin@wisemapping.org\",\"tags\":[],\"creationDate\":1329706800000,\"firstname\":\"Wise\",\"lastname\":\"test\",\"password\":\"test\"}";
|
||||
final RestUser restUser = mapper.readValue(userJson, RestUser.class);
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@ activationCode BIGINT NOT NULL,
|
||||
activation_date DATE,
|
||||
allowSendEmail CHAR(1) NOT NULL,
|
||||
FOREIGN KEY(colaborator_id) REFERENCES colaborator(id)
|
||||
) ;
|
||||
);
|
||||
|
||||
CREATE TABLE MINDMAP (
|
||||
id INTEGER NOT NULL IDENTITY,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user