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

- Remove .htm

Browse Source 
- Keep working on export.
This commit is contained in:
Paulo Gustavo Veiga
2012-06-03 11:16:38 -03:00
parent 71793c38b8
commit f52a75ac79
62 changed files with 398 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wise-webapp/src/main/java/com/wisemapping/controller/HistoryController.java
View File

@@ -60,11 +60,11 @@ public class HistoryController
String goToMindmapList = request.getParameter("goToMindmapList");
if (goToMindmapList != null)
{
redirectionTo.append("mymaps.htm");
redirectionTo.append("maps/");
}
else
{
redirectionTo.append("editor.htm?mapId=");
redirectionTo.append("editor?mapId=");
redirectionTo.append(map.getId());
redirectionTo.append("&action=open");
}

2
wise-webapp/src/main/java/com/wisemapping/controller/ImportController.java
View File

@@ -57,7 +57,7 @@ public class ImportController
final MindmapService mindmapService = this.getMindmapService();
mindmapService.addMindmap(mindMap, user);
final StringBuilder redirectionTo = new StringBuilder("redirect:" + mindMap.getId() + "/edit.htm");
final StringBuilder redirectionTo = new StringBuilder("redirect:" + mindMap.getId() + "/edit");
return new ModelAndView(redirectionTo.toString());
}

4
wise-webapp/src/main/java/com/wisemapping/controller/LoginController.java
View File

