From fa67b4930d9ae0074ec376cc290271bc6439cab0 Mon Sep 17 00:00:00 2001 From: Sasha Sherstnev Date: Mon, 14 Oct 2013 10:11:12 +0100 Subject: [PATCH] Fix some obvious problems --- .classpath | 5 +++++ webservices/compbio/nosql/cassandra/CassandraCreate.java | 2 +- webservices/compbio/nosql/cassandra/DataBase.java | 2 +- webservices/compbio/nosql/cassandra/DataParsing.java | 2 +- webservices/compbio/nosql/listeners/ContextListener.java | 4 ++-- webservices/compbio/nosql/listeners/DetailList.java | 6 +++--- webservices/compbio/nosql/listeners/LengthServlet.java | 6 +++--- webservices/compbio/nosql/listeners/ProtServlet.java | 6 +++--- webservices/compbio/nosql/listeners/QueryServlet.java | 6 +++--- webservices/compbio/nosql/statistic/StatisticsProt.java | 6 +++--- 10 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.classpath b/.classpath index 9f34bcd..358096f 100644 --- a/.classpath +++ b/.classpath @@ -25,5 +25,10 @@ + + + + + diff --git a/webservices/compbio/nosql/cassandra/CassandraCreate.java b/webservices/compbio/nosql/cassandra/CassandraCreate.java index 376da4c..95c1659 100644 --- a/webservices/compbio/nosql/cassandra/CassandraCreate.java +++ b/webservices/compbio/nosql/cassandra/CassandraCreate.java @@ -1,4 +1,4 @@ -package combio.cassandra; +package compbio.nosql.cassandra; import java.util.Arrays; diff --git a/webservices/compbio/nosql/cassandra/DataBase.java b/webservices/compbio/nosql/cassandra/DataBase.java index 036a48d..bff8f10 100644 --- a/webservices/compbio/nosql/cassandra/DataBase.java +++ b/webservices/compbio/nosql/cassandra/DataBase.java @@ -1,4 +1,4 @@ -package combio.cassandra; +package compbio.nosql.cassandra; import java.util.List; diff --git a/webservices/compbio/nosql/cassandra/DataParsing.java b/webservices/compbio/nosql/cassandra/DataParsing.java index 1a03ce4..5884073 100644 --- a/webservices/compbio/nosql/cassandra/DataParsing.java +++ b/webservices/compbio/nosql/cassandra/DataParsing.java @@ -1,4 +1,4 @@ -package combio.cassandra; +package compbio.nosql.cassandra; import java.io.BufferedReader; import java.io.IOException; diff --git a/webservices/compbio/nosql/listeners/ContextListener.java b/webservices/compbio/nosql/listeners/ContextListener.java index 1b57283..44f2177 100644 --- a/webservices/compbio/nosql/listeners/ContextListener.java +++ b/webservices/compbio/nosql/listeners/ContextListener.java @@ -1,4 +1,4 @@ -package combio.listeners; +package compbio.nosql.listeners; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -8,7 +8,7 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.annotation.WebListener; -import combio.cassandra.CassandraCreate; +import compbio.nosql.cassandra.CassandraCreate; /** * Application Lifecycle Listener implementation class ContextListener diff --git a/webservices/compbio/nosql/listeners/DetailList.java b/webservices/compbio/nosql/listeners/DetailList.java index 7d679f1..1f86608 100644 --- a/webservices/compbio/nosql/listeners/DetailList.java +++ b/webservices/compbio/nosql/listeners/DetailList.java @@ -1,4 +1,4 @@ -package combio.listeners; +package compbio.nosql.listeners; import java.io.IOException; import java.util.ArrayList; @@ -10,8 +10,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import combio.cassandra.*; -import combio.statistic.StatisticsProt; +import compbio.nosql.cassandra.*; +import compbio.nosql.statistic.StatisticsProt; /** * Servlet implementation class DetailList diff --git a/webservices/compbio/nosql/listeners/LengthServlet.java b/webservices/compbio/nosql/listeners/LengthServlet.java index 6e4feee..d7a1b09 100644 --- a/webservices/compbio/nosql/listeners/LengthServlet.java +++ b/webservices/compbio/nosql/listeners/LengthServlet.java @@ -1,4 +1,4 @@ -package combio.listeners; +package compbio.nosql.listeners; import java.io.IOException; import java.util.List; @@ -10,8 +10,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import combio.cassandra.DataBase; -import combio.statistic.StatisticsProt; +import compbio.nosql.cassandra.DataBase; +import compbio.nosql.statistic.StatisticsProt; /** * Servlet implementation class LengthServlet diff --git a/webservices/compbio/nosql/listeners/ProtServlet.java b/webservices/compbio/nosql/listeners/ProtServlet.java index 7bef70d..2f383b9 100644 --- a/webservices/compbio/nosql/listeners/ProtServlet.java +++ b/webservices/compbio/nosql/listeners/ProtServlet.java @@ -1,4 +1,4 @@ -package combio.listeners; +package compbio.nosql.listeners; import java.io.IOException; import java.util.List; @@ -10,8 +10,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import combio.cassandra.DataBase; -import combio.statistic.StatisticsProt; +import compbio.nosql.cassandra.DataBase; +import compbio.nosql.statistic.StatisticsProt; /** * Servlet implementation class ProtServlet diff --git a/webservices/compbio/nosql/listeners/QueryServlet.java b/webservices/compbio/nosql/listeners/QueryServlet.java index e9ab299..8977037 100644 --- a/webservices/compbio/nosql/listeners/QueryServlet.java +++ b/webservices/compbio/nosql/listeners/QueryServlet.java @@ -1,4 +1,4 @@ -package combio.listeners; +package compbio.nosql.listeners; import java.io.IOException; import java.util.List; @@ -10,8 +10,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import combio.cassandra.*; -import combio.statistic.StatisticsProt; +import compbio.nosql.cassandra.*; +import compbio.nosql.statistic.StatisticsProt; @WebServlet("/QueryServlet") diff --git a/webservices/compbio/nosql/statistic/StatisticsProt.java b/webservices/compbio/nosql/statistic/StatisticsProt.java index 72cad07..5ef7026 100644 --- a/webservices/compbio/nosql/statistic/StatisticsProt.java +++ b/webservices/compbio/nosql/statistic/StatisticsProt.java @@ -1,4 +1,4 @@ -package combio.statistic; +package compbio.nosql.statistic; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -19,8 +19,8 @@ import me.prettyprint.hector.api.factory.HFactory; import me.prettyprint.hector.api.query.QueryResult; import me.prettyprint.hector.api.query.RangeSlicesQuery; import me.prettyprint.hector.api.query.SliceQuery; -import combio.cassandra.CassandraCreate; -import combio.cassandra.DataBase; +import compbio.nosql.cassandra.CassandraCreate; +import compbio.nosql.cassandra.DataBase; public class StatisticsProt { private final static long MILLISECONDS_PER_DAY = 1000L * 60 * 60 * 24; -- 1.7.10.2