Merge pull request #1 from odaira/plugin-distribution

Plugin distribution

.gitmodules

@@ -2,11 +2,3 @@
 	path = cassandra
 	url = git://git.apache.org/cassandra.git
 	ignore = dirty
-[submodule "capisim"]
-	path = capisim
-	url = https://github.com/bedrisendir/capisim
-	ignore = dirty
-[submodule "YCSB"]
-	path = YCSB
-	url = https://github.com/brianfrankcooper/YCSB
-	ignore = dirty

build.xml

@@ -6,34 +6,25 @@
 	<property name="cassandra.build.lib" value="${cassandra}/lib" />
 	<property name="cassandra.build.dir.lib" value="${cassandra}/build/lib" />
 
-	<property name="capi" value="capisim" />
-	<property name="capi.build.lib" value="${capi}/capiblock.jar" />
+	<property name="capiblock.lib" value="lib/capiblock.jar" />
 
-	<property name="capi.rowcache.jar" value="dist/capi.rowcache.jar" />
+	<property name="capi.rowcache.jar" value="dist/capi-rowcache.jar" />
 	<property name="capi.rowcache.build.dir" value="bin" />
 
 	<property name="debuglevel" value="source,lines,vars" />
 
 	<target depends="build-subprojects,build-project" name="build" />
 
 	<target name="clean">
-		<delete dir="capi.rowcache.build.dir/*" />
-		<delete file="${capi.build.lib}" />
+		<delete dir="${capi.rowcache.build.dir}" />
 	</target>
 
 	<target name="cleanall" depends="clean">
-		<exec dir="YCSB" executable="mvn">
-			<arg value="clean" />
-		</exec>
 		<ant dir="${cassandra}" target="clean" />
 	</target>
 
 	<target name="build-subprojects">
 		<ant dir="${cassandra}" target="build" />
-		<ant dir="${capi}" target="build" />
-		<exec dir="YCSB" executable="mvn">
-			<arg value="compile" />
-		</exec>
 	</target>
 
 	<path id="cassandra.classpath">
@@ -51,10 +42,8 @@
 		<mkdir dir="${capi.rowcache.build.dir}"/>
 		<javac debug="true" debuglevel="${debuglevel}" srcdir="src" destdir="${capi.rowcache.build.dir}">
 			<classpath refid="cassandra.classpath" />
-			<classpath>
-				<fileset dir="./" includes="${capi.build.lib}" />
-			</classpath>
 			<classpath path="${cassandra.bin}" />
+			<classpath path="${capiblock.lib}" />
 		</javac>
 		<jar destfile="${capi.rowcache.jar}" basedir="${capi.rowcache.build.dir}" />
 	</target>