Author: bbrossaud Date: 2010-06-01 16:15:25 +0200 (Tue, 01 Jun 2010) New Revision: 56 Url: http://chorem.org/repositories/revision/bow/56 Log: replace model by a singleton instance Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/java/org/chorem/bow/BowProxy.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/search.jsp Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-06-01 13:39:30 UTC (rev 55) +++ trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-06-01 14:15:25 UTC (rev 56) @@ -20,7 +20,6 @@ */ public class AliasServlet extends HttpServlet { - protected Model model = new Model(); protected String bowUrl = ""; public AliasServlet() throws ArgumentsParserException { @@ -48,7 +47,7 @@ String alias = url.substring(index); if (alias != null && !alias.isEmpty()) { alias = alias.substring(1); - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria(); Bookmark bookmark = proxy.findByCriteria(Bookmark.class, criteria); if (bookmark != null) { Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-06-01 13:39:30 UTC (rev 55) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-06-01 14:15:25 UTC (rev 56) @@ -105,7 +105,7 @@ /* @param url String which contains the bookmark url * @param nameAndTags String which contains the name and the tags of the - bookmark separated by '|' ==> name|tag1 tag2... + * bookmark separated by '|' ==> name|tag1 tag2... * @param user bookmark user * @return null if all fields are not correctly filled * @return Bookmark the website bookmark @@ -155,7 +155,7 @@ if (!tagList.contains(tagsTab[i]) && !tagsTab[i].isEmpty()) { bookmark.addTags(tagsTab[i]); // Added tag for each rank (one tag by rank) } - } else if (!tagsTab[i].isEmpty()){ + } else if (!tagsTab[i].isEmpty()) { bookmark.addTags(tagsTab[i]); } } @@ -165,7 +165,7 @@ public static void addTagsToBookmark(List<String> tagList, Bookmark bookmark) { if (tagList != null && !tagList.isEmpty()) { for (String tag : tagList) { - addTagsToBookmark(tag, bookmark); + addTagsToBookmark(tag, bookmark); } } } Modified: trunk/src/main/java/org/chorem/bow/BowProxy.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-06-01 13:39:30 UTC (rev 55) +++ trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-06-01 14:15:25 UTC (rev 56) @@ -23,6 +23,7 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; //import org.nuiton.wikitty.WikittyServiceCached; +import org.nuiton.wikitty.WikittyServiceCached; import org.nuiton.wikitty.jdbc.WikittyServiceJDBC; /** @@ -52,7 +53,7 @@ protected BowProxy(BowConfig config) { WikittyService ws = new WikittyServiceJDBC(config.getFlatOptions()); // FIXME activate next line, when new wikitty version released ans tested -// ws = new WikittyServiceCached(ws); + ws = new WikittyServiceCached(ws); setWikittyService(ws); } Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-01 13:39:30 UTC (rev 55) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-01 14:15:25 UTC (rev 56) @@ -12,10 +12,8 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Iterator; import java.util.List; -import java.util.Map; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; @@ -47,7 +45,6 @@ public class ControllerServlet extends HttpServlet { private static final Log log = LogFactory.getLog(ControllerServlet.class); - protected Model model = new Model(); protected String version = ""; protected String url = ""; @@ -236,7 +233,7 @@ if (searchLine != null && searchLine.matches("^http://[^ ]*") && !searchLine.contains(" ")) { response.sendRedirect(searchLine); } else { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine); criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria); @@ -253,7 +250,7 @@ String search = request.getParameter("search"); if (search != null) { OpenSearchActions openSearchActions = new OpenSearchActions(); - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); String[] words = search.split("\\s+"); List<String> searchLine = new ArrayList<String>(Arrays.asList(words)); if (search.charAt(search.length() - 1) == ' ') { @@ -286,7 +283,7 @@ throws IOException, ServletException { String bookmarkId = request.getParameter("bookmarkId"); if (bookmarkId != null && !bookmarkId.isEmpty()) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); if (bookmark != null) { int click = bookmark.getClick(); @@ -305,7 +302,7 @@ String searchLine = request.getParameter("searchLine"); Criteria baseCriteria = getBookmarkListCriteriaByUser(user, searchLine); if (type != null && baseCriteria != null && !type.isEmpty()) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); PagedResult result = null; if (type.equals("name")) { Criteria criteria = baseCriteria.addSortAscending(Bookmark.FQ_FIELD_DESCRIPTION); @@ -328,7 +325,7 @@ String type = request.getParameter("type"); Criteria baseCriteria = getBookmarkListCriteriaByUser(user, searchLine); if (type != null && baseCriteria != null && !type.isEmpty()) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); PagedResult result = null; if (type.equals("name")) { Criteria criteria = baseCriteria.addSortDescending(Bookmark.FQ_FIELD_DESCRIPTION); @@ -351,7 +348,7 @@ String name = request.getParameter("name"); String bookmarkId = request.getParameter("bookmarkId"); if (bookmarkId != null && !bookmarkId.isEmpty()) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); if (bookmark != null) { BookmarkActions.updateBookmarkName(bookmark, name); @@ -366,7 +363,7 @@ throws IOException, ServletException { String bookmarkId = request.getParameter("bookmarkId"); if (bookmarkId != null && !bookmarkId.isEmpty()) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); if (bookmark != null) { proxy.delete(bookmarkId); @@ -381,7 +378,7 @@ String tag = request.getParameter("deleteTag"); if (tag != null && bookmarkId != null) { if (!bookmarkId.isEmpty()) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); if (bookmark != null) { bookmark.removeTags(tag); @@ -400,7 +397,7 @@ protected void actionGenerateToken(HttpServletRequest request, HttpServletResponse response, User user, HttpSession session) throws IOException, ServletException, NoSuchAlgorithmException { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, user.getEmail()).criteria(); Token currentToken = proxy.findByCriteria(Token.class, criteria); if (currentToken != null) { @@ -445,7 +442,7 @@ bookmark = BookmarkActions.createBookmark(link, nameAndTags, user); } if (bookmark != null) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); proxy.store(bookmark); // store the bookmark if all is Ok if (log.isDebugEnabled()) { log.debug("Adding URL"); @@ -468,7 +465,7 @@ */ protected User checkPermanentToken(String token) { if (token != null) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = Search.query().eq(Token.FQ_FIELD_TOKEN, token).criteria(); Token DbToken = proxy.findByCriteria(Token.class, criteria); if (DbToken != null) { // check if the token exists @@ -508,7 +505,7 @@ searchLine += " " + tag; } } - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine); criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria); // select all bookmarks by user @@ -550,7 +547,7 @@ request.setAttribute("msgError", error); request.getRequestDispatcher("register.jsp").forward(request, response); } else { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); UserImpl newUser = new UserImpl(); newUser.setPassword(request.getParameter("password")); newUser.setEmail(request.getParameter("email")); @@ -591,7 +588,7 @@ protected void initializeToken(HttpSession session, User login) throws NoSuchAlgorithmException { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, login.getEmail()).criteria(); Token token = proxy.findByCriteria(Token.class, criteria); TokenActions tokenActions = new TokenActions(); @@ -617,7 +614,7 @@ protected User checkLogin(String email, String password) { if (email != null && password != null) { if (!email.isEmpty() && !password.isEmpty()) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, email). eq(User.FQ_FIELD_PASSWORD, password).criteria(); @@ -635,7 +632,7 @@ protected boolean checkRegister(String email, String password) { if (email != null && password != null) { if (!email.isEmpty() && !password.isEmpty()) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, email).criteria(); // retrieve user by user name (email) if (proxy.findByCriteria(User.class, criteria) == null) { @@ -647,7 +644,7 @@ } protected void actionHome(HttpServletRequest request, User user) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = getBookmarkListCriteriaByUser(user, null); if (criteria != null) { Criteria sortCriteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); @@ -683,7 +680,7 @@ while (iter.hasNext()) { FileItem item = (FileItem) iter.next(); if (!item.isFormField()) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); String content = item.getString(); Parser parser = new Parser(content); NodeList list = parser.parse(null); @@ -733,7 +730,7 @@ protected void actionExportBookmarks(HttpServletResponse response, User user) throws IOException { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); List<Bookmark> bookmarks = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); String export = BookmarkActions.getExportHtmlBookmark(bookmarks); @@ -751,7 +748,7 @@ throws IOException { String alias = request.getParameter("alias"); if (alias != null && !alias.isEmpty()) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria(); List<Bookmark> bookmarks = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); if (bookmarks == null || bookmarks.isEmpty()) { @@ -769,7 +766,7 @@ } protected void actionFullText(HttpServletRequest request, User user) { - WikittyProxy proxy = model.getProxy(); + WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = getBookmarkListCriteriaByUser(user, null); PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria); BookmarkActions bookmarkActions = createBookmarkActions(request, result, null); Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-06-01 13:39:30 UTC (rev 55) +++ trunk/src/main/webapp/search.jsp 2010-06-01 14:15:25 UTC (rev 56) @@ -24,6 +24,7 @@ %> <html> + <head> <link rel="stylesheet" type="text/css" href="./css/styles.css" /> <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="<%=url%>bow?action=temporaryXml" /> <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" />