From: Sasha Sherstnev Date: Fri, 20 Dec 2013 08:33:03 +0000 (+0000) Subject: Remove obsolete raw servlets X-Git-Url: http://source.jalview.org/gitweb/?p=proteocache.git;a=commitdiff_plain;h=edf6331132457b721fbf35f61fb9087c61b62f84 Remove obsolete raw servlets --- diff --git a/server/compbio/listeners/ServletDeleteRecord.java b/server/compbio/listeners/ServletDeleteRecord.java deleted file mode 100644 index bd288fb..0000000 --- a/server/compbio/listeners/ServletDeleteRecord.java +++ /dev/null @@ -1,55 +0,0 @@ -package compbio.listeners; - -import java.io.IOException; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import compbio.cassandra.CassandraRemover; -import compbio.statistic.CassandraRequester; - -/** - * Servlet implementation class ServletDeleteRecord - */ -public class ServletDeleteRecord extends HttpServlet { - private static final long serialVersionUID = 1L; - - /**request - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - CassandraRemover cr = new CassandraRemover(); - int numberRemover = 0; - String flagId = request.getParameter("byId"); - String jobId = request.getParameter("id"); - String flagDate = request.getParameter("byDate"); - String date1 = request.getParameter("date1"); - String date2 = request.getParameter("date2"); - String flagIp = request.getParameter("byIp"); - String ip = request.getParameter("ip"); - String flagSeq = request.getParameter("bySequence"); - String seq = request.getParameter("seq"); - if (flagId != null) - numberRemover = cr.RemoveJobById(jobId); - if (flagDate != null) - numberRemover = cr.RemoveJobByDate(date1, date2); - if (flagIp != null) - numberRemover = cr.RemoveJobByIp(ip); - if (flagSeq != null) - numberRemover = cr.RemoveJobBySequence(seq); - request.setAttribute("result", numberRemover); - RequestDispatcher rd = request.getRequestDispatcher("/ReportAboutRemove.jsp"); - rd.forward(request, response); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doGet(request, response); - } - -} diff --git a/server/compbio/listeners/ServletIp.java b/server/compbio/listeners/ServletIp.java deleted file mode 100644 index e229176..0000000 --- a/server/compbio/listeners/ServletIp.java +++ /dev/null @@ -1,44 +0,0 @@ -package compbio.listeners; - -import java.io.IOException; -import java.util.List; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import compbio.cassandra.DataBase; -import compbio.statistic.CassandraRequester; - -/** - * Servlet implementation class ServletIp - */ -public class ServletIp extends HttpServlet { - private static final long serialVersionUID = 1L; - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - final long startTime = System.currentTimeMillis(); - String ip = request.getParameter("ip"); - CassandraRequester cr = new CassandraRequester(); - // List r = cr.readIp(ip); - // request.setAttribute("results", r); - final long endTime = System.currentTimeMillis(); - request.setAttribute("timeExecution", (endTime - startTime)); - request.setAttribute("ip", ip); - RequestDispatcher rd = request.getRequestDispatcher("/FullReportJobsByIp.jsp"); - rd.forward(request, response); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doGet(request, response); - } - -} diff --git a/server/compbio/listeners/ServletJobsByDate.java b/server/compbio/listeners/ServletJobsByDate.java deleted file mode 100644 index fe24750..0000000 --- a/server/compbio/listeners/ServletJobsByDate.java +++ /dev/null @@ -1,59 +0,0 @@ -package compbio.listeners; - -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import compbio.cassandra.DataBase; -import compbio.statistic.CassandraRequester; - -@WebServlet("/ServletJobsByDate") -public class ServletJobsByDate extends HttpServlet { - private static final long serialVersionUID = 1L; - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse - * response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - final long startTime = System.currentTimeMillis(); - String date1 = request.getParameter("data1"); - String date2 = request.getParameter("data2"); - CassandraRequester cr = new CassandraRequester(); - if (null != request.getParameter("option")) { - Calendar cal = Calendar.getInstance(); - date1 = DateFormatYYMMDD(cr.earliestDate()); - date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH); - } - request.setAttribute("data1", date1); - request.setAttribute("data2", date2); -// List res = cr.countJobs(date1, date2); -// request.setAttribute("result", res); - final long endTime = System.currentTimeMillis(); - request.setAttribute("timeExecution", (endTime - startTime)); -// System.out.println ("QueryServlet.doGet: total number of dates = " + res.size()); - request.setAttribute("flag", request.getParameter("option")); - RequestDispatcher rd = request.getRequestDispatcher("/ReportJobsByDate.jsp"); - rd.forward(request, response); - } - - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doGet(request, response); - } - - private String DateFormatYYMMDD(long indate) { - SimpleDateFormat datformat = new SimpleDateFormat("yyyy/MM/dd"); - String dateString = datformat.format(new Date(indate)); - return dateString; - } - -} diff --git a/server/compbio/listeners/ServletJobsByDay.java b/server/compbio/listeners/ServletJobsByDay.java deleted file mode 100644 index 3d2bf4b..0000000 --- a/server/compbio/listeners/ServletJobsByDay.java +++ /dev/null @@ -1,41 +0,0 @@ -package compbio.listeners; - -import java.io.IOException; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import compbio.statistic.CassandraRequester; - -/** - * Servlet implementation class ServletByJobSequence - */ -public class ServletJobsByDay extends HttpServlet { - private static final long serialVersionUID = 1L; - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse - * response) - */ - /* - * protected void doGet(HttpServletRequest request, HttpServletResponse - * response) throws ServletException, IOException { String date = - * request.getParameter("date"); CassandraRequester cr = new - * CassandraRequester(); request.setAttribute("result", - * cr.readJobByDay(date)); request.setAttribute("date", date); - * RequestDispatcher rd = - * request.getRequestDispatcher("/ReportJobsByADay.jsp"); - * rd.forward(request, response); } - */ - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse - * response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doGet(request, response); - } - -} diff --git a/server/compbio/listeners/ServletJobsByIp.java b/server/compbio/listeners/ServletJobsByIp.java deleted file mode 100644 index bff4a5c..0000000 --- a/server/compbio/listeners/ServletJobsByIp.java +++ /dev/null @@ -1,45 +0,0 @@ -package compbio.listeners; - -import java.io.IOException; -import java.util.List; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import compbio.cassandra.DataBase; -import compbio.statistic.CassandraRequester; - -/** - * Servlet implementation class ServletJobsByIp - */ -public class ServletJobsByIp extends HttpServlet { - private static final long serialVersionUID = 1L; - - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - final long startTime = System.currentTimeMillis(); - int counter = Integer.parseInt(request.getParameter("counterIp")); - CassandraRequester cr = new CassandraRequester(); - // List r = cr.readIpByCounter(counter); -// request.setAttribute("results", r); - final long endTime = System.currentTimeMillis(); - request.setAttribute("timeExecution", (endTime - startTime)); - request.setAttribute("counter", counter); - RequestDispatcher rd = request.getRequestDispatcher("/ReportJobsByIp.jsp"); - rd.forward(request, response); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doGet(request, response); - } - -} diff --git a/server/compbio/listeners/ServletLogInfo.java b/server/compbio/listeners/ServletLogInfo.java deleted file mode 100644 index 87c8f92..0000000 --- a/server/compbio/listeners/ServletLogInfo.java +++ /dev/null @@ -1,46 +0,0 @@ -package compbio.listeners; - -import java.io.IOException; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import compbio.statistic.CassandraRequester; - - -/** - * Servlet implementation class LogServlet - */ -@WebServlet("/ServletLogInfo") -public class ServletLogInfo extends HttpServlet { - private static final long serialVersionUID = 1L; - - - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - final long startTime = System.currentTimeMillis(); - String id = request.getParameter("IdJob"); - CassandraRequester cr = new CassandraRequester(); - request.setAttribute("result", cr.readJobLog(id)); - final long endTime = System.currentTimeMillis(); - request.setAttribute("timeExecution", (endTime - startTime)); - request.setAttribute("IdJob", id); - RequestDispatcher rd = request.getRequestDispatcher("/ReportLogInfo.jsp"); - rd.forward(request, response); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doGet(request, response); - } - -} diff --git a/server/compbio/listeners/ServletSequenceProtein.java b/server/compbio/listeners/ServletSequenceProtein.java deleted file mode 100644 index b631bff..0000000 --- a/server/compbio/listeners/ServletSequenceProtein.java +++ /dev/null @@ -1,61 +0,0 @@ -package compbio.listeners; - -import java.io.IOException; -import java.util.List; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import compbio.cassandra.DataBase; -import compbio.statistic.CassandraRequester; - -/** - * Servlet implementation class ProtServlet - */ -@WebServlet("/ServletSequenceProtein") -public class ServletSequenceProtein extends HttpServlet { - private static final long serialVersionUID = 1L; - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse - * response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - final long startTime = System.currentTimeMillis(); - String flag = request.getParameter("protein"); - String prot = request.getParameter("prot"); - String search = request.getParameter("Search"); - int counter = Integer.parseInt(request.getParameter("counterJob")); - CassandraRequester cr = new CassandraRequester(); - if (search.equals("Search counter")) { - // List r = cr.readProteinByCounter(counter); -// request.setAttribute("results", r); - // System.out.println ("Search counter: " + r.size() + " proteins found"); - } else { - // List r = cr.readProteins(prot, flag); - // request.setAttribute("results", r); - // System.out.println ("Search sequence: " + r.size() + " proteins found"); - } - final long endTime = System.currentTimeMillis(); - request.setAttribute("timeExecution", (endTime - startTime)); - request.setAttribute("prot", prot); - request.setAttribute("flag", flag); - request.setAttribute("search", search); - request.setAttribute("counter", counter); - RequestDispatcher rd = request.getRequestDispatcher("/ReportSequenceProtein.jsp"); - rd.forward(request, response); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse - * response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doGet(request, response); - } - -} diff --git a/server/compbio/listeners/ServletTimeExecution.java b/server/compbio/listeners/ServletTimeExecution.java deleted file mode 100644 index 93b3faf..0000000 --- a/server/compbio/listeners/ServletTimeExecution.java +++ /dev/null @@ -1,61 +0,0 @@ -package compbio.listeners; - -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import compbio.statistic.CassandraRequester; - -/** - * Servlet implementation class LengthServlet - */ -@WebServlet("/ServletTimeExecution") -public class ServletTimeExecution extends HttpServlet { - private static final long serialVersionUID = 1L; - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse - * response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - final long startTime = System.currentTimeMillis(); - String date1 = request.getParameter("data1"); - String date2 = request.getParameter("data2"); - CassandraRequester sp = new CassandraRequester(); - if (null != request.getParameter("option")) { - Calendar cal = Calendar.getInstance(); - date1 = DateFormatYYMMDD(sp.earliestDate()); - date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH); - } - request.setAttribute("data1", date1); - request.setAttribute("data2", date2); - request.setAttribute("result", sp.extractExecutionTime(date1, date2)); - request.setAttribute("flag", request.getParameter("option")); - final long endTime = System.currentTimeMillis(); - request.setAttribute("timeExecution", (endTime - startTime)); - RequestDispatcher rd = request.getRequestDispatcher("/ReportTimeExecution.jsp"); - rd.forward(request, response); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse - * response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doGet(request, response); - } - - private String DateFormatYYMMDD(long indate) { - SimpleDateFormat datformat = new SimpleDateFormat("yyyy/MM/dd"); - String dateString = datformat.format(new Date(indate)); - return dateString; - } -}