commit 2.6.0

.classpath

@@ -5,7 +5,8 @@
 	<classpathentry kind="lib" path="lib/emma_ant.jar"/>
 	<classpathentry kind="lib" path="lib/emma.jar"/>
 	<classpathentry kind="lib" path="lib/junit.jar"/>
-	<classpathentry kind="lib" path="lib/log4j.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j-api-1.6.1.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j-simple-1.6.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -11,3 +11,7 @@ dist/
 scratch/
 .cachedir/
 memcached-release*
+/java_memcached-release_3.0.0.jar
+/java_memcached-release_2.6.0.zip
+/java_memcached-release_2.6.0.jar
+/java_memcached-release_test_2.6.0.jar

README

@@ -1,4 +1,18 @@
 #Author Xingen Wang (new.root@gmail.com)
+
+Release 2.6.0:
+add slf4j logger support.
+because compress is so slow, we remove this feature in this release.
+we also remove error handler feature and classloader feature in this release.
+fix issue 19.
+
+TODO:
+We will add SASL support in next version.
+Perhaps, we will get rid of the direct buffer, since it cause OutOfMemoryError.
+
+
+
+Release 2.5.x:
 This is a performance branch for the whalin memcached java client, 
 which was first maintained by Greg Whalin and perhaps the most 
 popular memcached java client in past years. While in recent years,

build.properties

@@ -33,9 +33,10 @@ build.dir=classes
 test.build.dir=testclasses
 build.instr.dir=classesinstr
 project=java_memcached-release
-ver=2.5.3
+ver=2.6.0
 junit.jar=lib/junit.jar
-log4j.jar=lib/log4j.jar
+slf4japi.jar=lib/slf4j-api-1.6.1.jar
+slf4jsimple.jar=lib/slf4j-simple-1.6.1.jar
 emma.dir=lib
 emma.enabled=true
 report.dir=report

build.xml

@@ -27,16 +27,15 @@
 		  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 		  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
-<project name="schooner_memcached_client" default="jar" basedir=".">
+<project name="schooner_memcached_client" default="zip" basedir=".">
 	<property file="build.properties" />
 	<path id="emma.lib">
 		<pathelement location="${emma.dir}/emma.jar" />
 		<pathelement location="${emma.dir}/emma_ant.jar" />
 	</path>
 	<taskdef resource="emma_ant.properties" classpathref="emma.lib" />
-	<path id="test.classpath">
-		<pathelement location="${junit.jar}" />
-		<pathelement location="${log4j.jar}" />
+	<path id="build.classpath">
+		<fileset dir="${basedir}/lib" includes="*.jar" />
 	</path>
 	<target name="clean">
 		<delete dir="${build.dir}" />
@@ -47,13 +46,19 @@
 	<target name="compile" depends="clean">
 		<mkdir dir="${build.dir}" />
 		<mkdir dir="${test.build.dir}" />
-		<javac optimize="yes" srcdir="${src.dir}" destdir="${build.dir}" deprecation="true" target="1.5" source="1.5" nowarn="true" />
+		<javac optimize="yes" srcdir="${src.dir}" destdir="${build.dir}" deprecation="true" target="1.5" source="1.5" nowarn="true" classpathref="build.classpath" />
 		<javac optimize="yes" srcdir="${test.dir}" destdir="${test.build.dir}" deprecation="true" target="1.5" source="1.5" nowarn="true">
-			<classpath refid="test.classpath" />
+			<classpath refid="build.classpath" />
 			<classpath path="${build.dir}" />
 		</javac>
 	</target>
-
+	<target name="zip" depends="jar">
+		<zip destfile="${project}_${ver}.zip" basedir=".">
+			<include name="${project}_${ver}.jar" />
+			<fileset dir="lib" includes="slf4j*.jar" />
+			<include name="README" />
+		</zip>
+	</target>
 	<target name="jar">
 		<antcall target="clean" />
 		<antcall target="compile" />

doc/TODO.txt

@@ -1,6 +1,3 @@
 To Do:
-- removeMulti support
 - Increase performance for UDP protocol by decreasing the latency time.
 - Give performance test report for UDP protocol.
-- Try to support big data in windows platform, seems the null bug is caused by jre.
-- dynamic test for loadMulti.