move jsp for reports to a separate dir

diff --git a/server/compbio/controllers/DailyStatisticsController.java b/server/compbio/controllers/DailyStatisticsController.java
index 403c220..9cdf874 100644 (file)
--- a/server/compbio/controllers/DailyStatisticsController.java
+++ b/server/compbio/controllers/DailyStatisticsController.java
@@ -19,7 +19,6 @@ import compbio.beans.Total;
 import compbio.cassandra.readers.CassandraReader;
 import compbio.cassandra.readers.DailyStatisticsReader;
 
-
 /**
  * @author Alexander Sherstnev
  * @author Natasha Sherstneva
@@ -116,7 +115,7 @@ public class DailyStatisticsController extends BasicController {
                final long endTime = System.currentTimeMillis();
                model.put("timeExecution", (endTime - startTime));
                model.put("option", option);
-               return "/reportJobStatistics";
+               return "reports/JobStatistics";
        }
 
        /**
@@ -149,7 +148,7 @@ public class DailyStatisticsController extends BasicController {
                        realdate = date;
                        thetime = formaterDDMMYY.parse(realdate).getTime();
                }
-               
+
                if (null == JobStatus.getJobStatus(status)) {
                        return "support/Notimplemented";
                }
@@ -164,6 +163,6 @@ public class DailyStatisticsController extends BasicController {
                model.put("status", status);
                final long endTime = System.currentTimeMillis();
                model.put("timeExecution", (endTime - startTime));
-               return "/reportJobStatisticsOneDay";
+               return "reports/JobStatisticsOneDay";
        }
 }

diff --git a/server/compbio/controllers/DatabaseController.java b/server/compbio/controllers/DatabaseController.java
index ee0c9b9..609ee09 100644 (file)
--- a/server/compbio/controllers/DatabaseController.java
+++ b/server/compbio/controllers/DatabaseController.java
@@ -58,7 +58,7 @@ public class DatabaseController extends BasicController {
                if (flagSeq != null)
                        numberRemover = cr.RemoveJobBySequence(seq);
                model.put("result", numberRemover);
-               return "reportRemoveData";
+               return "reports/RemoveDBrecords";
        }
 
        @RequestMapping(value = "/database/remove/go", method = RequestMethod.GET)

diff --git a/server/compbio/controllers/IPDataController.java b/server/compbio/controllers/IPDataController.java
index d66b7cc..248389a 100644 (file)
--- a/server/compbio/controllers/IPDataController.java
+++ b/server/compbio/controllers/IPDataController.java
@@ -78,7 +78,7 @@ public class IPDataController extends BasicController {
                final long endTime = System.currentTimeMillis();
                model.put("timeExecution", (endTime - startTime));
                model.put("counter", realcounter);
-               return "reportIPstatistics";
+               return "reports/IPstatistics";
        }
 
        @RequestMapping(value = "/admin/ip/results", method = RequestMethod.GET)
@@ -95,6 +95,6 @@ public class IPDataController extends BasicController {
                final long endTime = System.currentTimeMillis();
                model.put("timeExecution", (endTime - startTime));
                model.put("ip", ip);
-               return "reportIP";
+               return "reports/IP";
        }
 }

diff --git a/server/compbio/controllers/JobController.java b/server/compbio/controllers/JobController.java
index 49a12ad..264a5d1 100644 (file)
--- a/server/compbio/controllers/JobController.java
+++ b/server/compbio/controllers/JobController.java
@@ -111,7 +111,7 @@ public class JobController extends BasicController {
                model.put("ndays", res.size() - 1);
                final long endTime = System.currentTimeMillis();
                model.put("timeExecution", (endTime - startTime));
-               return "/reportTimeExecution";
+               return "/reports/TimeExecution";
        }
 
        /**
@@ -139,7 +139,7 @@ public class JobController extends BasicController {
                        log.error("JobController.prepareJobArchiveToWeb: IO exception with job archive file");
                        log.error(e.getLocalizedMessage(), e.getCause());
                }
-               return "reportJobLog";
+               return "reports/Job";
        }
 
        /**

diff --git a/server/compbio/controllers/ProteomeController.java b/server/compbio/controllers/ProteomeController.java
index 5974493..d5a8c85 100644 (file)
--- a/server/compbio/controllers/ProteomeController.java
+++ b/server/compbio/controllers/ProteomeController.java
@@ -86,7 +86,7 @@ public class ProteomeController extends BasicController {
                model.put("timeExecution", (endTime - startTime));
                model.put("feature", typeFeature);
                model.put("percent", realpercent);
-               return "reportSSFeatures";
+               return "reports/SSFeatures";
        }
 
 }

diff --git a/server/compbio/controllers/SSFeaturesController.java b/server/compbio/controllers/SSFeaturesController.java
index ba81cab..34eed80 100644 (file)
--- a/server/compbio/controllers/SSFeaturesController.java
+++ b/server/compbio/controllers/SSFeaturesController.java
@@ -87,7 +87,7 @@ public class SSFeaturesController extends BasicController {
                model.put("timeExecution", (endTime - startTime));
                model.put("feature", typeFeature);
                model.put("percent", realpercent);
-               return "reportSSFeatures";
+               return "reports/SSFeatures";
        }
 
 }

diff --git a/server/compbio/controllers/SequenceController.java b/server/compbio/controllers/SequenceController.java
index 76903f8..6db97ef 100644 (file)
--- a/server/compbio/controllers/SequenceController.java
+++ b/server/compbio/controllers/SequenceController.java
@@ -36,7 +36,7 @@ public class SequenceController extends BasicController {
 
        /**
         * form a query page for search protein sequence. The servlet should be
-        * available for users and admins only. 
+        * available for users and admins only.
         * 
         * @param model
         *            MVC model
@@ -50,8 +50,8 @@ public class SequenceController extends BasicController {
        }
 
        /**
-        * form a query page for statistics: Protein by job count. The servlet should be
-        * available for users and admins only. 
+        * form a query page for statistics: Protein by job count. The servlet
+        * should be available for users and admins only.
         * 
         * @param model
         *            MVC model
@@ -72,7 +72,8 @@ public class SequenceController extends BasicController {
         * @param sequence
         *            protein sequence or part of sequence
         * @param searchtype
-        *            defined whether the whole sequence or part of sequence would be searched
+        *            defined whether the whole sequence or part of sequence would
+        *            be searched
         * @return link to the report JSP page
         */
        @RequestMapping(value = "sequence/results", method = RequestMethod.GET)
