incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [5/6] git commit: BLUR-97: Repackaged the agent to org.apache
Date Wed, 22 May 2013 02:07:40 GMT
BLUR-97: Repackaged the agent to org.apache

Signed-off-by: Aaron McCurry <amccurry@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/1485db70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/1485db70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/1485db70

Branch: refs/heads/0.1.5
Commit: 1485db707e197e77e296b65b89f4e61720531008
Parents: 0d23edd
Author: Chris Rohr <crohr@nearinfinity.com>
Authored: Tue May 21 21:37:39 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Tue May 21 22:06:18 2013 -0400

----------------------------------------------------------------------
 .../blur/blur-core/0.1.3/blur-core-0.1.3-tests.jar |  Bin 75541 -> 0 bytes
 .../blur/blur-core/0.1.3/blur-core-0.1.3.jar       |  Bin 328261 -> 0 bytes
 .../blur/blur-core/0.1.3/blur-core-0.1.3.pom       |   79 -----
 .../blur/blur-store/0.1.3/blur-store-0.1.3.jar     |  Bin 79226 -> 0 bytes
 .../blur/blur-store/0.1.3/blur-store-0.1.3.pom     |  115 -------
 .../blur/blur-thrift/0.1.3/blur-thrift-0.1.3.jar   |  Bin 685308 -> 0 bytes
 .../blur/blur-thrift/0.1.3/blur-thrift-0.1.3.pom   |   73 ----
 .../blur/blur-util/0.1.3/blur-util-0.1.3.jar       |  Bin 49248 -> 0 bytes
 .../blur/blur-util/0.1.3/blur-util-0.1.3.pom       |  101 ------
 .../main/java/com/nearinfinity/agent/Agent.java    |  189 -----------
 .../nearinfinity/agent/cleaners/AgentCleaners.java |   39 ---
 .../agent/cleaners/HdfsStatsCleaner.java           |   28 --
 .../agent/cleaners/QueriesCleaner.java             |   32 --
 .../agent/collectors/blur/BlurCollector.java       |  119 -------
 .../collectors/blur/query/QueryCollector.java      |   89 -----
 .../collectors/blur/table/SchemaCollector.java     |  143 --------
 .../collectors/blur/table/ServerCollector.java     |   69 ----
 .../collectors/blur/table/StatsCollector.java      |   49 ---
 .../collectors/blur/table/TableCollector.java      |   50 ---
 .../agent/collectors/hdfs/HdfsCollector.java       |   62 ----
 .../agent/collectors/hdfs/HdfsStatsCollector.java  |   94 ------
 .../collectors/zookeeper/ClusterCollector.java     |   70 ----
 .../collectors/zookeeper/ControllerCollector.java  |   55 ---
 .../agent/collectors/zookeeper/ShardCollector.java |   56 ---
 .../agent/collectors/zookeeper/TableCollector.java |   50 ---
 .../collectors/zookeeper/ZookeeperCollector.java   |  145 --------
 .../agent/connections/JdbcConnection.java          |   26 --
 .../connections/blur/BlurDatabaseConnection.java   |  149 ---------
 .../blur/interfaces/BlurDatabaseInterface.java     |   21 --
 .../blur/interfaces/QueryDatabaseInterface.java    |   21 --
 .../blur/interfaces/TableDatabaseInterface.java    |   12 -
 .../cleaners/CleanerDatabaseConnection.java        |   43 ---
 .../interfaces/CleanerDatabaseInterface.java       |    5 -
 .../interfaces/HdfsDatabaseCleanerInterface.java   |    5 -
 .../interfaces/QueryDatabaseCleanerInterface.java  |    8 -
 .../connections/hdfs/HdfsDatabaseConnection.java   |   49 ---
 .../hdfs/interfaces/HdfsDatabaseInterface.java     |   15 -
 .../zookeeper/ZookeeperDatabaseConnection.java     |  162 ---------
 .../interfaces/ClusterDatabaseInterface.java       |    7 -
 .../interfaces/ControllerDatabaseInterface.java    |   12 -
 .../interfaces/ShardsDatabaseInterface.java        |   13 -
 .../interfaces/TableDatabaseInterface.java         |   11 -
 .../interfaces/ZookeeperDatabaseInterface.java     |   17 -
 .../agent/exceptions/CollisionException.java       |    8 -
 .../agent/exceptions/HdfsThreadException.java      |   12 -
 .../agent/exceptions/InvalidLicenseException.java  |   13 -
 .../agent/exceptions/MissingException.java         |    8 -
 .../agent/exceptions/NullReturnedException.java    |   12 -
 .../agent/exceptions/TableCollisionException.java  |    8 -
 .../agent/exceptions/TableMissingException.java    |    8 -
 .../ZookeeperNameCollisionException.java           |    8 -
 .../exceptions/ZookeeperNameMissingException.java  |    8 -
 .../agent/monitor/ThreadController.java            |   29 --
 .../notifications/AgentMailerAuthenticator.java    |   16 -
 .../nearinfinity/agent/notifications/Mailer.java   |   78 -----
 .../agent/notifications/Messenger.java             |   83 -----
 .../nearinfinity/agent/notifications/Notifier.java |   62 ----
 .../java/com/nearinfinity/agent/types/Column.java  |   73 ----
 .../java/com/nearinfinity/agent/types/Family.java  |   50 ---
 .../com/nearinfinity/agent/types/TimeHelper.java   |   25 --
 .../src/main/java/org/apache/blur/agent/Agent.java |  189 +++++++++++
 .../apache/blur/agent/cleaners/AgentCleaners.java  |   40 +++
 .../blur/agent/cleaners/HdfsStatsCleaner.java      |   28 ++
 .../apache/blur/agent/cleaners/QueriesCleaner.java |   32 ++
 .../blur/agent/collectors/blur/BlurCollector.java  |  119 +++++++
 .../collectors/blur/query/QueryCollector.java      |   89 +++++
 .../collectors/blur/table/SchemaCollector.java     |  143 ++++++++
 .../collectors/blur/table/ServerCollector.java     |   69 ++++
 .../collectors/blur/table/StatsCollector.java      |   49 +++
 .../collectors/blur/table/TableCollector.java      |   50 +++
 .../blur/agent/collectors/hdfs/HdfsCollector.java  |   63 ++++
 .../agent/collectors/hdfs/HdfsStatsCollector.java  |   94 ++++++
 .../collectors/zookeeper/ClusterCollector.java     |   71 ++++
 .../collectors/zookeeper/ControllerCollector.java  |   55 +++
 .../agent/collectors/zookeeper/ShardCollector.java |   56 +++
 .../agent/collectors/zookeeper/TableCollector.java |   50 +++
 .../collectors/zookeeper/ZookeeperCollector.java   |  145 ++++++++
 .../blur/agent/connections/JdbcConnection.java     |   26 ++
 .../connections/blur/BlurDatabaseConnection.java   |  149 +++++++++
 .../blur/interfaces/BlurDatabaseInterface.java     |   22 ++
 .../blur/interfaces/QueryDatabaseInterface.java    |   21 ++
 .../blur/interfaces/TableDatabaseInterface.java    |   12 +
 .../cleaners/CleanerDatabaseConnection.java        |   44 +++
 .../interfaces/CleanerDatabaseInterface.java       |    5 +
 .../interfaces/HdfsDatabaseCleanerInterface.java   |    5 +
 .../interfaces/QueryDatabaseCleanerInterface.java  |    8 +
 .../connections/hdfs/HdfsDatabaseConnection.java   |   49 +++
 .../hdfs/interfaces/HdfsDatabaseInterface.java     |   16 +
 .../zookeeper/ZookeeperDatabaseConnection.java     |  163 +++++++++
 .../interfaces/ClusterDatabaseInterface.java       |    7 +
 .../interfaces/ControllerDatabaseInterface.java    |   12 +
 .../interfaces/ShardsDatabaseInterface.java        |   13 +
 .../interfaces/TableDatabaseInterface.java         |   11 +
 .../interfaces/ZookeeperDatabaseInterface.java     |   17 +
 .../blur/agent/exceptions/CollisionException.java  |    8 +
 .../blur/agent/exceptions/HdfsThreadException.java |   12 +
 .../agent/exceptions/InvalidLicenseException.java  |   13 +
 .../blur/agent/exceptions/MissingException.java    |    8 +
 .../agent/exceptions/NullReturnedException.java    |   12 +
 .../agent/exceptions/TableCollisionException.java  |    8 +
 .../agent/exceptions/TableMissingException.java    |    8 +
 .../ZookeeperNameCollisionException.java           |    8 +
 .../exceptions/ZookeeperNameMissingException.java  |    8 +
 .../blur/agent/monitor/ThreadController.java       |   29 ++
 .../notifications/AgentMailerAuthenticator.java    |   16 +
 .../apache/blur/agent/notifications/Mailer.java    |   78 +++++
 .../apache/blur/agent/notifications/Messenger.java |   83 +++++
 .../apache/blur/agent/notifications/Notifier.java  |   62 ++++
 .../java/org/apache/blur/agent/types/Column.java   |   73 ++++
 .../java/org/apache/blur/agent/types/Family.java   |   50 +++
 .../org/apache/blur/agent/types/TimeHelper.java    |   25 ++
 .../java/com/nearinfinity/AgentBaseTestClass.java  |   46 ---
 .../com/nearinfinity/BlurAgentBaseTestClass.java   |   23 --
 .../agent/cleaners/AgentCleanerTest.java           |   75 -----
 .../agent/cleaners/HdfsStatsCleanerTest.java       |   51 ---
 .../agent/cleaners/QueryCleanerTest.java           |  104 ------
 .../collectors/blur/query/QueryCollectorTest.java  |   53 ---
 .../agent/collectors/hdfs/HdfsCollectorTest.java   |   67 ----
 .../collectors/hdfs/HdfsStatCollectorTest.java     |   54 ---
 .../agent/notifications/MailerTest.java            |  259 ---------------
 .../agent/notifications/MessengerTest.java         |  100 ------
 .../agent/notifications/NotifierTest.java          |    5 -
 .../agent/notifications/XMPPEmbeddedServer.java    |   95 ------
 .../blur/agent/cleaners/AgentCleanerTest.java      |   77 +++++
 .../blur/agent/cleaners/HdfsStatsCleanerTest.java  |   52 +++
 .../blur/agent/cleaners/QueryCleanerTest.java      |  105 ++++++
 .../collectors/blur/query/QueryCollectorTest.java  |   54 +++
 .../agent/collectors/hdfs/HdfsCollectorTest.java   |   68 ++++
 .../collectors/hdfs/HdfsStatCollectorTest.java     |   54 +++
 .../blur/agent/notifications/MailerTest.java       |  259 +++++++++++++++
 .../blur/agent/notifications/MessengerTest.java    |  102 ++++++
 .../blur/agent/notifications/NotifierTest.java     |    5 +
 .../agent/notifications/XMPPEmbeddedServer.java    |   95 ++++++
 .../apache/blur/agent/test/AgentBaseTestClass.java |   46 +++
 .../blur/agent/test/BlurAgentBaseTestClass.java    |   23 ++
 .../src/test/resources/invalid_matching.lic        |   22 --
 .../blur-agent/src/test/resources/invalid_type.lic |   22 --
 .../blur-agent/src/test/resources/valid_yearly.lic |   22 --
 138 files changed, 3363 insertions(+), 3782 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-core/0.1.3/blur-core-0.1.3-tests.jar
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-core/0.1.3/blur-core-0.1.3-tests.jar b/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-core/0.1.3/blur-core-0.1.3-tests.jar
deleted file mode 100644
index ed49edd..0000000
Binary files a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-core/0.1.3/blur-core-0.1.3-tests.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-core/0.1.3/blur-core-0.1.3.jar
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-core/0.1.3/blur-core-0.1.3.jar b/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-core/0.1.3/blur-core-0.1.3.jar
deleted file mode 100644
index 1e80f45..0000000
Binary files a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-core/0.1.3/blur-core-0.1.3.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-core/0.1.3/blur-core-0.1.3.pom
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-core/0.1.3/blur-core-0.1.3.pom b/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-core/0.1.3/blur-core-0.1.3.pom
deleted file mode 100644
index bb9940f..0000000
--- a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-core/0.1.3/blur-core-0.1.3.pom
+++ /dev/null
@@ -1,79 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<!-- parent>
-		<groupId>com.nearinfinity.blur</groupId>
-		<artifactId>blur</artifactId>
-		<version>0.1.3</version>
-	</parent -->
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.nearinfinity.blur</groupId>
-	<artifactId>blur-core</artifactId>
-	<packaging>jar</packaging>
-	<name>Blur Core</name>
-	<version>0.1.3</version>
-
-	<properties>
-		<enableAssertions>false</enableAssertions>
-	</properties>
-
-	<dependencies>
-		
-	</dependencies>
-
-	<!-- repositories>
-		<repository>
-			<id>libdir</id>
-			<url>file://${basedir}/../lib</url>
-		</repository>
-		<repository>
-			<id>cloudera</id>
-			<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
-		</repository>
-	</repositories>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/../../../lib
-							</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>false</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-							<excludeTransitive>true</excludeTransitive>
-							<excludeArtifactIds>junit,commons-cli,commons-logging,hadoop-core,slf4j-api,hadoop-test</excludeArtifactIds>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build -->
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-store/0.1.3/blur-store-0.1.3.jar
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-store/0.1.3/blur-store-0.1.3.jar b/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-store/0.1.3/blur-store-0.1.3.jar
deleted file mode 100644
index aeb7e7a..0000000
Binary files a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-store/0.1.3/blur-store-0.1.3.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-store/0.1.3/blur-store-0.1.3.pom
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-store/0.1.3/blur-store-0.1.3.pom b/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-store/0.1.3/blur-store-0.1.3.pom
deleted file mode 100644
index 6efcf13..0000000
--- a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-store/0.1.3/blur-store-0.1.3.pom
+++ /dev/null
@@ -1,115 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<!-- parent>
-		<groupId>com.nearinfinity.blur</groupId>
-		<artifactId>blur</artifactId>
-		<version>0.1.3</version>
-	</parent -->
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.nearinfinity.blur</groupId>
-	<artifactId>blur-store</artifactId>
-	<packaging>jar</packaging>
-	<name>Blur Store</name>
-	<version>0.1.3</version>
-
-	<dependencies>
-		<!-- dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-core</artifactId>
-			<version>3.5.0.lm</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-			<version>1.2</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-			<artifactId>concurrentlinkedhashmap-lru</artifactId>
-			<version>1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.15</version>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.mail</groupId>
-					<artifactId>mail</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency-->
-	</dependencies>
-
-	<!-- repositories>
-		<repository>
-			<id>libdir</id>
-			<url>file://${basedir}/../lib</url>
-		</repository>
-		<repository>
-			<id>cloudera</id>
-			<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
-		</repository>
-	</repositories>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/../../../lib
-							</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>false</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-							<excludeTransitive>true</excludeTransitive>
-							<excludeArtifactIds>junit,commons-cli,commons-logging,hadoop-core,slf4j-api
-							</excludeArtifactIds>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build -->
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-thrift/0.1.3/blur-thrift-0.1.3.jar
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-thrift/0.1.3/blur-thrift-0.1.3.jar b/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-thrift/0.1.3/blur-thrift-0.1.3.jar
deleted file mode 100644
index 581761a..0000000
Binary files a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-thrift/0.1.3/blur-thrift-0.1.3.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-thrift/0.1.3/blur-thrift-0.1.3.pom
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-thrift/0.1.3/blur-thrift-0.1.3.pom b/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-thrift/0.1.3/blur-thrift-0.1.3.pom
deleted file mode 100644
index 06e2c0b..0000000
--- a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-thrift/0.1.3/blur-thrift-0.1.3.pom
+++ /dev/null
@@ -1,73 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<!-- parent>
-		<groupId>com.nearinfinity.blur</groupId>
-		<artifactId>blur</artifactId>
-		<version>0.1.rc1</version>
-	</parent -->
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.nearinfinity.blur</groupId>
-	<artifactId>blur-thrift</artifactId>
-	<packaging>jar</packaging>
-	<name>Blur Thrift</name>
-	<version>0.1.3</version>
-
-	<dependencies>
-		<dependency>
-			<groupId>com.nearinfinity.blur</groupId>
-			<artifactId>blur-util</artifactId>
-			<version>0.1.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.thrift</groupId>
-			<artifactId>libthrift</artifactId>
-			<version>0.7.0</version>
-		</dependency>
-	</dependencies>
-
-	<!-- repositories>
-		<repository>
-			<id>libdir</id>
-			<url>file://${basedir}/../lib</url>
-		</repository>
-	</repositories>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.2</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/../../../lib
-							</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>false</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-							<excludeTransitive>true</excludeTransitive>
-							<excludeArtifactIds>junit,commons-cli,commons-logging,hadoop,slf4j-api
-							</excludeArtifactIds>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build -->
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-util/0.1.3/blur-util-0.1.3.jar
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-util/0.1.3/blur-util-0.1.3.jar b/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-util/0.1.3/blur-util-0.1.3.jar
deleted file mode 100644
index d7e5051..0000000
Binary files a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-util/0.1.3/blur-util-0.1.3.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-util/0.1.3/blur-util-0.1.3.pom
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-util/0.1.3/blur-util-0.1.3.pom b/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-util/0.1.3/blur-util-0.1.3.pom
deleted file mode 100644
index af96b59..0000000
--- a/src/contrib/blur-console/blur-agent/lib/com/nearinfinity/blur/blur-util/0.1.3/blur-util-0.1.3.pom
+++ /dev/null
@@ -1,101 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<!-- parent>
-		<groupId>com.nearinfinity.blur</groupId>
-		<artifactId>blur</artifactId>
-		<version>0.1.rc1</version>
-	</parent -->
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.nearinfinity.blur</groupId>
-	<artifactId>blur-util</artifactId>
-	<packaging>jar</packaging>
-	<name>Blur Util</name>
-	<version>0.1.3</version>
-
-	<dependencies>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.6.1</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.6.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.zookeeper</groupId>
-			<artifactId>zookeeper</artifactId>
-			<version>3.3.4</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.7</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop</groupId>
-			<artifactId>hadoop-core</artifactId>
-			<version>0.20.2-cdh3u5</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-
-	<repositories>
-		<repository>
-			<id>libdir</id>
-			<url>file://${basedir}/../lib</url>
-		</repository>
-		<repository>
-			<id>cloudera</id>
-			<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
-		</repository>
-	</repositories>
-
-	<!-- build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.2</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/../../../lib
-							</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>false</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-							<excludeTransitive>true</excludeTransitive>
-							<excludeArtifactIds>junit,commons-cli,commons-logging,hadoop-core,slf4j-api,slf4j-log4j12
-							</excludeArtifactIds>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build -->
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/Agent.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/Agent.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/Agent.java
deleted file mode 100644
index 2c8e253..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/Agent.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package com.nearinfinity.agent;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.lang.management.ManagementFactory;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.log4j.PropertyConfigurator;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import com.nearinfinity.agent.cleaners.AgentCleaners;
-import com.nearinfinity.agent.collectors.blur.BlurCollector;
-import com.nearinfinity.agent.collectors.hdfs.HdfsCollector;
-import com.nearinfinity.agent.collectors.zookeeper.ZookeeperCollector;
-import com.nearinfinity.agent.connections.JdbcConnection;
-import com.nearinfinity.agent.connections.blur.BlurDatabaseConnection;
-import com.nearinfinity.agent.connections.cleaners.CleanerDatabaseConnection;
-import com.nearinfinity.agent.connections.hdfs.HdfsDatabaseConnection;
-import com.nearinfinity.agent.connections.zookeeper.ZookeeperDatabaseConnection;
-import com.nearinfinity.agent.exceptions.HdfsThreadException;
-import com.nearinfinity.agent.notifications.Notifier;
-
-public class Agent {
-	public static final long COLLECTOR_SLEEP_TIME = TimeUnit.SECONDS.toMillis(15);
-	public static final long CLEAN_UP_SLEEP_TIME = TimeUnit.SECONDS.toMillis(30);
-
-	private static final Log log = LogFactory.getLog(Agent.class);
-
-	private Agent(Properties props) {
-
-		// Setup database connection
-		JdbcTemplate jdbc = JdbcConnection.createDBConnection(props);
-
-		// Setup the notifier
-		Notifier.getNotifier(props, true);
-
-		List<String> activeCollectors = props.containsKey("active.collectors") ? new ArrayList<String>(Arrays.asList(props.getProperty(
-				"active.collectors").split("\\|"))) : new ArrayList<String>();
-
-		// Setup the collectors
-		setupHdfs(props, jdbc, activeCollectors);
-		setupBlur(props, jdbc, activeCollectors);
-		setupZookeeper(props, jdbc);
-		setupCleaners(jdbc, activeCollectors);
-	}
-
-	public static void main(String[] args) {
-		writePidFile();
-		Properties configProps = loadConfigParams(args);
-		setupLogger(configProps);
-		new Agent(configProps);
-	}
-
-	private void setupCleaners(JdbcTemplate jdbc, List<String> activeCollectors) {
-		new Thread(new AgentCleaners(activeCollectors, new CleanerDatabaseConnection(jdbc)), "Agent Cleaner Thread").start();
-	}
-
-	private void setupBlur(Properties props, JdbcTemplate jdbc, List<String> activeCollectors) {
-		Map<String, String> blurInstances = loadBlurInstances(props);
-		for (Map.Entry<String, String> blurEntry : blurInstances.entrySet()) {
-			final String zookeeperName = blurEntry.getKey();
-			final String connection = blurEntry.getValue();
-			new Thread(new BlurCollector(zookeeperName, connection, activeCollectors, new BlurDatabaseConnection(jdbc), jdbc),
-					"Blur Collector thread - " + zookeeperName).start();
-		}
-	}
-
-	private void setupHdfs(Properties props, final JdbcTemplate jdbc, List<String> activeCollectors) {
-		Map<String, Map<String, String>> hdfsInstances = loadHdfsInstances(props);
-		for (Map<String, String> instance : hdfsInstances.values()) {
-			final String name = instance.get("name");
-			final String thriftUri = instance.get("url.thrift");
-			final String defaultUri = instance.get("url.default");
-			final String user = props.getProperty("hdfs." + name + ".login.user");
-			try {
-				new Thread(new HdfsCollector(name, defaultUri, thriftUri, user, activeCollectors, new HdfsDatabaseConnection(jdbc)),
-						"Hdfs Collector - " + name).start();
-			} catch (HdfsThreadException e) {
-				log.error("The collector for hdfs [" + name + "] will not execute.");
-				continue;
-			}
-		}
-	}
-
-	private void setupZookeeper(Properties props, JdbcTemplate jdbc) {
-		if (props.containsKey("zk.instances")) {
-			List<String> zooKeeperInstances = new ArrayList<String>(Arrays.asList(props.getProperty("zk.instances").split("\\|")));
-			for (String zkInstance : zooKeeperInstances) {
-				String zkUrl = props.getProperty("zk." + zkInstance + ".url");
-				String blurConnection = props.getProperty("blur." + zkInstance + ".url");
-				new Thread(new ZookeeperCollector(zkUrl, zkInstance, blurConnection, new ZookeeperDatabaseConnection(jdbc)), "Zookeeper - "
-						+ zkInstance).start();
-			}
-		}
-	}
-
-	private static void setupLogger(Properties props) {
-		String log4jPropsFile = props.getProperty("log4j.properties", "../conf/log4j.properties");
-
-		if (new File(log4jPropsFile).exists()) {
-			PropertyConfigurator.configure(log4jPropsFile);
-		} else {
-			log.warn("Unable to find log4j properties file.  Using default logging");
-		}
-	}
-
-	private static Properties loadConfigParams(String[] args) {
-		String configFileName;
-		if (args.length == 0) {
-			configFileName = "../conf/blur-agent.config";
-		} else {
-			configFileName = args[0];
-		}
-		File configFile = new File(configFileName);
-
-		if (!configFile.exists() || !configFile.isFile()) {
-			log.fatal("Unable to find config file at " + configFile.getAbsolutePath());
-			System.exit(1);
-		}
-
-		Properties configProps = new Properties();
-		try {
-			configProps.load(new FileInputStream(configFile));
-		} catch (Exception e) {
-			log.fatal("Config File is not a valid properties file: " + e.getMessage());
-			System.exit(1);
-		}
-		return configProps;
-	}
-
-	private static void writePidFile() {
-		try {
-			File pidFile = new File("../agent.pid");
-			PrintWriter pidOut = new PrintWriter(pidFile);
-			log.info("Wrote pid file to: " + pidFile.getAbsolutePath());
-			String nameOfRunningVM = ManagementFactory.getRuntimeMXBean().getName();
-			int p = nameOfRunningVM.indexOf('@');
-			String pid = nameOfRunningVM.substring(0, p);
-			pidOut.write(pid);
-			pidOut.write("\n");
-			pidOut.close();
-		} catch (FileNotFoundException e) {
-			log.fatal("Unable to find pid file. " + e.getMessage());
-			System.exit(1);
-		}
-	}
-
-	private Map<String, String> loadBlurInstances(Properties props) {
-		Map<String, String> instances = new HashMap<String, String>();
-
-		if (props.containsKey("blur.instances")) {
-			String[] blurNames = props.getProperty("blur.instances").split("\\|");
-
-			for (String blur : blurNames) {
-				instances.put(blur, props.getProperty("blur." + blur + ".url"));
-			}
-		}
-
-		return instances;
-	}
-
-	private Map<String, Map<String, String>> loadHdfsInstances(Properties props) {
-		Map<String, Map<String, String>> instances = new HashMap<String, Map<String, String>>();
-
-		if (props.containsKey("hdfs.instances")) {
-			String[] hdfsNames = props.getProperty("hdfs.instances").split("\\|");
-
-			for (String hdfs : hdfsNames) {
-				Map<String, String> instanceInfo = new HashMap<String, String>();
-				instanceInfo.put("url.thrift", props.getProperty("hdfs." + hdfs + ".thrift.url"));
-				instanceInfo.put("url.default", props.getProperty("hdfs." + hdfs + ".url"));
-				instanceInfo.put("name", hdfs);
-				instances.put(hdfs, instanceInfo);
-			}
-		}
-
-		return instances;
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/cleaners/AgentCleaners.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/cleaners/AgentCleaners.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/cleaners/AgentCleaners.java
deleted file mode 100644
index 6f72dad..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/cleaners/AgentCleaners.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.nearinfinity.agent.cleaners;
-
-import java.util.List;
-
-import com.nearinfinity.agent.Agent;
-import com.nearinfinity.agent.connections.cleaners.interfaces.CleanerDatabaseInterface;
-
-public class AgentCleaners implements Runnable {
-
-	private final boolean cleanQueries;
-	private final boolean cleanHdfsStats;
-	private final CleanerDatabaseInterface database;
-
-	public AgentCleaners(final List<String> activeCollectors, CleanerDatabaseInterface database) {
-		this.cleanQueries = activeCollectors.contains("queries");
-		this.cleanHdfsStats = activeCollectors.contains("hdfs");
-		this.database = database;
-	}
-
-	@Override
-	public void run() {
-		while (true) {
-			if (this.cleanQueries) {
-				new Thread(new QueriesCleaner(this.database), "Query Cleaner").start();
-			}
-
-			if (this.cleanHdfsStats) {
-				new Thread(new HdfsStatsCleaner(this.database), "Hdfs Stats Cleaner").start();
-			}
-
-			try {
-				Thread.sleep(Agent.CLEAN_UP_SLEEP_TIME);
-			} catch (InterruptedException e) {
-				break;
-			}
-		}
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/cleaners/HdfsStatsCleaner.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/cleaners/HdfsStatsCleaner.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/cleaners/HdfsStatsCleaner.java
deleted file mode 100644
index 4a1beb5..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/cleaners/HdfsStatsCleaner.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.nearinfinity.agent.cleaners;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.dao.DataAccessException;
-
-import com.nearinfinity.agent.connections.cleaners.interfaces.HdfsDatabaseCleanerInterface;
-
-public class HdfsStatsCleaner implements Runnable {
-	private static final Log log = LogFactory.getLog(QueriesCleaner.class);
-
-	private final HdfsDatabaseCleanerInterface database;
-
-	public HdfsStatsCleaner(HdfsDatabaseCleanerInterface database) {
-		this.database = database;
-	}
-
-	@Override
-	public void run() {
-		try {
-			this.database.deleteOldStats();
-		} catch (DataAccessException e) {
-			log.error("An error occured while deleting hdfs stats from the database!", e);
-		} catch (Exception e) {
-			log.error("An unkown error occured while cleaning up the hdfs stats!", e);
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/cleaners/QueriesCleaner.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/cleaners/QueriesCleaner.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/cleaners/QueriesCleaner.java
deleted file mode 100644
index 1d6fc04..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/cleaners/QueriesCleaner.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.nearinfinity.agent.cleaners;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.dao.DataAccessException;
-
-import com.nearinfinity.agent.connections.cleaners.interfaces.QueryDatabaseCleanerInterface;
-
-public class QueriesCleaner implements Runnable {
-	private static final Log log = LogFactory.getLog(QueriesCleaner.class);
-
-	private final QueryDatabaseCleanerInterface database;
-
-	public QueriesCleaner(final QueryDatabaseCleanerInterface database) {
-		this.database = database;
-	}
-
-	@Override
-	public void run() {
-		try {
-			int deletedQueries = this.database.deleteOldQueries();
-			int expiredQueries = this.database.expireOldQueries();
-			if ((deletedQueries + expiredQueries) > 0) {
-				log.info("Removed " + deletedQueries + " queries and " + "Expired " + expiredQueries + " queries, in this pass!");
-			}
-		} catch (DataAccessException e) {
-			log.error("An error occured while deleting queries from the database!", e);
-		} catch (Exception e) {
-			log.error("An unkown error occured while cleaning up the queries!", e);
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/BlurCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/BlurCollector.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/BlurCollector.java
deleted file mode 100644
index 8f612dc..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/BlurCollector.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.nearinfinity.agent.collectors.blur;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.blur.thrift.BlurClient;
-import org.apache.blur.thrift.generated.Blur.Iface;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import com.nearinfinity.agent.Agent;
-import com.nearinfinity.agent.collectors.blur.query.QueryCollector;
-import com.nearinfinity.agent.collectors.blur.table.TableCollector;
-import com.nearinfinity.agent.connections.blur.interfaces.BlurDatabaseInterface;
-import com.nearinfinity.agent.exceptions.ZookeeperNameCollisionException;
-import com.nearinfinity.agent.exceptions.ZookeeperNameMissingException;
-
-public class BlurCollector implements Runnable {
-	private static final Log log = LogFactory.getLog(BlurCollector.class);
-
-	private final String zookeeperName;
-	private final BlurDatabaseInterface database;
-	private final boolean collectTables;
-	private final boolean collectQueries;
-
-	private String connection;
-
-	public BlurCollector(final String zookeeperName, final String connection, final List<String> activeCollectors,
-			final BlurDatabaseInterface database, final JdbcTemplate jdbc) {
-		this.zookeeperName = zookeeperName;
-		this.connection = connection;
-		this.database = database;
-		this.collectTables = activeCollectors.contains("tables");
-		this.collectQueries = activeCollectors.contains("queries");
-	}
-
-	@Override
-	public void run() {
-		while (true) {
-			// Retrieve the zookeeper id
-			int zookeeperId = getZookeeperId();
-
-			// If the connection string is blank then we need to build it from the
-			// online controllers from the database
-			String resolvedConnection = getResolvedConnection(zookeeperId);
-
-			if (StringUtils.isBlank(resolvedConnection)) {
-				try {
-					Thread.sleep(Agent.COLLECTOR_SLEEP_TIME);
-				} catch (InterruptedException e) {
-					break;
-				}
-				continue;
-			}
-
-			Iface blurConnection = BlurClient.getClient(resolvedConnection);
-
-			/* Retrieve the clusters and their info */
-			for (Map<String, Object> cluster : this.database.getClusters(zookeeperId)) {
-				String clusterName = (String) cluster.get("NAME");
-				Integer clusterId = (Integer) cluster.get("ID");
-
-				List<String> tables;
-				try {
-					tables = blurConnection.tableListByCluster(clusterName);
-				} catch (Exception e) {
-					log.error("An error occured while trying to retrieve the table list for cluster[" + clusterName + "], skipping cluster", e);
-					continue;
-				}
-
-				for (final String tableName : tables) {
-					int tableId = this.database.getTableId(clusterId, tableName);
-					if (tableId == -1) {
-						continue;
-					}
-
-					if (this.collectTables) {
-						new Thread(new TableCollector(blurConnection, tableName, tableId, this.database), "Table Collector - " + tableName).start();
-					}
-
-					if (this.collectQueries) {
-						new Thread(new QueryCollector(blurConnection, tableName, tableId, this.database), "Query Collector - " + tableName).start();
-					}
-				}
-			}
-
-			try {
-				Thread.sleep(Agent.COLLECTOR_SLEEP_TIME);
-			} catch (InterruptedException e) {
-				break;
-			}
-		}
-	}
-
-	private String getResolvedConnection(int zookeeperId) {
-		if (StringUtils.isBlank(this.connection)) {
-			return this.database.resolveConnectionString(zookeeperId);
-		} else {
-			return this.connection;
-		}
-	}
-
-	private int getZookeeperId() {
-		try {
-			return Integer.parseInt(this.database.getZookeeperId(this.zookeeperName));
-		} catch (NumberFormatException e) {
-			log.error("The returned zookeeperId is not a valid number", e);
-			return -1;
-		} catch (ZookeeperNameMissingException e) {
-			log.error(e.getMessage(), e);
-			return -1;
-		} catch (ZookeeperNameCollisionException e) {
-			log.error(e.getMessage(), e);
-			return -1;
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/query/QueryCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/query/QueryCollector.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/query/QueryCollector.java
deleted file mode 100644
index 72a36d4..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/query/QueryCollector.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.nearinfinity.agent.collectors.blur.query;
-
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.blur.thrift.generated.Blur.Iface;
-import org.apache.blur.thrift.generated.BlurQueryStatus;
-import org.apache.blur.thrift.generated.SimpleQuery;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.codehaus.jackson.map.ObjectMapper;
-
-import com.nearinfinity.agent.connections.blur.interfaces.QueryDatabaseInterface;
-import com.nearinfinity.agent.types.TimeHelper;
-
-public class QueryCollector implements Runnable {
-	private static final Log log = LogFactory.getLog(QueryCollector.class);
-
-	private final Iface blurConnection;
-	private final String tableName;
-	private final int tableId;
-	private final QueryDatabaseInterface database;
-
-	public QueryCollector(Iface connection, String tableName, int tableId, QueryDatabaseInterface database) {
-		this.blurConnection = connection;
-		this.tableName = tableName;
-		this.tableId = tableId;
-		this.database = database;
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public void run() {
-		Set<Long> currentQueries = new HashSet<Long>();
-		try {
-			currentQueries.addAll(blurConnection.queryStatusIdList(tableName));
-			//currentQueries.addAll(this.database.getRunningQueries());
-		} catch (Exception e) {
-			log.error("Unable to get the list of current queries [" + tableName + "]." + e.getMessage());
-			return;
-		}
-		
-		// Mark running queries that can't be found as complete - unknown
-		this.database.markOrphanedRunningQueriesComplete(CollectionUtils.subtract(this.database.getRunningQueries(), currentQueries));
-		
-
-		for (Long queryUUID : currentQueries) {
-			BlurQueryStatus status;
-			try {
-				status = blurConnection.queryStatusById(tableName, queryUUID);
-			} catch (Exception e) {
-				log.error("Unable to get query status for query [" + queryUUID + "]." + e.getMessage());
-				continue;
-			}
-
-			Map<String, Object> oldQuery = this.database.getQuery(this.tableId, queryUUID);
-
-			String times;
-			try {
-				times = new ObjectMapper().writeValueAsString(status.getCpuTimes());
-			} catch (Exception e) {
-				log.error("Unable to parse cpu times.", e);
-				times = null;
-			}
-
-			if (oldQuery == null) {
-				SimpleQuery query = status.getQuery().getSimpleQuery();
-				long startTimeLong = status.getQuery().getStartTime();
-
-				// Set the query creation time to now or given start time
-				Date startTime = (startTimeLong > 0) ? TimeHelper.getAdjustedTime(startTimeLong).getTime() : TimeHelper.now().getTime();
-
-				this.database.createQuery(status, query, times, startTime, this.tableId);
-			} else if (queryHasChanged(status, times, oldQuery)) {
-				this.database.updateQuery(status, times, (Integer) oldQuery.get("ID"));
-			}
-		}
-	}
-
-	private static boolean queryHasChanged(BlurQueryStatus blurQueryStatus, String timesJSON, Map<String, Object> oldQueryInfo) {
-		return blurQueryStatus.getState().getValue() == 0
-				|| !(timesJSON.equals(oldQueryInfo.get("TIMES"))
-						&& blurQueryStatus.getCompleteShards() == (Integer) oldQueryInfo.get("COMPLETE_SHARDS") && blurQueryStatus.getState()
-						.getValue() == (Integer) oldQueryInfo.get("STATE"));
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/SchemaCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/SchemaCollector.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/SchemaCollector.java
deleted file mode 100644
index 1b15ea8..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/SchemaCollector.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.nearinfinity.agent.collectors.blur.table;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
-import org.apache.blur.thrift.generated.Blur.Iface;
-import org.apache.blur.thrift.generated.BlurException;
-import org.apache.blur.thrift.generated.ColumnDefinition;
-import org.apache.blur.thrift.generated.ColumnFamilyDefinition;
-import org.apache.blur.thrift.generated.Schema;
-import org.apache.blur.thrift.generated.TableDescriptor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.springframework.dao.DataAccessException;
-
-import com.nearinfinity.agent.connections.blur.interfaces.TableDatabaseInterface;
-import com.nearinfinity.agent.exceptions.NullReturnedException;
-import com.nearinfinity.agent.types.Column;
-import com.nearinfinity.agent.types.Family;
-
-public class SchemaCollector implements Runnable {
-	private static final Log log = LogFactory.getLog(SchemaCollector.class);
-
-	private final Iface blurConnection;
-	private final String tableName;
-	private final int tableId;
-	private final TableDescriptor descriptor;
-	private final TableDatabaseInterface database;
-
-	public SchemaCollector(Iface connection, String tableName, int tableId, TableDescriptor descriptor, TableDatabaseInterface database) {
-		this.blurConnection = connection;
-		this.tableName = tableName;
-		this.tableId = tableId;
-		this.descriptor = descriptor;
-		this.database = database;
-	}
-
-	@Override
-	public void run() {
-		try {
-			Schema schema = null;
-			schema = blurConnection.schema(tableName);
-			if (schema == null || descriptor == null) {
-				throw new NullReturnedException("No Schema or Descriptor Defined!");
-			}
-
-			List<Family> columnDefs = getColumnDefinitions(schema);
-
-			AnalyzerDefinition analyzerDefinition = descriptor.getAnalyzerDefinition();
-			if (analyzerDefinition != null) {
-				Map<String, ColumnFamilyDefinition> columnFamilyDefinitions = analyzerDefinition.getColumnFamilyDefinitions();
-				ColumnDefinition analyzerDefaultDefinition = analyzerDefinition.getDefaultDefinition();
-				if (columnFamilyDefinitions == null) {
-					for (Family family : columnDefs) {
-						for (Column column : family.getColumns()) {
-							if (analyzerDefaultDefinition == null) {
-								column.setAnalyzer("UNKNOWN");
-							} else {
-								column.setAnalyzer(analyzerDefaultDefinition.getAnalyzerClassName());
-								column.setFullText(analyzerDefaultDefinition.isFullTextIndex());
-							}
-						}
-					}
-				} else {
-					for (Map.Entry<String, ColumnFamilyDefinition> describeEntry : columnFamilyDefinitions.entrySet()) {
-						Family family = new Family(describeEntry.getKey());
-						int familyIndex = columnDefs.indexOf(family);
-
-						if (familyIndex == -1) {
-							columnDefs.add(family);
-						} else {
-							family = columnDefs.get(familyIndex);
-						}
-
-						Map<String, ColumnDefinition> columnDefinitions = describeEntry.getValue().getColumnDefinitions();
-						ColumnDefinition columnDefaultDefinition = describeEntry.getValue().getDefaultDefinition();
-						if (columnDefinitions == null) {
-							for (Column column : family.getColumns()) {
-								if (columnDefaultDefinition == null && analyzerDefaultDefinition == null) {
-									column.setAnalyzer("UNKNOWN");
-								} else if (columnDefaultDefinition == null) {
-									column.setAnalyzer(analyzerDefaultDefinition.getAnalyzerClassName());
-									column.setFullText(analyzerDefaultDefinition.isFullTextIndex());
-								} else {
-									column.setAnalyzer(columnDefaultDefinition.getAnalyzerClassName());
-									column.setFullText(columnDefaultDefinition.isFullTextIndex());
-								}
-							}
-						} else {
-							for (Map.Entry<String, ColumnDefinition> columnDescription : columnDefinitions.entrySet()) {
-								Column column = new Column(columnDescription.getKey());
-								int columnIndex = family.getColumns().indexOf(column);
-
-								if (columnIndex == -1) {
-									family.getColumns().add(column);
-								} else {
-									column = family.getColumns().get(columnIndex);
-								}
-
-								column.setAnalyzer(columnDescription.getValue().getAnalyzerClassName());
-								column.setFullText(columnDescription.getValue().isFullTextIndex());
-							}
-						}
-					}
-				}
-			}
-			this.database.updateTableSchema(this.tableId, new ObjectMapper().writeValueAsString(columnDefs), this.descriptor
-					.getAnalyzerDefinition().getFullTextAnalyzerClassName());
-		} catch (BlurException e) {
-			log.error("Unable to get the shard schema for table [" + tableName + "].", e);
-		} catch (JsonProcessingException e) {
-			log.error("Unable to convert shard schema to json.", e);
-		} catch (DataAccessException e) {
-			log.error("An error occurred while writing the schema to the database.", e);
-		} catch (NullReturnedException e) {
-			log.error(e.getMessage(), e);
-		} catch (Exception e) {
-			log.error("An unknown error occurred in the TableSchemaCollector.", e);
-		}
-	}
-
-	private List<Family> getColumnDefinitions(final Schema schema) {
-		List<Family> columnDefs = new ArrayList<Family>();
-		Map<String, Set<String>> columnFamilies = schema.getColumnFamilies();
-		if (columnFamilies != null) {
-			for (Map.Entry<String, Set<String>> schemaEntry : columnFamilies.entrySet()) {
-				Family family = new Family(schemaEntry.getKey());
-				for (String columnName : schemaEntry.getValue()) {
-					Column column = new Column(columnName);
-					column.setLive(true);
-					family.getColumns().add(column);
-				}
-				columnDefs.add(family);
-			}
-		}
-		return columnDefs;
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/ServerCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/ServerCollector.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/ServerCollector.java
deleted file mode 100644
index c93433c..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/ServerCollector.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.nearinfinity.agent.collectors.blur.table;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.blur.thrift.generated.Blur.Iface;
-import org.apache.blur.thrift.generated.BlurException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.springframework.dao.DataAccessException;
-
-import com.nearinfinity.agent.connections.blur.interfaces.TableDatabaseInterface;
-import com.nearinfinity.agent.exceptions.NullReturnedException;
-
-public class ServerCollector implements Runnable {
-	private static final Log log = LogFactory.getLog(ServerCollector.class);
-
-	private final Iface blurConnection;
-	private final String tableName;
-	private final int tableId;
-	private final TableDatabaseInterface database;
-
-	public ServerCollector(Iface connection, String tableName, int tableId, TableDatabaseInterface database) {
-		this.blurConnection = connection;
-		this.tableName = tableName;
-		this.tableId = tableId;
-		this.database = database;
-	}
-
-	@Override
-	public void run() {
-		try {
-			Map<String, String> shardServerLayout = blurConnection.shardServerLayout(tableName);
-			if (shardServerLayout == null) {
-				throw new NullReturnedException("No server layout was returned!");
-			}
-			Map<String, ArrayList<String>> serverLayout = getServerLayout(shardServerLayout);
-			this.database.updateTableServer(tableId, new ObjectMapper().writeValueAsString(serverLayout));
-
-		} catch (BlurException e) {
-			log.error("Unable to get shard server layout for table [" + tableName + "].", e);
-		} catch (JsonProcessingException e) {
-			log.error("Unable to convert the shard layout to json.", e);
-		} catch (DataAccessException e) {
-			log.error("An error occurred while writing the server to the database.", e);
-		} catch (NullReturnedException e) {
-			log.error(e.getMessage(), e);
-		} catch (Exception e) {
-			log.error("An unknown error occurred in the TableServerCollector.", e);
-		}
-	}
-
-	private Map<String, ArrayList<String>> getServerLayout(Map<String, String> shardServerLayout) {
-		Map<String, ArrayList<String>> formattedShard = new HashMap<String, ArrayList<String>>();
-		for (String shard : shardServerLayout.keySet()) {
-			String host = shardServerLayout.get(shard);
-			if (formattedShard.get(host) != null) {
-				formattedShard.get(host).add(shard);
-			} else {
-				formattedShard.put(host, new ArrayList<String>(Arrays.asList(shard)));
-			}
-		}
-		return formattedShard;
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/StatsCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/StatsCollector.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/StatsCollector.java
deleted file mode 100644
index a92ee99..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/StatsCollector.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.nearinfinity.agent.collectors.blur.table;
-
-import org.apache.blur.thrift.generated.Blur.Iface;
-import org.apache.blur.thrift.generated.BlurException;
-import org.apache.blur.thrift.generated.TableStats;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.dao.DataAccessException;
-
-import com.nearinfinity.agent.connections.blur.interfaces.TableDatabaseInterface;
-import com.nearinfinity.agent.exceptions.NullReturnedException;
-
-public class StatsCollector implements Runnable {
-	private static final Log log = LogFactory.getLog(StatsCollector.class);
-
-	private final Iface blurConnection;
-	private final String tableName;
-	private final int tableId;
-	private final TableDatabaseInterface database;
-
-	public StatsCollector(Iface connection, String tableName, int tableId, TableDatabaseInterface database) {
-		this.blurConnection = connection;
-		this.tableName = tableName;
-		this.tableId = tableId;
-		this.database = database;
-	}
-
-	@Override
-	public void run() {
-		try {
-			TableStats tableStats = blurConnection.getTableStats(this.tableName);
-
-			if (tableStats == null) {
-				throw new NullReturnedException("No table statistics were returned!");
-			}
-
-			this.database.updateTableStats(tableId, tableStats.getBytes(), tableStats.getQueries(), tableStats.getRecordCount(),
-					tableStats.getRowCount());
-		} catch (BlurException e) {
-			log.error("Unable to get table stats for table [" + tableId + "].", e);
-		} catch (DataAccessException e) {
-			log.error("An error occurred while writing the server to the database.", e);
-		} catch (NullReturnedException e) {
-			log.error(e.getMessage(), e);
-		} catch (Exception e) {
-			log.error("An unknown error occurred in the TableServerCollector.", e);
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/TableCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/TableCollector.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/TableCollector.java
deleted file mode 100644
index f064016..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/TableCollector.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.nearinfinity.agent.collectors.blur.table;
-
-import org.apache.blur.thrift.generated.Blur.Iface;
-import org.apache.blur.thrift.generated.TableDescriptor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.nearinfinity.agent.connections.blur.interfaces.TableDatabaseInterface;
-
-public class TableCollector implements Runnable {
-	private static final Log log = LogFactory.getLog(TableCollector.class);
-
-	private final Iface blurConnection;
-	private final String tableName;
-	private final int tableId;
-	private final TableDatabaseInterface database;
-
-	public TableCollector(Iface connection, String tableName, int tableId, TableDatabaseInterface database) {
-		this.blurConnection = connection;
-		this.tableName = tableName;
-		this.database = database;
-		this.tableId = tableId;
-	}
-
-	@Override
-	public void run() {
-		try {
-			TableDescriptor descriptor;
-			try {
-				descriptor = blurConnection.describe(tableName);
-			} catch (Exception e) {
-				log.error("An error occured while trying to describe the table [" + tableName + "], skipping table", e);
-				return;
-			}
-
-			/* spawn the different table info collectors */
-			if (descriptor.isEnabled) {
-				new Thread(new SchemaCollector(this.blurConnection, this.tableName, this.tableId, descriptor, this.database),
-						"Table Schema Collector - " + this.tableName).start();
-			}
-			new Thread(new ServerCollector(this.blurConnection, this.tableName, this.tableId, this.database), "Table Server Collector - "
-					+ this.tableName).start();
-			new Thread(new StatsCollector(this.blurConnection, this.tableName, this.tableId, this.database), "Table Stats Collector - "
-					+ this.tableName).start();
-
-		} catch (Exception e) {
-			log.error("An unknown error occurred.", e);
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/hdfs/HdfsCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/hdfs/HdfsCollector.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/hdfs/HdfsCollector.java
deleted file mode 100644
index 4802799..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/hdfs/HdfsCollector.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.nearinfinity.agent.collectors.hdfs;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import com.nearinfinity.agent.Agent;
-import com.nearinfinity.agent.connections.hdfs.interfaces.HdfsDatabaseInterface;
-import com.nearinfinity.agent.exceptions.HdfsThreadException;
-
-public class HdfsCollector implements Runnable {
-	private static final Log log = LogFactory.getLog(HdfsCollector.class);
-
-	private final URI defaultUri;
-	private final String hdfsName;
-	private final String user;
-	private final HdfsDatabaseInterface databaseConnection;
-	private final boolean collectHdfs;
-
-	public HdfsCollector(final String hdfsName, final String defaultUri, final String thriftUri, final String user,
-			final List<String> activeCollectors, final HdfsDatabaseInterface databaseConnection) throws HdfsThreadException {
-		try {
-			this.defaultUri = new URI(defaultUri);
-			this.hdfsName = hdfsName;
-			this.user = user;
-			this.databaseConnection = databaseConnection;
-			this.collectHdfs = activeCollectors.contains("hdfs");
-
-			initializeHdfs(hdfsName, thriftUri);
-
-		} catch (URISyntaxException e) {
-			log.error(e.getMessage(), e);
-			throw new HdfsThreadException();
-		} catch (Exception e) {
-			log.error("An unkown error occured while creating the collector.", e);
-			throw new HdfsThreadException();
-		}
-	}
-
-	@Override
-	public void run() {
-		while (true) {
-			if (this.collectHdfs) {
-				new Thread(new HdfsStatsCollector(this.hdfsName, defaultUri, this.user, this.databaseConnection), "Hdfs Collector - "
-						+ this.hdfsName).start();
-			}
-
-			try {
-				Thread.sleep(Agent.COLLECTOR_SLEEP_TIME);
-			} catch (InterruptedException e) {
-				break;
-			}
-		}
-	}
-
-	private void initializeHdfs(String name, String thriftUri) throws URISyntaxException {
-		URI parsedThriftUri = new URI(thriftUri);
-		this.databaseConnection.setHdfsInfo(name, parsedThriftUri.getHost(), parsedThriftUri.getPort());
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatsCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatsCollector.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatsCollector.java
deleted file mode 100644
index 1e2558a..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatsCollector.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.nearinfinity.agent.collectors.hdfs;
-
-import java.io.IOException;
-import java.net.URI;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.hdfs.DistributedFileSystem;
-import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
-import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
-import org.springframework.dao.DataAccessException;
-
-import com.nearinfinity.agent.connections.hdfs.interfaces.HdfsDatabaseInterface;
-import com.nearinfinity.agent.exceptions.NullReturnedException;
-import com.nearinfinity.agent.types.TimeHelper;
-
-public class HdfsStatsCollector implements Runnable {
-	private final static Log log = LogFactory.getLog(HdfsStatsCollector.class);
-
-	private final String hdfsName;
-	private final URI uri;
-	private final String host;
-	private final int port;
-	private final String user;
-	private final HdfsDatabaseInterface database;
-
-	public HdfsStatsCollector(final String hdfsName, final URI uri, final String user, final HdfsDatabaseInterface database) {
-		this.uri = uri;
-		this.host = uri.getHost();
-		this.port = uri.getPort();
-		this.hdfsName = hdfsName;
-		this.user = user;
-		this.database = database;
-	}
-
-	@Override
-	public void run() {
-		try {
-			int hdfsId = this.database.getHdfsId(this.hdfsName);
-			if (hdfsId == -1) {
-				log.error("The HDFS [" + this.hdfsName + "] does not exist in the database");
-				return;
-			}
-
-			// Creates a filesystem connection (if a user is given
-			// then the filesystem can get additional information)
-			FileSystem fileSystem = (this.user != null) ? FileSystem.get(this.uri, new Configuration(), this.user) : FileSystem.get(this.uri,
-					new Configuration());
-
-			if (fileSystem instanceof DistributedFileSystem) {
-				DistributedFileSystem dfs = (DistributedFileSystem) fileSystem;
-
-				// TODO: Need to figure out how to do hadoop version check for this information.
-				//FsStatus ds = dfs.getStatus();
-				long capacity = -1;//ds.getCapacity();
-				long used = -1;//ds.getUsed();
-				long logical_used = used / dfs.getDefaultReplication();
-				long remaining = -1; //ds.getRemaining();
-				long presentCapacity = used + remaining;
-
-				long liveNodes = -1;
-				long deadNodes = -1;
-				long totalNodes = -1;
-
-				try {
-					DatanodeInfo[] live = dfs.getClient().datanodeReport(DatanodeReportType.LIVE);
-					DatanodeInfo[] dead = dfs.getClient().datanodeReport(DatanodeReportType.DEAD);
-
-					liveNodes = live.length;
-					deadNodes = dead.length;
-					totalNodes = liveNodes + deadNodes;
-				} catch (Exception e) {
-					log.warn("Access denied for user. Skipping node information.");
-				}
-
-				this.database.insertHdfsStats(capacity, presentCapacity, remaining, used, logical_used, (((1.0 * used) / presentCapacity) * 100),
-						dfs.getUnderReplicatedBlocksCount(), dfs.getCorruptBlocksCount(), dfs.getMissingBlocksCount(), totalNodes, liveNodes,
-						deadNodes, TimeHelper.now().getTime(), host, port, hdfsId);
-
-				dfs.close();
-			}
-		} catch (IOException e) {
-			log.error("An IO error occurred while communicating with the DFS.", e);
-		} catch (DataAccessException e) {
-			log.error("An error occurred while writing the HDFSStats to the DB.", e);
-		} catch (NullReturnedException e) {
-			log.error(e.getMessage(), e);
-		} catch (Exception e) {
-			log.error("An unknown error occurred in the CollectorManager.", e);
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ClusterCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ClusterCollector.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ClusterCollector.java
deleted file mode 100644
index f08cf15..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ClusterCollector.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.nearinfinity.agent.collectors.zookeeper;
-
-import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.ZooKeeper;
-import org.apache.zookeeper.data.Stat;
-
-import com.nearinfinity.agent.connections.zookeeper.interfaces.ClusterDatabaseInterface;
-
-public class ClusterCollector implements Runnable {
-	private static final Log log = LogFactory.getLog(ClusterCollector.class);
-
-	private final int zookeeperId;
-	private final ZooKeeper zookeeper;
-	private final ClusterDatabaseInterface database;
-
-	public ClusterCollector(int zookeeperId, ZooKeeper zookeeper, ClusterDatabaseInterface database) {
-		this.zookeeperId = zookeeperId;
-		this.zookeeper = zookeeper;
-		this.database = database;
-	}
-
-	@Override
-	public void run() {
-		List<String> onlineClusters;
-		try {
-			onlineClusters = zookeeper.getChildren("/blur/clusters", false);
-		} catch (Exception e) {
-			log.error("Error getting clusters from zookeeper in ClusterCollector.", e);
-			return;
-		}
-
-		for (String cluster : onlineClusters) {
-			try {
-				boolean safeMode = isClusterInSafeMode(cluster);
-				int clusterId = this.database.insertOrUpdateCluster(safeMode, cluster, zookeeperId);
-
-				new Thread(new ShardCollector(clusterId, cluster, this.zookeeper, this.database), "Shard Collector - " + cluster).start();
-				new Thread(new TableCollector(clusterId, cluster, this.zookeeper, this.database), "Table Collector - " + cluster).start();
-			} catch (KeeperException e) {
-				log.error("Error talking to zookeeper in ClusterCollector.", e);
-			} catch (InterruptedException e) {
-				log.error("Zookeeper session expired in ClusterCollector.", e);
-			}
-		}
-
-	}
-
-	private boolean isClusterInSafeMode(String cluster) throws KeeperException, InterruptedException {
-		String blurSafemodePath = "/blur/clusters/" + cluster + "/safemode";
-		Stat stat = this.zookeeper.exists(blurSafemodePath, false);
-		if (stat == null) {
-			return false;
-		}
-
-		byte[] data = this.zookeeper.getData(blurSafemodePath, false, stat);
-		if (data == null) {
-			return false;
-		}
-
-		long timestamp = Long.parseLong(new String(data));
-		long waitTime = timestamp - System.currentTimeMillis();
-		if (waitTime > 0) {
-			return true;
-		}
-		return false;
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ControllerCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ControllerCollector.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ControllerCollector.java
deleted file mode 100644
index 3a87497..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ControllerCollector.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.nearinfinity.agent.collectors.zookeeper;
-
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.ZooKeeper;
-
-import com.nearinfinity.agent.connections.zookeeper.interfaces.ControllerDatabaseInterface;
-import com.nearinfinity.agent.notifications.Notifier;
-
-public class ControllerCollector implements Runnable {
-	private static final Log log = LogFactory.getLog(ControllerCollector.class);
-
-	private final int zookeeperId;
-	private final ZooKeeper zookeeper;
-	private final ControllerDatabaseInterface database;
-
-	public ControllerCollector(int zookeeperId, ZooKeeper zookeeper, ControllerDatabaseInterface database) {
-		this.zookeeperId = zookeeperId;
-		this.zookeeper = zookeeper;
-		this.database = database;
-	}
-
-	@Override
-	public void run() {
-		try {
-			List<String> onlineControllers = this.zookeeper.getChildren("/blur/online-controller-nodes", false);
-			int recentlyOffline = this.database.markOfflineControllers(onlineControllers, this.zookeeperId);
-			if (recentlyOffline > 0) {
-				Notifier.getNotifier().notifyControllerOffline(this.database.getRecentOfflineControllerNames(recentlyOffline));
-			}
-			updateOnlineControllers(onlineControllers);
-		} catch (KeeperException e) {
-			log.error("Error talking to zookeeper in ControllerCollector.", e);
-		} catch (InterruptedException e) {
-			log.error("Zookeeper session expired in ControllerCollector.", e);
-		}
-
-	}
-
-	private void updateOnlineControllers(List<String> controllers) throws KeeperException, InterruptedException {
-		for (String controller : controllers) {
-			String blurVersion = "UNKNOWN";
-
-			byte[] b = this.zookeeper.getData("/blur/online-controller-nodes/" + controller, false, null);
-			if (b != null && b.length > 0) {
-				blurVersion = new String(b);
-			}
-
-			this.database.updateOnlineController(controller, zookeeperId, blurVersion);
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ShardCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ShardCollector.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ShardCollector.java
deleted file mode 100644
index c081478..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ShardCollector.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.nearinfinity.agent.collectors.zookeeper;
-
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.ZooKeeper;
-
-import com.nearinfinity.agent.connections.zookeeper.interfaces.ShardsDatabaseInterface;
-import com.nearinfinity.agent.notifications.Notifier;
-
-public class ShardCollector implements Runnable {
-	private static final Log log = LogFactory.getLog(ShardCollector.class);
-
-	private final int clusterId;
-	private final String clusterName;
-	private final ZooKeeper zookeeper;
-	private final ShardsDatabaseInterface database;
-
-	public ShardCollector(int clusterId, String clusterName, ZooKeeper zookeeper, ShardsDatabaseInterface database) {
-		this.clusterId = clusterId;
-		this.clusterName = clusterName;
-		this.zookeeper = zookeeper;
-		this.database = database;
-	}
-
-	@Override
-	public void run() {
-		try {
-			List<String> shards = this.zookeeper.getChildren("/blur/clusters/" + clusterName + "/online/shard-nodes", false);
-			int recentlyOffline = this.database.markOfflineShards(shards, this.clusterId);
-			if (recentlyOffline > 0) {
-				Notifier.getNotifier().notifyShardOffline(this.database.getRecentOfflineShardNames(recentlyOffline));
-			}
-			updateOnlineShards(shards);
-		} catch (KeeperException e) {
-			log.error("Error talking to zookeeper in ShardCollector.", e);
-		} catch (InterruptedException e) {
-			log.error("Zookeeper session expired in ShardCollector.", e);
-		}
-	}
-
-	private void updateOnlineShards(List<String> shards) throws KeeperException, InterruptedException {
-		for (String shard : shards) {
-			String blurVersion = "UNKNOWN";
-
-			byte[] b = this.zookeeper.getData("/blur/clusters/" + clusterName + "/online/shard-nodes/" + shard, false, null);
-			if (b != null && b.length > 0) {
-				blurVersion = new String(b);
-			}
-
-			this.database.updateOnlineShard(shard, this.clusterId, blurVersion);
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/TableCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/TableCollector.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/TableCollector.java
deleted file mode 100644
index f218a13..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/TableCollector.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.nearinfinity.agent.collectors.zookeeper;
-
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.ZooKeeper;
-
-import com.nearinfinity.agent.connections.zookeeper.interfaces.TableDatabaseInterface;
-
-public class TableCollector implements Runnable {
-	private static final Log log = LogFactory.getLog(TableCollector.class);
-
-	private final int clusterId;
-	private final String clusterName;
-	private final ZooKeeper zookeeper;
-	private final TableDatabaseInterface database;
-
-	public TableCollector(int clusterId, String clusterName, ZooKeeper zookeeper, TableDatabaseInterface database) {
-		this.clusterId = clusterId;
-		this.clusterName = clusterName;
-		this.zookeeper = zookeeper;
-		this.database = database;
-	}
-
-	@Override
-	public void run() {
-		try {
-			List<String> tables = this.zookeeper.getChildren("/blur/clusters/" + clusterName + "/tables", false);
-			this.database.markDeletedTables(tables, this.clusterId);
-			updateOnlineTables(tables);
-		} catch (KeeperException e) {
-			log.error("Error talking to zookeeper in TableCollector.", e);
-		} catch (InterruptedException e) {
-			log.error("Zookeeper session expired in TableCollector.", e);
-		}
-	}
-
-	private void updateOnlineTables(List<String> tables) throws KeeperException, InterruptedException {
-		for (String table : tables) {
-			String tablePath = "/blur/clusters/" + clusterName + "/tables/" + table;
-
-			String uri = new String(this.zookeeper.getData(tablePath + "/uri", false, null));
-			boolean enabled = this.zookeeper.getChildren(tablePath, false).contains("enabled");
-
-			this.database.updateOnlineTable(table, this.clusterId, uri, enabled);
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ZookeeperCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ZookeeperCollector.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ZookeeperCollector.java
deleted file mode 100644
index 107327e..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/zookeeper/ZookeeperCollector.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.nearinfinity.agent.collectors.zookeeper;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.URI;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.Watcher.Event.KeeperState;
-import org.apache.zookeeper.ZooKeeper;
-import org.codehaus.jackson.map.ObjectMapper;
-
-import com.nearinfinity.agent.Agent;
-import com.nearinfinity.agent.connections.zookeeper.interfaces.ZookeeperDatabaseInterface;
-import com.nearinfinity.agent.notifications.Notifier;
-
-public class ZookeeperCollector implements Runnable {
-	private static final Log log = LogFactory.getLog(ZookeeperCollector.class);
-
-	private ZooKeeper zookeeper;
-	private boolean connected;
-
-	private final String url;
-	private final String name;
-	private final int id;
-	private final ZookeeperDatabaseInterface database;
-
-	public ZookeeperCollector(String url, String name, String blurConnection, ZookeeperDatabaseInterface database) {
-		this.url = url;
-		this.name = name;
-		this.database = database;
-		this.id = database.insertOrUpdateZookeeper(name, url, blurConnection);
-	}
-
-	@Override
-	public void run() {
-		while (true) {
-			try {
-				if (!this.connected) {
-					this.zookeeper = new ZooKeeper(this.url, 3000, new Watcher() {
-						@Override
-						public void process(WatchedEvent event) {
-							KeeperState state = event.getState();
-							if (state == KeeperState.Disconnected || state == KeeperState.Expired) {
-								log.warn("Zookeeper [" + name + "] disconnected event.");
-								database.setZookeeperOffline(id);
-								Notifier.getNotifier().notifyZookeeperOffline(name);
-								connected = false;
-							} else if (state == KeeperState.SyncConnected) {
-								log.info("Zookeeper [" + name + "] session established.");
-								connected = true;
-							}
-						}
-					});
-				}
-			} catch (IOException e) {
-				log.error("A zookeeper [" + this.name + "] connection could not be created, waiting 30 seconds.");
-				// Sleep the thread for 30secs to give the Zookeeper a chance to become
-				// available.
-				try {
-					Thread.sleep(30000);
-					continue;
-				} catch (InterruptedException ex) {
-					log.info("Exiting Zookeeper [" + this.name + "] instance");
-					return;
-				}
-			}
-
-			if (this.connected) {
-				new Thread(new ControllerCollector(this.id, this.zookeeper, this.database), "Controller Collector - " + this.name).start();
-				new Thread(new ClusterCollector(this.id, this.zookeeper, this.database), "Cluster Collector - " + this.name).start();
-			}
-
-			testEnsembleHealth();
-
-			try {
-				Thread.sleep(Agent.COLLECTOR_SLEEP_TIME);
-			} catch (InterruptedException e) {
-				log.info("Exiting Zookeeper [" + this.name + "] instance");
-				return;
-			}
-		}
-	}
-
-	private void testEnsembleHealth() {
-		String[] connections = this.url.split(",");
-		List<String> onlineZookeepers = new ArrayList<String>();
-		for (String connection : connections) {
-			try {
-				URI parsedConnection = new URI("my://" + connection);
-				String host = parsedConnection.getHost();
-				int port = parsedConnection.getPort() >= 0 ? parsedConnection.getPort() : 2181;
-				byte[] reqBytes = new byte[4];
-				ByteBuffer req = ByteBuffer.wrap(reqBytes);
-				req.putInt(ByteBuffer.wrap("ruok".getBytes()).getInt());
-				Socket socket = new Socket();
-				socket.setSoLinger(false, 10);
-				socket.setSoTimeout(20000);
-				parsedConnection.getPort();
-				socket.connect(new InetSocketAddress(host, port));
-
-				InputStream response = socket.getInputStream();
-				OutputStream question = socket.getOutputStream();
-
-				question.write(reqBytes);
-
-				byte[] resBytes = new byte[4];
-
-				response.read(resBytes);
-				String status = new String(resBytes);
-				if (status.equals("imok")) {
-					onlineZookeepers.add(connection);
-				}
-				socket.close();
-				response.close();
-				question.close();
-			} catch (Exception e) {
-				log.error("A connection to " + connection + " could not be made.", e);
-			}
-		}
-		try {
-			if (connections.length == onlineZookeepers.size()){
-				this.database.setZookeeperOnline(id);
-			} else if (connections.length < onlineZookeepers.size() * 2) {
-				this.database.setZookeeperWarning(this.id);
-			} else if (this.connected){
-				this.database.setZookeeperFailure(this.id);
-			} else {
-				this.database.setZookeeperOffline(this.id);
-			}
-			this.database.setOnlineEnsembleNodes(new ObjectMapper().writeValueAsString(onlineZookeepers), this.id);
-		} catch (Exception e) {
-			log.error("The online ensemble nodes array could not be created, writing that they are all offline!");
-			this.database.setOnlineEnsembleNodes("{}", this.id);
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1485db70/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/JdbcConnection.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/JdbcConnection.java b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/JdbcConnection.java
deleted file mode 100644
index 3804c89..0000000
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/JdbcConnection.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.nearinfinity.agent.connections;
-
-import java.util.Properties;
-
-import org.apache.commons.dbcp.BasicDataSource;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-public class JdbcConnection {
-	public static JdbcTemplate createDBConnection(Properties props) {
-		String url = props.getProperty("store.url");
-		BasicDataSource dataSource = new BasicDataSource();
-		dataSource.setDriverClassName("com.mysql.jdbc.Driver");
-		dataSource.setUrl(url);
-		dataSource.setUsername(props.getProperty("store.user"));
-		dataSource.setPassword(props.getProperty("store.password"));
-		dataSource.setMaxActive(80);
-		dataSource.setMinIdle(2);
-		dataSource.setMaxWait(10000);
-		dataSource.setMaxIdle(-1);
-		dataSource.setRemoveAbandoned(true);
-		dataSource.setRemoveAbandonedTimeout(60);
-		dataSource.setDefaultAutoCommit(true);
-
-		return new JdbcTemplate(dataSource);
-	}
-}


Mime
View raw message