6 files changed, 202 insertions, 46 deletions

diff --git a/databases/cassandra/Makefile b/databases/cassandra/Makefile
index 2746cd7e9b99..95ffafc247df 100644
--- a/databases/cassandra/Makefile
+++ b/databases/cassandra/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cassandra
-PORTVERSION=	0.8.0
+PORTVERSION=	0.8.4
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}
@@ -16,12 +16,27 @@ EXTRACT_SUFX=	-bin.tar.gz
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Open source distributed database management system
 
+LICENSE=	ASL
+
 JAVA_VERSION=	1.6+
-NO_BUILD=	yes
 USE_JAVA=	yes
+USE_RC_SUBR=	cassandra
+
+CONFIGS=	cassandra.yaml log4j-server.properties access.properties \
+		log4j-tools.properties passwd.properties \
+		cassandra-topology.properties
+
+do-build:
+.for i in ${CONFIGS}
+	@${MV} ${WRKSRC}/conf/${i} ${WRKSRC}/conf/${i}.sample
+.endfor
 
 do-install:
 	@${MKDIR} ${DATADIR}
 	@${CP} -R ${WRKSRC}/* ${DATADIR}
+	@${RM} ${DATADIR}/bin/*.bat
+
+post-install:
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/databases/cassandra/distinfo b/databases/cassandra/distinfo
index aef18decef80..e35f51c6fabd 100644
--- a/databases/cassandra/distinfo
+++ b/databases/cassandra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-cassandra-0.8.0-bin.tar.gz) = a6f9706dd10c78e322ce26a57ab36d5f66cfc210c25ffd08b5ec2e793914b329
-SIZE (apache-cassandra-0.8.0-bin.tar.gz) = 10025259
+SHA256 (apache-cassandra-0.8.4-bin.tar.gz) = cb3e2c708d2afcd01cf6458f7601b0174ccb26bb6238a0cc3cae1f9eb5da80d7
+SIZE (apache-cassandra-0.8.4-bin.tar.gz) = 10223467
diff --git a/databases/cassandra/files/cassandra.in b/databases/cassandra/files/cassandra.in
new file mode 100644
index 000000000000..f755e595ea08
--- /dev/null
+++ b/databases/cassandra/files/cassandra.in
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# Copyright (c) 2011, Radim Kolar
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without 
+# modification, are permitted provided that the following conditions are met: 
+# 
+#  * Redistributions of source code must retain the above copyright notice, 
+#    this list of conditions and the following disclaimer. 
+#  * Redistributions in binary form must reproduce the above copyright 
+#    notice, this list of conditions and the following disclaimer in the 
+#    documentation and/or other materials provided with the distribution. 
+# 
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY 
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY 
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
+# DAMAGE. 
+
+# PROVIDE: cassandra
+# KEYWORD: shutdown
+#
+# $FreeBSD$
+
+. /etc/rc.subr
+
+name="cassandra"
+
+cassandra_enable=${cassandra_enable:-"NO"}
+cassandra_vmargs=${cassandra_vmargs:-"-XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:+CMSIncrementalDutyCycle=10"}
+cassandra_memory=${cassandra_memory:-"1000m"}
+cassandra_newgen=${cassandra_newgen:-"300m"}
+command=%%DATADIR%%/bin/cassandra
+command_args="-p /var/run/cassandra.pid >/dev/null"
+procname="java"
+pidfile=/var/run/cassandra.pid
+
+rcvar=`set_rcvar`
+load_rc_config $name
+export MAX_HEAP_SIZE="$cassandra_memory"
+export HEAP_NEWSIZE="$cassandra_newgen"
+run_rc_command "$1"
diff --git a/databases/cassandra/pkg-deinstall b/databases/cassandra/pkg-deinstall
new file mode 100644
index 000000000000..403e74b34da8
--- /dev/null
+++ b/databases/cassandra/pkg-deinstall
@@ -0,0 +1,15 @@
+#! /bin/sh
+#
+# Removes unchanged configuration files
+#
+if [ "$2" = "DEINSTALL" ]; then
+   if [ ! -d $PKG_PREFIX/share/cassandra/conf ]; then exit 1; fi
+   cd $PKG_PREFIX/share/cassandra/conf
+   for cfgfile in cassandra.yaml log4j-server.properties access.properties \
+		log4j-tools.properties passwd.properties \
+		cassandra-topology.properties; do 
+       if cmp -s $cfgfile.sample $cfgfile; then
+          rm $cfgfile
+       fi
+   done
+fi
diff --git a/databases/cassandra/pkg-install b/databases/cassandra/pkg-install
new file mode 100644
index 000000000000..a52cc19975b4
--- /dev/null
+++ b/databases/cassandra/pkg-install
@@ -0,0 +1,16 @@
+#! /bin/sh
+#
+# Copy sample cassandra config files to real ones if real ones does not exists
+#
+if [ "$2" = "POST-INSTALL" ]; then
+   if [ ! -d $PKG_PREFIX/share/cassandra/conf ]; then exit 1; fi
+   umask 027
+   cd $PKG_PREFIX/share/cassandra/conf
+   for cfgfile in cassandra.yaml log4j-server.properties access.properties \
+		log4j-tools.properties passwd.properties \
+		cassandra-topology.properties; do 
+       if [ ! -f $cfgfile ]; then
+           cp -p $cfgfile.sample $cfgfile
+       fi
+   done
+fi
diff --git a/databases/cassandra/pkg-plist b/databases/cassandra/pkg-plist
index e1af21d8955c..7f4dc95082e5 100644
--- a/databases/cassandra/pkg-plist
+++ b/databases/cassandra/pkg-plist
@@ -6,26 +6,21 @@
 %%DATADIR%%/README.txt
 %%DATADIR%%/bin/cassandra
 %%DATADIR%%/bin/cassandra-cli
-%%DATADIR%%/bin/cassandra-cli.bat
-%%DATADIR%%/bin/cassandra.bat
 %%DATADIR%%/bin/cassandra.in.sh
 %%DATADIR%%/bin/json2sstable
-%%DATADIR%%/bin/json2sstable.bat
 %%DATADIR%%/bin/nodetool
-%%DATADIR%%/bin/nodetool.bat
 %%DATADIR%%/bin/sstable2json
-%%DATADIR%%/bin/sstable2json.bat
 %%DATADIR%%/bin/sstablekeys
-%%DATADIR%%/bin/sstablekeys.bat
+%%DATADIR%%/bin/sstableloader
 %%DATADIR%%/bin/stop-server
 %%DATADIR%%/conf/README.txt
-%%DATADIR%%/conf/access.properties
+%%DATADIR%%/conf/access.properties.sample
 %%DATADIR%%/conf/cassandra-env.sh
-%%DATADIR%%/conf/cassandra-topology.properties
-%%DATADIR%%/conf/cassandra.yaml
-%%DATADIR%%/conf/log4j-server.properties
-%%DATADIR%%/conf/log4j-tools.properties
-%%DATADIR%%/conf/passwd.properties
+%%DATADIR%%/conf/cassandra-topology.properties.sample
+%%DATADIR%%/conf/cassandra.yaml.sample
+%%DATADIR%%/conf/log4j-server.properties.sample
+%%DATADIR%%/conf/log4j-tools.properties.sample
+%%DATADIR%%/conf/passwd.properties.sample
 %%DATADIR%%/conf/schema-sample.txt
 %%DATADIR%%/interface/cassandra.thrift
 %%DATADIR%%/javadoc/allclasses-frame.html
@@ -183,12 +178,19 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/config/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/config/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/config/package-use.html
-%%DATADIR%%/javadoc/org/apache/cassandra/cql/BatchUpdateStatement.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/AbstractModification.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/AlterTableStatement.OperationType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/AlterTableStatement.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/Attributes.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/BatchStatement.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/CQLStatement.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/CreateColumnFamilyStatement.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/CreateIndexStatement.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/CreateKeyspaceStatement.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/DeleteStatement.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/DropIndexStatement.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/Operation.OperationType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/Operation.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/QueryProcessor.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/Relation.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/SelectExpression.html
@@ -197,12 +199,19 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/Term.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/UpdateStatement.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/WhereClause.html
-%%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/BatchUpdateStatement.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/AbstractModification.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/AlterTableStatement.OperationType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/AlterTableStatement.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/Attributes.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/BatchStatement.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/CQLStatement.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/CreateColumnFamilyStatement.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/CreateIndexStatement.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/CreateKeyspaceStatement.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/DeleteStatement.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/DropIndexStatement.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/Operation.OperationType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/Operation.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/QueryProcessor.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/Relation.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use/SelectExpression.html
@@ -227,8 +236,6 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/ColumnFamilyType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/ColumnIndexer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/ColumnSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/CompactionManager.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/CompactionManagerMBean.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/CounterColumn.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/CounterMutation.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/CounterMutationVerbHandler.html
@@ -236,10 +243,10 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/DBConstants.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/DataTracker.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/DecoratedKey.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/DefinitionsAnnounceVerbHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/DefinitionsUpdateResponseVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/DefinitionsUpdateVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/DefsTable.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/DeletedColumn.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/EchoedRow.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/ExpiringColumn.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/HintedHandOffManager.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/HintedHandOffManagerMBean.html
@@ -290,8 +297,6 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ColumnFamilyType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ColumnIndexer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ColumnSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/CompactionManager.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/CompactionManagerMBean.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/CounterColumn.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/CounterMutation.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/CounterMutationVerbHandler.html
@@ -299,10 +304,10 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/DBConstants.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/DataTracker.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/DecoratedKey.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/DefinitionsAnnounceVerbHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/DefinitionsUpdateResponseVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/DefinitionsUpdateVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/DefsTable.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/DeletedColumn.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/EchoedRow.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ExpiringColumn.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/HintedHandOffManager.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/HintedHandOffManagerMBean.html
@@ -375,6 +380,30 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/package-use.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/AbstractCompactedRow.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/CompactionController.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/CompactionInfo.Holder.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/CompactionInfo.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/CompactionIterator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/CompactionManager.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/CompactionManagerMBean.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/CompactionType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/LazilyCompactedRow.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/PrecompactedRow.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/class-use/AbstractCompactedRow.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/class-use/CompactionController.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/class-use/CompactionInfo.Holder.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/class-use/CompactionInfo.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/class-use/CompactionIterator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/class-use/CompactionManager.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/class-use/CompactionManagerMBean.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/class-use/CompactionType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/class-use/LazilyCompactedRow.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/class-use/PrecompactedRow.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/package-frame.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/package-summary.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/package-tree.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/package-use.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/context/CounterContext.ContextState.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/context/CounterContext.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/context/IContext.ContextRelationship.html
@@ -404,31 +433,51 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/filter/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/filter/package-use.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/AbstractCommutativeType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/AbstractCompositeType.ParsedComparator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/AbstractCompositeType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/AbstractType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/AbstractUUIDType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/AsciiType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/BooleanType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/BytesType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/CompositeType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/CounterColumnType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/DateType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/DoubleType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/DynamicCompositeType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/FloatType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/IntegerType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/LexicalUUIDType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/LocalByPartionerType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/LongType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/MarshalException.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/ReversedType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/TimeUUIDType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/TypeParser.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/UTF8Type.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/UUIDType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/AbstractCommutativeType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/AbstractCompositeType.ParsedComparator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/AbstractCompositeType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/AbstractType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/AbstractUUIDType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/AsciiType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/BooleanType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/BytesType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/CompositeType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/CounterColumnType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/DateType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/DoubleType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/DynamicCompositeType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/FloatType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/IntegerType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/LexicalUUIDType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/LocalByPartionerType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/LongType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/MarshalException.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/ReversedType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/TimeUUIDType.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/TypeParser.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/UTF8Type.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/UUIDType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/package-frame.html
@@ -555,38 +604,23 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/hadoop/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/hadoop/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/hadoop/package-use.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/AbstractCompactedRow.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/CompactionController.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/CompactionInfo.Holder.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/CompactionInfo.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/CompactionIterator.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/CompactionType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/DeletionService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/IColumnSerializer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/ICompactSerializer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/ICompactSerializer2.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/ICompactSerializer3.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/LazilyCompactedRow.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/PrecompactedRow.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/SerDeUtils.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/AbstractCompactedRow.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/CompactionController.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/CompactionInfo.Holder.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/CompactionInfo.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/CompactionIterator.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/CompactionType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/DeletionService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/IColumnSerializer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/ICompactSerializer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/ICompactSerializer2.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/ICompactSerializer3.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/LazilyCompactedRow.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/PrecompactedRow.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/SerDeUtils.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/package-frame.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/package-use.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/BloomFilterTracker.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/Component.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/Descriptor.html
@@ -601,12 +635,19 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableBoundedScanner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableDeletingReference.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableIdentityIterator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableLoader.Client.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableLoader.LoaderFuture.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableLoader.OutputHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableLoader.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableReader.Operator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableReader.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableScanner.KeyScanningIterator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableScanner.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableSimpleWriter.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableWriter.Builder.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/SSTableWriter.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/AbstractSSTableSimpleWriter.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/BloomFilterTracker.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/Component.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/Descriptor.html
@@ -621,10 +662,16 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableBoundedScanner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableDeletingReference.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableIdentityIterator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableLoader.Client.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableLoader.LoaderFuture.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableLoader.OutputHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableLoader.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableReader.Operator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableReader.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableScanner.KeyScanningIterator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableScanner.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableSimpleUnsortedWriter.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableSimpleWriter.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableWriter.Builder.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/SSTableWriter.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/package-frame.html
@@ -797,7 +844,6 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/service/AbstractCassandraDaemon.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/AbstractRowResolver.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/AbstractWriteResponseHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/service/AntiEntropyService.Differencer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/AntiEntropyService.TreeRequest.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/AntiEntropyService.TreeRequestVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/AntiEntropyService.TreeResponseVerbHandler.html
@@ -823,6 +869,7 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/service/RepairCallback.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/RowDigestResolver.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/RowRepairResolver.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/SocketSessionManagementService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/StorageLoadBalancer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/StorageProxy.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/StorageProxyMBean.html
@@ -835,7 +882,6 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AbstractCassandraDaemon.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AbstractRowResolver.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AbstractWriteResponseHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AntiEntropyService.Differencer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AntiEntropyService.TreeRequest.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AntiEntropyService.TreeRequestVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AntiEntropyService.TreeResponseVerbHandler.html
@@ -861,6 +907,7 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/RepairCallback.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/RowDigestResolver.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/RowRepairResolver.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/SocketSessionManagementService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/StorageLoadBalancer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/StorageProxy.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/StorageProxyMBean.html
@@ -1103,6 +1150,10 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/CqlResultType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/CqlRow._Fields.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/CqlRow.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/CustomTHsHaServer.Invocation.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/CustomTHsHaServer.SelectorThread.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/CustomTHsHaServer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/CustomTNonBlockingServer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/CustomTThreadPoolServer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/Deletion._Fields.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/Deletion.html
@@ -1136,6 +1187,7 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/SuperColumn.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/TBinaryProtocol.Factory.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/TBinaryProtocol.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/TCustomNonblockingServerSocket.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/TCustomServerSocket.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/ThriftValidation.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/TimedOutException._Fields.html
@@ -1340,6 +1392,10 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/CqlResultType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/CqlRow._Fields.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/CqlRow.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/CustomTHsHaServer.Invocation.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/CustomTHsHaServer.SelectorThread.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/CustomTHsHaServer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/CustomTNonBlockingServer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/CustomTThreadPoolServer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/Deletion._Fields.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/Deletion.html
@@ -1373,6 +1429,7 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/SuperColumn.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/TBinaryProtocol.Factory.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/TBinaryProtocol.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/TCustomNonblockingServerSocket.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/TCustomServerSocket.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/ThriftValidation.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/TimedOutException._Fields.html
@@ -1385,12 +1442,14 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/thrift/package-use.html
+%%DATADIR%%/javadoc/org/apache/cassandra/tools/BulkLoader.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/GetVersion.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/NodeCmd.NodeCommand.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/NodeCmd.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/NodeProbe.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/SSTableExport.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/SSTableImport.html
+%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/BulkLoader.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/GetVersion.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/NodeCmd.NodeCommand.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/NodeCmd.html
@@ -1493,8 +1552,8 @@
 %%DATADIR%%/javadoc/serialized-form.html
 %%DATADIR%%/javadoc/stylesheet.css
 %%DATADIR%%/lib/antlr-3.2.jar
-%%DATADIR%%/lib/apache-cassandra-0.8.0.jar
-%%DATADIR%%/lib/apache-cassandra-thrift-0.8.0.jar
+%%DATADIR%%/lib/apache-cassandra-0.8.4.jar
+%%DATADIR%%/lib/apache-cassandra-thrift-0.8.4.jar
 %%DATADIR%%/lib/avro-1.4.0-fixes.jar
 %%DATADIR%%/lib/avro-1.4.0-sources-fixes.jar
 %%DATADIR%%/lib/commons-cli-1.1.jar
@@ -1590,6 +1649,8 @@
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db/columniterator/class-use
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db/columniterator
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db/compaction/class-use
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db/compaction
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/cql/class-use