Author: bbrossaud Date: 2010-05-28 17:09:08 +0200 (Fri, 28 May 2010) New Revision: 43 Url: http://chorem.org/repositories/revision/bow/43 Log: remove debug Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-05-28 15:01:26 UTC (rev 42) +++ trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-05-28 15:09:08 UTC (rev 43) @@ -4,14 +4,11 @@ */ package org.chorem.bow; -import com.sun.tools.javac.resources.version; import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; import org.nuiton.wikitty.Criteria; @@ -24,9 +21,8 @@ */ public class AliasServlet extends HttpServlet { - private static final Log log = LogFactory.getLog(AliasServlet.class); protected Model model = new Model(); - protected String bowUrl = ""; + protected String bowUrl = ""; public AliasServlet() throws ArgumentsParserException { ApplicationConfig config = new ApplicationConfig(); Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-28 15:01:26 UTC (rev 42) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-28 15:09:08 UTC (rev 43) @@ -646,7 +646,7 @@ return true; } - private void actionHome(HttpServletRequest request, User user) { + protected void actionHome(HttpServletRequest request, User user) { WikittyProxy proxy = model.getProxy(); Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). addSortDescending(Bookmark.FQ_FIELD_CLICK); @@ -666,7 +666,7 @@ request.setAttribute("bookmarkActions", bookmarkActions); } - private void actionImportBookmarks(HttpServletRequest request, HttpServletResponse response, User user) + protected void actionImportBookmarks(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, FileUploadException, ParserException { // Check that we have a file upload request boolean isMultipart = ServletFileUpload.isMultipartContent(request); @@ -695,7 +695,7 @@ response.sendRedirect("bow?action=home"); } - private void parseHtmlToBookmarks(NodeList list, User user, List<Bookmark> bookmarks) + protected void parseHtmlToBookmarks(NodeList list, User user, List<Bookmark> bookmarks) throws ParserException { if (list != null) { SimpleNodeIterator it = list.elements(); @@ -720,7 +720,7 @@ } } - private void actionExportBookmarks(HttpServletResponse response, User user) + protected void actionExportBookmarks(HttpServletResponse response, User user) throws IOException { WikittyProxy proxy = model.getProxy(); Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); @@ -736,7 +736,7 @@ op.close(); } - private void actionAddAlias(HttpServletRequest request, HttpServletResponse response) + protected void actionAddAlias(HttpServletRequest request, HttpServletResponse response) throws IOException { String alias = request.getParameter("alias"); if (alias != null && !alias.isEmpty()) {