o Moving stuff to utils package.

5 files changed, 12 insertions, 10 deletions

diff --git a/src/main/java/io/trygvis/esper/testing/core/TablePoller.java b/src/main/java/io/trygvis/esper/testing/core/TablePoller.java
index c21b5ae..062f5e7 100644
--- a/src/main/java/io/trygvis/esper/testing/core/TablePoller.java
+++ b/src/main/java/io/trygvis/esper/testing/core/TablePoller.java
@@ -1,14 +1,14 @@
 package io.trygvis.esper.testing.core;
 
 import fj.data.*;
-import io.trygvis.esper.testing.sql.*;
+import io.trygvis.esper.testing.util.sql.*;
 import org.slf4j.*;
 
 import javax.sql.*;
 import java.sql.*;
 
-import static io.trygvis.esper.testing.sql.ResultSetF.*;
-import static io.trygvis.esper.testing.sql.SqlOption.*;
+import static io.trygvis.esper.testing.util.sql.ResultSetF.*;
+import static io.trygvis.esper.testing.util.sql.SqlOption.*;
 import static java.lang.System.*;
 
 public class TablePoller<A> {
diff --git a/src/main/java/io/trygvis/esper/testing/core/BuildDto.java b/src/main/java/io/trygvis/esper/testing/core/db/BuildDto.java
index 37de1b3..5cc6b0a 100644
--- a/src/main/java/io/trygvis/esper/testing/core/BuildDto.java
+++ b/src/main/java/io/trygvis/esper/testing/core/db/BuildDto.java
@@ -1,4 +1,4 @@
-package io.trygvis.esper.testing.core;
+package io.trygvis.esper.testing.core.db;
 
 import io.trygvis.esper.testing.*;
 import org.joda.time.*;
diff --git a/src/main/java/io/trygvis/esper/testing/core/CoreDao.java b/src/main/java/io/trygvis/esper/testing/core/db/CoreDao.java
index a010dad..5eab2c9 100644
--- a/src/main/java/io/trygvis/esper/testing/core/CoreDao.java
+++ b/src/main/java/io/trygvis/esper/testing/core/db/CoreDao.java
@@ -1,13 +1,13 @@
-package io.trygvis.esper.testing.core;
+package io.trygvis.esper.testing.core.db;
 
 import io.trygvis.esper.testing.*;
-import io.trygvis.esper.testing.sql.*;
+import io.trygvis.esper.testing.util.sql.*;
 import org.joda.time.*;
 
 import java.sql.*;
 import java.util.*;
 
-import static io.trygvis.esper.testing.sql.SqlOption.*;
+import static io.trygvis.esper.testing.util.sql.SqlOption.*;
 import static java.lang.System.*;
 
 public class CoreDao {
diff --git a/src/main/java/io/trygvis/esper/testing/core/PersonDto.java b/src/main/java/io/trygvis/esper/testing/core/db/PersonDto.java
index 33355a3..c643fc7 100644
--- a/src/main/java/io/trygvis/esper/testing/core/PersonDto.java
+++ b/src/main/java/io/trygvis/esper/testing/core/db/PersonDto.java
@@ -1,4 +1,4 @@
-package io.trygvis.esper.testing.core;
+package io.trygvis.esper.testing.core.db;
 
 import io.trygvis.esper.testing.*;
 import org.joda.time.*;
diff --git a/src/main/java/io/trygvis/esper/testing/core/JenkinsBuildPoller.java b/src/main/java/io/trygvis/esper/testing/core/jenkins/JenkinsBuildPoller.java
index cb9157c..90a4ef4 100644
--- a/src/main/java/io/trygvis/esper/testing/core/JenkinsBuildPoller.java
+++ b/src/main/java/io/trygvis/esper/testing/core/jenkins/JenkinsBuildPoller.java
@@ -1,9 +1,11 @@
-package io.trygvis.esper.testing.core;
+package io.trygvis.esper.testing.core.jenkins;
 
 import com.jolbox.bonecp.*;
 import io.trygvis.esper.testing.*;
+import io.trygvis.esper.testing.core.*;
+import io.trygvis.esper.testing.core.db.*;
 import io.trygvis.esper.testing.jenkins.*;
-import io.trygvis.esper.testing.sql.*;
+import io.trygvis.esper.testing.util.sql.*;
 import org.slf4j.*;
 
 import java.sql.*;