Fix some obvious problems

diff --git a/.classpath b/.classpath
index 9f34bcd..358096f 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -25,5 +25,10 @@
        <classpathentry kind="lib" path="testsrc/lib/testng-5.10-jdk15.jar"/>
        <classpathentry kind="lib" path="WEB-INF/lib/jstl-1.1.2.jar"/>
        <classpathentry kind="lib" path="WEB-INF/lib/standard-1.1.2.jar"/>
+       <classpathentry kind="lib" path="WEB-INF/lib/cassandra-all-1.2.4.jar"/>
+       <classpathentry kind="lib" path="WEB-INF/lib/cassandra-clientutil-1.2.4.jar"/>
+       <classpathentry kind="lib" path="WEB-INF/lib/cassandra-thrift-1.2.4.jar"/>
+       <classpathentry kind="lib" path="WEB-INF/lib/hector-0.7.0-20-sources.jar"/>
+       <classpathentry kind="lib" path="WEB-INF/lib/hector-core-1.0-5.jar"/>
        <classpathentry kind="output" path="WEB-INF/classes"/>
 </classpath>

diff --git a/webservices/compbio/nosql/cassandra/CassandraCreate.java b/webservices/compbio/nosql/cassandra/CassandraCreate.java
index 376da4c..95c1659 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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;