@@ -38,7 +38,7 @@ public class LoginController
ModelAndView result;
if (user != null) {
result = new ModelAndView("forward:/c/mymaps.htm");
result = new ModelAndView("forward:/c/maps/");
} else {
result = new ModelAndView("login");
@@ -59,7 +59,7 @@ public class LoginController
userLogin.setEmail(username);
//userManager.auditLogin(userLogin);
return new ModelAndView("forward:/c/mymaps.htm");
return new ModelAndView("forward:/c/maps/");
}
public void setDriver(String driver) {

2
wise-webapp/src/main/java/com/wisemapping/controller/MindmapCooker.java
View File

@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse;
import com.wisemapping.model.MindMap;
/**
* Usage: http://localhost:8080/wisemapping/c/cooker.htm?action=edit&mapId=12
* Usage: http://localhost:8080/wisemapping/c/cooker?action=edit&mapId=12
*/
public class MindmapCooker extends BaseMultiActionController {

2
wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java
View File

@@ -34,7 +34,7 @@ public class MindmapEditorController extends BaseMultiActionController {
public static final String MAP_XML_PARAM = "mapXml";
public ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
return new ModelAndView(new RedirectView("mymaps.htm"));
return new ModelAndView(new RedirectView("maps/"));
}
public ModelAndView open(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {

4
wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java
View File

@@ -25,7 +25,9 @@ public enum ExportFormat {
JPEG("image/jpeg", "jpg"),
PNG("image/png", "png"),
PDF("application/pdf", "pdf"),
FREEMIND("application/freemind", "mm");
FREEMIND("application/freemind", "mm"),
WISEMAPPING("application/wisemapping+xml", "wxml");
private String contentType;
private String fileExtension;

2
wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java
View File

@@ -270,7 +270,7 @@ public class UserAgent implements Serializable {
/**
* All known robot user-agent headers (list can be found
* <a href="http://www.robotstxt.org/wc/active.html">here</a>).
* <a href="http://www.robotstxt.org/wc/activel">here</a>).
* <p/>
* <p>NOTE: To avoid bad detection:</p>
* <p/>

1
wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java
View File

@@ -28,7 +28,6 @@ import org.springframework.web.servlet.ModelAndView;
import java.io.IOException;
@Controller
@RequestMapping("/c/")
public class ExtensionsController {
@Autowired
private MindmapService mindmapService;

24
wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java
View File

@@ -22,17 +22,22 @@ import java.util.ArrayList;
import java.util.List;
@Controller
@RequestMapping("/c/")
public class MindmapController {
@Autowired
private MindmapService mindmapService;
@RequestMapping(value = "maps/{id}/export")
public ModelAndView export(@PathVariable int id) throws IOException {
public ModelAndView showExportPage(@PathVariable int id) throws IOException {
final MindMapBean modelObject = findMindmapBean(id);
return new ModelAndView("mindmapExport", "mindmap", modelObject);
}
@RequestMapping(value = "maps/{id}/exportf")
public ModelAndView showExportPageFull(@PathVariable int id) throws IOException {
final MindMapBean modelObject = findMindmapBean(id);
return new ModelAndView("mindmapExportFull", "mindmap", modelObject);
}
@RequestMapping(value = "maps/{id}/details")
public ModelAndView showDetails(@PathVariable int id) {
final MindMapBean modelObject = findMindmapBean(id);
@@ -47,6 +52,18 @@ public class MindmapController {
return new ModelAndView("mindmapPrint", "mindmap", mindmap);
}
@RequestMapping(value = "maps/{id}/share")
public ModelAndView showSharePage(@PathVariable int id) {
final MindMap mindmap = findMindmap(id);
return new ModelAndView("mindmapShare", "mindmap", mindmap);
}
@RequestMapping(value = "maps/{id}/sharef")
public ModelAndView showSharePageFull(@PathVariable int id) {
final MindMap mindmap = findMindmap(id);
return new ModelAndView("mindmapShareFull", "mindmap", mindmap);
}
@RequestMapping(value = "maps/{id}/publish")
public ModelAndView showPublishPage(@PathVariable int id) {
final MindMap mindmap = findMindmap(id);
@@ -59,6 +76,7 @@ public class MindmapController {
return new ModelAndView("mindmapPublishFull", "mindmap", mindmap);
}
@RequestMapping(value = "maps/{id}/edit")
public ModelAndView editMap(@PathVariable int id, @NotNull HttpServletRequest request) {
ModelAndView view;
@@ -99,7 +117,7 @@ public class MindmapController {
return new ModelAndView("mindmapDetail", "wisemapDetail", new MindMapBean(mindmap));
}
@RequestMapping(value = "mymaps")
@RequestMapping(value = "maps/")
public ModelAndView list(@NotNull HttpServletRequest request) {
final HttpSession session = request.getSession(false);

1
wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java
View File

@@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.ModelAndView;
@Controller
@RequestMapping("/c/")
public class PublicPagesController {
@Autowired
private MindmapService mindmapService;

78
wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
View File

@@ -20,6 +20,7 @@ package com.wisemapping.rest;
import com.wisemapping.exceptions.WiseMappingException;
import com.wisemapping.exporter.ExportFormat;
import com.wisemapping.model.MindMap;
import com.wisemapping.model.MindmapUser;
import com.wisemapping.model.User;
@@ -30,6 +31,7 @@ import com.wisemapping.security.Utils;
import com.wisemapping.service.MindmapService;
import com.wisemapping.validator.MapInfoValidator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller;
@@ -38,11 +40,10 @@ import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.*;
@Controller
@@ -50,17 +51,43 @@ public class MindmapController extends BaseController {
@Autowired
private MindmapService mindmapService;
@RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/json", "text/html", "application/xml"})
@RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/json", "application/xml", "text/html"})
@ResponseBody
public ModelAndView getMindmap(@PathVariable int id) throws IOException {
public ModelAndView retrieve(@PathVariable int id) throws IOException {
final User user = com.wisemapping.security.Utils.getUser();
final MindMap mindMap = mindmapService.getMindmapById(id);
final RestMindmap map = new RestMindmap(mindMap, user);
return new ModelAndView("mapView", "map", map);
}
@RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/wisemapping+xml"}, params = {"download=wxml"})
@ResponseBody
public ModelAndView retrieveAsWise(@PathVariable int id) throws IOException {
final MindMap mindMap = mindmapService.getMindmapById(id);
final Map<String, Object> values = new HashMap<String, Object>();
final User user = com.wisemapping.security.Utils.getUser();
values.put("mindmap", new RestMindmap(mindMap, user));
values.put("filename", mindMap.getTitle());
return new ModelAndView("transformViewWise", values);
}
@RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/freemind"}, params = {"download=mm"})
@ResponseBody
public ModelAndView retrieveDocumentAsFreemind(@PathVariable int id) throws IOException {
final MindMap mindMap = mindmapService.getMindmapById(id);
final Map<String, Object> values = new HashMap<String, Object>();
values.put("content", mindMap.getXmlStr());
values.put("filename", mindMap.getTitle());
return new ModelAndView("transformViewFreemind", values);
}
@RequestMapping(method = RequestMethod.GET, value = "/maps", produces = {"application/json", "text/html", "application/xml"})
public ModelAndView getMindmaps(@RequestParam(required = false) String q) throws IOException {
public ModelAndView retrieveList(@RequestParam(required = false) String q) throws IOException {
final User user = com.wisemapping.security.Utils.getUser();
final MindmapFilter filter = MindmapFilter.parse(q);
@@ -99,7 +126,7 @@ public class MindmapController extends BaseController {
mindMap.setXmlStr(xml);
// Update map ...
updateMindmap(minor, mindMap, user);
saveMindmap(minor, mindMap, user);
}
@@ -108,7 +135,7 @@ public class MindmapController extends BaseController {
*/
@RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}", consumes = {"application/xml", "application/json"}, produces = {"application/json", "text/html", "application/xml"})
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updateMap(@RequestBody RestMindmap restMindmap, @PathVariable int id, @RequestParam(required = false) boolean minor) throws IOException, WiseMappingException {
public void update(@RequestBody RestMindmap restMindmap, @PathVariable int id, @RequestParam(required = false) boolean minor) throws IOException, WiseMappingException {
final MindMap mindMap = mindmapService.getMindmapById(id);
final User user = Utils.getUser();
@@ -144,7 +171,7 @@ public class MindmapController extends BaseController {
}
// Update map ...
updateMindmap(minor, mindMap, user);
saveMindmap(minor, mindMap, user);
}
private ValidationException buildValidationException(@NotNull String fieldName, @NotNull String message) throws ValidationException {
@@ -156,7 +183,7 @@ public class MindmapController extends BaseController {
@RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/title", consumes = {"text/plain"}, produces = {"application/json", "text/html", "application/xml"})
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updateMapTitle(@RequestBody String title, @PathVariable int id) throws WiseMappingException {
public void updateTitle(@RequestBody String title, @PathVariable int id) throws WiseMappingException {
final MindMap mindMap = mindmapService.getMindmapById(id);
final User user = Utils.getUser();
@@ -170,12 +197,12 @@ public class MindmapController extends BaseController {
// Update map ...
final MindMap mindmap = mindmapService.getMindmapById(id);
mindmap.setTitle(title);
updateMindmap(true, mindMap, user);
saveMindmap(true, mindMap, user);
}
@RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/description", consumes = {"text/plain"}, produces = {"application/json", "text/html", "application/xml"})
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updateMapDescription(@RequestBody String description, @PathVariable int id) throws WiseMappingException {
public void updateDescription(@RequestBody String description, @PathVariable int id) throws WiseMappingException {
final MindMap mindMap = mindmapService.getMindmapById(id);
final User user = Utils.getUser();
@@ -183,7 +210,7 @@ public class MindmapController extends BaseController {
// Update map ...
final MindMap mindmap = mindmapService.getMindmapById(id);
mindmap.setDescription(description);
updateMindmap(true, mindMap, user);
saveMindmap(true, mindMap, user);
}
@RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/publish", consumes = {"text/plain"}, produces = {"application/json", "text/html", "application/xml"})
@@ -199,7 +226,7 @@ public class MindmapController extends BaseController {
// Update map status ...
mindMap.setPublic(Boolean.parseBoolean(value));
updateMindmap(true, mindMap, user);
saveMindmap(true, mindMap, user);
}
@@ -212,7 +239,7 @@ public class MindmapController extends BaseController {
// Update map status ...
mindMap.setStarred(user, Boolean.parseBoolean(value));
updateMindmap(true, mindMap, user);
saveMindmap(true, mindMap, user);
}
@RequestMapping(method = RequestMethod.DELETE, value = "/maps/{id}")
@@ -234,23 +261,7 @@ public class MindmapController extends BaseController {
}
}
@RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/xml", consumes = {"application/xml"}, produces = {"application/json", "text/html", "application/xml"})
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updateMapXml(@RequestBody String xml, @PathVariable int id, @RequestParam(required = false) boolean minor) throws IOException, WiseMappingException {
final MindMap mindMap = mindmapService.getMindmapById(id);
final User user = Utils.getUser();
if (xml == null || xml.isEmpty()) {
throw new IllegalArgumentException("Map xml can not be null");
}
mindMap.setXmlStr(xml);
// Update map ...
updateMindmap(minor, mindMap, user);
}
private void updateMindmap(boolean minor, @NotNull final MindMap mindMap, @NotNull final User user) throws WiseMappingException {
private void saveMindmap(boolean minor, @NotNull final MindMap mindMap, @NotNull final User user) throws WiseMappingException {
final Calendar now = Calendar.getInstance();
mindMap.setLastModificationTime(now);
mindMap.setLastModifierUser(user.getUsername());
@@ -290,7 +301,7 @@ public class MindmapController extends BaseController {
@RequestMapping(method = RequestMethod.POST, value = "/maps/{id}", consumes = {"application/xml", "application/json"})
@ResponseStatus(value = HttpStatus.CREATED)
public void copyMap(@RequestBody RestMindmapInfo restMindmap, @PathVariable int id, @NotNull HttpServletResponse response) throws IOException, WiseMappingException {
public void createDuplicate(@RequestBody RestMindmapInfo restMindmap, @PathVariable int id, @NotNull HttpServletResponse response) throws IOException, WiseMappingException {
// Validate ...
final BindingResult result = new BeanPropertyBindingResult(restMindmap, "");
new MapInfoValidator(mindmapService).validate(restMindmap.getDelegated(), result);
@@ -315,5 +326,4 @@ public class MindmapController extends BaseController {
response.setHeader("Location", "/service/maps/" + clonedMap.getId());
response.setHeader("ResourceId", Integer.toString(clonedMap.getId()));
}
}

15
wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java
View File

@@ -99,21 +99,8 @@ public class TransformerController extends BaseController {
return new ModelAndView("transformViewFreemind", values);
}
@RequestMapping(method = RequestMethod.POST, value = "/transform", produces = {"application/wisemapping+xml"}, consumes = {"application/freemind"})
@ResponseBody
public ModelAndView transformWisemapping(@RequestBody @Nullable final String content) throws IOException {
final Map<String, Object> values = new HashMap<String, Object>();
if (content == null || content.length() == 0) {
throw new IllegalArgumentException("Body can not be null.");
}
values.put("content", content);
return new ModelAndView("transformViewWise", values);
}
@RequestMapping(method = RequestMethod.POST, value = "/transform", consumes = {"application/x-www-form-urlencoded"})
public ModelAndView transform(@NotNull HttpServletRequest request,
@NotNull HttpServletResponse response) throws IOException {
public ModelAndView transform(@NotNull HttpServletRequest request) throws IOException {
final String svg = request.getParameter(PARAM_SVG_XML);
final String mapXml = request.getParameter(PARAM_WISE_MAP_XML);
final String filename = request.getParameter(PARAM_FILENAME);

11
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java
View File

@@ -8,9 +8,7 @@ import org.codehaus.jackson.annotate.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.*;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -105,6 +103,7 @@ public class RestMindmap {
return mindmap.getXmlStr();
}
public void setXml(@Nullable String xml) throws IOException {
if (xml != null)
@@ -127,10 +126,14 @@ public class RestMindmap {
mindmap.setDescription(description);
}
public void setOwner(User owner) {
public void setOwner(String owner) {
}
public String getOwner() {
return mindmap.getOwner().getEmail();
}
public void setCreator(String creatorUser) {
}

10
wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java
View File

@@ -22,19 +22,25 @@ import com.wisemapping.exporter.ExportFormat;
import com.wisemapping.exporter.ExportProperties;
import com.wisemapping.exporter.ExporterFactory;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.oxm.jaxb.Jaxb2Marshaller;
import org.springframework.web.servlet.view.AbstractView;
import javax.servlet.ServletContext;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.transform.stream.StreamResult;
import java.io.ByteArrayOutputStream;
import java.nio.charset.Charset;
import java.util.Map;
public class TransformView extends AbstractView {
private String contentType;
private ExportFormat exportFormat;
@Autowired
private Jaxb2Marshaller jaxbMarshaller;
public TransformView(@NotNull final String contentType) {
this.contentType = contentType;
@@ -75,6 +81,10 @@ public class TransformView extends AbstractView {
final ServletOutputStream outputStream = response.getOutputStream();
if (exportFormat == ExportFormat.FREEMIND) {
ExporterFactory.export(properties, content, outputStream, null);
} else if (exportFormat == ExportFormat.WISEMAPPING) {
final Object mindmap = viewMap.get("mindmap");
StreamResult result = new StreamResult(outputStream);
jaxbMarshaller.marshal(mindmap, result);
} else {
ExporterFactory.export(properties, null, outputStream, content);
}

2
wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
View File

@@ -92,7 +92,7 @@ public class MindmapServiceImpl
return mindmapManager.getMindmapById(mindmapId);
}
public List<MindmapUser> getMindmapUserByUser(User user) {
public List<MindmapUser> getMindmapUserByUser(@NotNull User user) {
return mindmapManager.getMindmapUserByCollaborator(user.getId());
}

2
wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
View File

@@ -129,7 +129,7 @@ public class UserServiceImpl
model.put("user", user);
final String activationUrl = "http://wisemapping.com/c/activation.htm?code=" + user.getActivationCode();
final String activationUrl = "http://wisemapping.com/c/activation?code=" + user.getActivationCode();
logger.info("create User - acrivationUrl: " + activationUrl);
model.put("emailcheck", activationUrl);
mailer.sendEmail(mailer.getRegistrationEmail(), user.getEmail(), "Welcome to Wisemapping!", model,