@@ -126,7 +127,7 @@ public class SequenceController extends BasicController {
 
                final long endTime = System.currentTimeMillis();
                model.put("timeExecution", (endTime - startTime));
-               return "reportProteinSequences";
+               return "reports/Sequences";
        }
 
        /**
@@ -135,7 +136,7 @@ public class SequenceController extends BasicController {
         * @param model
         *            MVC model object
         * @param counter
-        *           
+        * 
         * @return link to the report JSP page
         */
        @RequestMapping(value = "counts/results", method = RequestMethod.GET)
@@ -164,7 +165,6 @@ public class SequenceController extends BasicController {
                        return "query/SequenceCounts";
                }
 
-
                ReaderByCounter reader = new ReaderByCounter();
                List<TotalByCounterBean> r = reader.readProteinByCounter(realcounter);
                model.put("results", r);
@@ -192,7 +192,7 @@ public class SequenceController extends BasicController {
                final long endTime = System.currentTimeMillis();
                model.put("timeExecution", (endTime - startTime));
                model.put("counter", realcounter);
-               return "reportProteinSequencesCounter";
+               return "reports/SequencesStatistics";
        }
 
 }

diff --git a/webapp/view/reportIP.jsp b/webapp/view/reports/IP.jsp
similarity index 95%
rename from webapp/view/reportIP.jsp
rename to webapp/view/reports/IP.jsp
index 529defc..83f0f30 100644 (file)
--- a/webapp/view/reportIP.jsp
+++ b/webapp/view/reports/IP.jsp
@@ -6,10 +6,10 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
 <html>
-<jsp:include page="fragments/header.jsp" />
+<jsp:include page="../fragments/header.jsp" />
 <body>
        <div class="container">
-               <jsp:include page="fragments/mainmenu.jsp" />
+               <jsp:include page="../fragments/mainmenu.jsp" />
                <spring:url value="/job/results" var="jobqueryservlet" />
 
                <c:set var="csv" value="\'Job ID\', \'Date\', \'Sequence\'"/>
@@ -98,7 +98,7 @@
        </div>
        </div>
 
-               <jsp:include page="fragments/footer.jsp" />
+               <jsp:include page="../fragments/footer.jsp" />
        </div>
 </body>
 </html>
\ No newline at end of file

diff --git a/webapp/view/reportIPstatistics.jsp b/webapp/view/reports/IPstatistics.jsp
similarity index 92%
rename from webapp/view/reportIPstatistics.jsp
rename to webapp/view/reports/IPstatistics.jsp
index 2214e5e..d0f90f4 100644 (file)
--- a/webapp/view/reportIPstatistics.jsp
+++ b/webapp/view/reports/IPstatistics.jsp
@@ -7,10 +7,10 @@
 <%@page import="java.util.ArrayList"%>
 
 <html>
-<jsp:include page="fragments/header.jsp" />
+<jsp:include page="../fragments/header.jsp" />
 <body>
        <div class="container">
-               <jsp:include page="fragments/mainmenu.jsp" />
+               <jsp:include page="../fragments/mainmenu.jsp" />
                <spring:url value="/admin/ip/results" var="ipquery" />
                <spring:url value="/admin/ip/counts/results?JobCounter=${counter}" var="the_query"/>
 
@@ -62,7 +62,7 @@
        </div>
        </div>
 
-               <jsp:include page="fragments/footer.jsp" />
+               <jsp:include page="../fragments/footer.jsp" />
        </div>
 </body>
 </html>
\ No newline at end of file

diff --git a/webapp/view/reportJobLog.jsp b/webapp/view/reports/Job.jsp
similarity index 92%
rename from webapp/view/reportJobLog.jsp
rename to webapp/view/reports/Job.jsp
index 115f9af..64d7896 100644 (file)
--- a/webapp/view/reportJobLog.jsp
+++ b/webapp/view/reports/Job.jsp
@@ -7,10 +7,10 @@
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
 
 <html>
-<jsp:include page="fragments/header.jsp" />
+<jsp:include page="../fragments/header.jsp" />
 <body>
        <div class="container">
-               <jsp:include page="fragments/mainmenu.jsp" />
+               <jsp:include page="../fragments/mainmenu.jsp" />
                <spring:url value="/sequence/sequence/results" var="sequence_query" />
                <spring:url value="/admin/ip/results" var="ip_query" />
 
@@ -55,7 +55,7 @@
                </div>
                </div>
 
-               <jsp:include page="fragments/footer.jsp" />
+               <jsp:include page="../fragments/footer.jsp" />
        </div>
 </body>
 </html>
\ No newline at end of file

diff --git a/webapp/view/reportJobStatistics.jsp b/webapp/view/reports/JobStatistics.jsp
similarity index 96%
rename from webapp/view/reportJobStatistics.jsp
rename to webapp/view/reports/JobStatistics.jsp
index 09a3a87..883bbb0 100644 (file)
--- a/webapp/view/reportJobStatistics.jsp
+++ b/webapp/view/reports/JobStatistics.jsp
@@ -6,10 +6,10 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
 <html>
-<jsp:include page="fragments/header.jsp" />
+<jsp:include page="../fragments/header.jsp" />
 <body>
        <div class="container">
-               <jsp:include page="fragments/mainmenu.jsp" />
+               <jsp:include page="../fragments/mainmenu.jsp" />
                <spring:url value="/stat/jobsoneday/results" var="oneday_query" />
                <spring:url value="/stat/jobsdaily/results?date1=${date1}&date2=${date2}&option=${option}" var="the_query" />
 
@@ -105,7 +105,7 @@
        </div>
        </div>
 
-               <jsp:include page="fragments/footer.jsp" />
+               <jsp:include page="../fragments/footer.jsp" />
        </div>
 </body>
 </html>
\ No newline at end of file

diff --git a/webapp/view/reportJobStatisticsOneDay.jsp b/webapp/view/reports/JobStatisticsOneDay.jsp
similarity index 93%
rename from webapp/view/reportJobStatisticsOneDay.jsp
rename to webapp/view/reports/JobStatisticsOneDay.jsp
index 23af0ac..0ac72a1 100644 (file)
--- a/webapp/view/reportJobStatisticsOneDay.jsp
+++ b/webapp/view/reports/JobStatisticsOneDay.jsp
@@ -6,10 +6,10 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
 <html>
-<jsp:include page="fragments/header.jsp" />
+<jsp:include page="../fragments/header.jsp" />
 <body>
        <div class="container">
-               <jsp:include page="fragments/mainmenu.jsp" />
+               <jsp:include page="../fragments/mainmenu.jsp" />
                <spring:url value="/job/results" var="job_query" />
                <spring:url value="/stat/onedaystat?date=${date}&status=${status}" var="the_query" />
                <spring:url value="/sequence/sequence/results" var="sequence_query" />
@@ -70,7 +70,7 @@
        </div>
        </div>
 
-       <jsp:include page="fragments/footer.jsp" />
+       <jsp:include page="../fragments/footer.jsp" />
        </div>
 </body>
 </html>
\ No newline at end of file

diff --git a/webapp/view/ReportAboutRemove.jsp b/webapp/view/reports/RemoveDBrecords.jsp
similarity index 100%
rename from webapp/view/ReportAboutRemove.jsp
rename to webapp/view/reports/RemoveDBrecords.jsp

diff --git a/webapp/view/reportSSFeatures.jsp b/webapp/view/reports/SSFeatures.jsp
similarity index 94%
rename from webapp/view/reportSSFeatures.jsp
rename to webapp/view/reports/SSFeatures.jsp
index 6363d24..4e2e773 100644 (file)
--- a/webapp/view/reportSSFeatures.jsp
+++ b/webapp/view/reports/SSFeatures.jsp
@@ -9,10 +9,10 @@
 <%@page import="java.util.ArrayList"%>
 
 <html>
-<jsp:include page="fragments/header.jsp" />
+<jsp:include page="../fragments/header.jsp" />
 <body>
        <div class="container">
-               <jsp:include page="fragments/mainmenu.jsp" />
+               <jsp:include page="../fragments/mainmenu.jsp" />
                <spring:url value="/sequence/sequence/results" var="sequence_query" />
                <spring:url value="/features/results" var="the_query"/>
                <spring:url value="/features/results?TypeFeatures=${feature}&Percent=${percent}" var="the_query" />
@@ -78,7 +78,7 @@
        </div>
        </div>
 
-       <jsp:include page="fragments/footer.jsp" />
+       <jsp:include page="../fragments/footer.jsp" />
        </div>
 </body>
 </html>
\ No newline at end of file

diff --git a/webapp/view/reportProteinSequences.jsp b/webapp/view/reports/Sequences.jsp
similarity index 96%
rename from webapp/view/reportProteinSequences.jsp
rename to webapp/view/reports/Sequences.jsp
index b7e7923..0bb4b7a 100644 (file)
--- a/webapp/view/reportProteinSequences.jsp
+++ b/webapp/view/reports/Sequences.jsp
@@ -7,10 +7,10 @@
 <%@page import="java.util.ArrayList"%>
 
 <html>
-<jsp:include page="fragments/header.jsp" />
+<jsp:include page="../fragments/header.jsp" />
 <body>
        <div class="container">
-               <jsp:include page="fragments/mainmenu.jsp" />
+               <jsp:include page="../fragments/mainmenu.jsp" />
                <spring:url value="/job/results" var="job_query" />
                <spring:url value="/sequence/sequence/results?sequence=${prot}&searchtype=${searchtype}" var="the_query"/>
                <c:set var="shortensequencelength" value="108"/>
@@ -113,7 +113,7 @@
        </div>
        </div>
 
-               <jsp:include page="fragments/footer.jsp" />
+               <jsp:include page="../fragments/footer.jsp" />
        </div>
 </body>
 </html>
\ No newline at end of file

diff --git a/webapp/view/reportProteinSequencesCounter.jsp b/webapp/view/reports/SequencesStatistics.jsp
similarity index 93%
rename from webapp/view/reportProteinSequencesCounter.jsp
rename to webapp/view/reports/SequencesStatistics.jsp
index e76f6f5..894d113 100644 (file)
--- a/webapp/view/reportProteinSequencesCounter.jsp
+++ b/webapp/view/reports/SequencesStatistics.jsp
@@ -7,11 +7,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
 <html>
-<jsp:include page="fragments/header.jsp" />
+<jsp:include page="../fragments/header.jsp" />
 
 <body>
        <div class="container">
-               <jsp:include page="fragments/mainmenu.jsp" />
+               <jsp:include page="../fragments/mainmenu.jsp" />
                <spring:url value="/sequence/sequence/results" var="sequence_query" />
                <spring:url value="/sequence/counts/results?counterJob=${counter}" var="the_query" />
                <c:set var="shortensequencelength" value="108"/>
@@ -70,7 +70,7 @@
        </div>
        </div>
 
-       <jsp:include page="fragments/footer.jsp" />
+       <jsp:include page="../fragments/footer.jsp" />
        </div>
 </body>
 </html>
\ No newline at end of file

diff --git a/webapp/view/reportTimeExecution.jsp b/webapp/view/reports/TimeExecution.jsp
similarity index 95%
rename from webapp/view/reportTimeExecution.jsp
rename to webapp/view/reports/TimeExecution.jsp
index d434a2c..2411b12 100644 (file)
--- a/webapp/view/reportTimeExecution.jsp
+++ b/webapp/view/reports/TimeExecution.jsp
@@ -6,10 +6,10 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
 <html>
-<jsp:include page="fragments/header.jsp" />
+<jsp:include page="../fragments/header.jsp" />
 <body>
        <div class="container">
-               <jsp:include page="fragments/mainmenu.jsp" />
+               <jsp:include page="../fragments/mainmenu.jsp" />
                <spring:url value="/stat/exectime/results?date1=${date1}&date2=${date2}&option=${option}" var="the_query" />
 
        <!-- reload and CSV buttons -->
@@ -104,7 +104,7 @@
        </div>
        </div>
 
-       <jsp:include page="fragments/footer.jsp" />
+       <jsp:include page="../fragments/footer.jsp" />
        </div>
 </body>
 </html>
\ No newline at end of file