From 06960ed9b4164a09452b86bfbed760f80e6cac3f Mon Sep 17 00:00:00 2001 From: Greg Whalin Date: Mon, 17 Mar 2008 03:22:26 +0000 Subject: [PATCH] rename package and class name to more sane values --- build.xml | 70 +++++++++---------- .../memcached/ByteBufArrayInputStream.java | 2 +- .../memcached/ContextObjectInputStream.java | 2 +- src/com/whalin/memcached/ErrorHandler.java | 2 +- src/com/whalin/memcached/LineInputStream.java | 2 +- src/com/whalin/memcached/Logger.java | 2 +- src/com/whalin/memcached/MemCachedClient.java | 48 ++++++------- src/com/whalin/memcached/NativeHandler.java | 54 +++++++------- .../whalin/memcached/NestedIOException.java | 2 +- src/com/whalin/memcached/SockIOPool.java | 2 +- .../whalin/memcached/test/MemCachedBench.java | 12 ++-- .../whalin/memcached/test/MemCachedTest.java | 14 ++-- .../whalin/memcached/test/TestMemcached.java | 19 +++-- src/com/whalin/memcached/test/UnitTests.java | 14 ++-- 14 files changed, 122 insertions(+), 123 deletions(-) diff --git a/build.xml b/build.xml index 27ebffb..78761a7 100644 --- a/build.xml +++ b/build.xml @@ -1,15 +1,15 @@ - + - + - + @@ -18,62 +18,62 @@ - - - + + + - - - - + + + + - + - - - - - - - + + + + + + + - - - - - + + + + + - + - + - + - + - + - + @@ -81,12 +81,12 @@ - + - - + - + diff --git a/src/com/whalin/memcached/ByteBufArrayInputStream.java b/src/com/whalin/memcached/ByteBufArrayInputStream.java index 30c117b..4b90b73 100644 --- a/src/com/whalin/memcached/ByteBufArrayInputStream.java +++ b/src/com/whalin/memcached/ByteBufArrayInputStream.java @@ -16,7 +16,7 @@ * @author greg whalin * @version 2.0 */ -package com.danga.MemCached; +package com.whalin.memcached; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/com/whalin/memcached/ContextObjectInputStream.java b/src/com/whalin/memcached/ContextObjectInputStream.java index 33e84b7..cdd8197 100644 --- a/src/com/whalin/memcached/ContextObjectInputStream.java +++ b/src/com/whalin/memcached/ContextObjectInputStream.java @@ -22,7 +22,7 @@ * @author Vin Chawla * @version 2.0 */ -package com.danga.MemCached; +package com.whalin.memcached; import java.util.*; import java.util.zip.*; diff --git a/src/com/whalin/memcached/ErrorHandler.java b/src/com/whalin/memcached/ErrorHandler.java index b3573dd..31e0be9 100644 --- a/src/com/whalin/memcached/ErrorHandler.java +++ b/src/com/whalin/memcached/ErrorHandler.java @@ -21,7 +21,7 @@ * @author Dan Zivkovic * @version 2.0 */ -package com.danga.MemCached; +package com.whalin.memcached; public interface ErrorHandler { diff --git a/src/com/whalin/memcached/LineInputStream.java b/src/com/whalin/memcached/LineInputStream.java index ed51427..6a2ae86 100644 --- a/src/com/whalin/memcached/LineInputStream.java +++ b/src/com/whalin/memcached/LineInputStream.java @@ -17,7 +17,7 @@ * @author greg whalin * @version 2.0 */ -package com.danga.MemCached; +package com.whalin.memcached; import java.io.IOException; diff --git a/src/com/whalin/memcached/Logger.java b/src/com/whalin/memcached/Logger.java index 6e42a33..9699c71 100644 --- a/src/com/whalin/memcached/Logger.java +++ b/src/com/whalin/memcached/Logger.java @@ -17,7 +17,7 @@ * @author Greg Whalin * @version 2.0 */ -package com.danga.MemCached; +package com.whalin.memcached; import java.util.*; diff --git a/src/com/whalin/memcached/MemCachedClient.java b/src/com/whalin/memcached/MemCachedClient.java index adfc197..efceebe 100644 --- a/src/com/whalin/memcached/MemCachedClient.java +++ b/src/com/whalin/memcached/MemCachedClient.java @@ -1,5 +1,5 @@ /** - * MemCached client for Java + * Memcached client for Java * Copyright (c) 2008 Greg Whalin * All rights reserved. * @@ -17,7 +17,7 @@ * @author Greg Whalin * @version 2.0 */ -package com.danga.MemCached; +package com.whalin.memcached; import java.util.*; import java.util.zip.*; @@ -45,7 +45,7 @@ * Some examples of use follow.
*

To create cache client object and set params:

* 
 
- *	MemCachedClient mc = new MemCachedClient();
+ *	MemcachedClient mc = new MemcachedClient();
  *
  *	// compression is enabled by default	
  *	mc.setCompressEnable(true);
@@ -59,14 +59,14 @@
  *
*

To store an object:

* 
- *	MemCachedClient mc = new MemCachedClient();
+ *	MemcachedClient mc = new MemcachedClient();
  *	String key   = "cacheKey1";	
  *	Object value = SomeClass.getObject();	
  *	mc.set(key, value);
  *
*

To store an object using a custom server hashCode:

* 
- *	MemCachedClient mc = new MemCachedClient();
+ *	MemcachedClient mc = new MemcachedClient();
  *	String key   = "cacheKey1";	
  *	Object value = SomeClass.getObject();	
  *	Integer hash = new Integer(45);	
@@ -80,20 +80,20 @@
  *  
  * 
To delete a cache entry:

  * 
- *	MemCachedClient mc = new MemCachedClient();
+ *	MemcachedClient mc = new MemcachedClient();
  *	String key   = "cacheKey1";	
  *	mc.delete(key);
  * 
 
  * 
To delete a cache entry using a custom hash code:

  * 
- *	MemCachedClient mc = new MemCachedClient();
+ *	MemcachedClient mc = new MemcachedClient();
  *	String key   = "cacheKey1";	
  *	Integer hash = new Integer(45);	
  *	mc.delete(key, hashCode);
  * 
 
  * 
To store a counter and then increment or decrement that counter:

  * 
- *	MemCachedClient mc = new MemCachedClient();
+ *	MemcachedClient mc = new MemcachedClient();
  *	String key   = "counterKey";	
  *	mc.storeCounter(key, new Integer(100));
  *	System.out.println("counter after adding      1: " mc.incr(key));	
@@ -103,7 +103,7 @@
  * 
 
  * 
To store a counter and then increment or decrement that counter with custom hash:

  * 
- *	MemCachedClient mc = new MemCachedClient();
+ *	MemcachedClient mc = new MemcachedClient();
  *	String key   = "counterKey";	
  *	Integer hash = new Integer(45);	
  *	mc.storeCounter(key, new Integer(100), hash);
@@ -114,38 +114,38 @@
  * 
 
  * 
To retrieve an object from the cache:

  * 
- *	MemCachedClient mc = new MemCachedClient();
+ *	MemcachedClient mc = new MemcachedClient();
  *	String key   = "key";	
  *	Object value = mc.get(key);	
  * 
 
  * 
To retrieve an object from the cache with custom hash:

  * 
- *	MemCachedClient mc = new MemCachedClient();
+ *	MemcachedClient mc = new MemcachedClient();
  *	String key   = "key";	
  *	Integer hash = new Integer(45);	
  *	Object value = mc.get(key, hash);	
  * 
 
  * 
To retrieve an multiple objects from the cache

  * 
- *	MemCachedClient mc = new MemCachedClient();
+ *	MemcachedClient mc = new MemcachedClient();
  *	String[] keys      = { "key", "key1", "key2" };
  *	Map<Object> values = mc.getMulti(keys);
  * 
 
  * 
To retrieve an multiple objects from the cache with custom hashing

  * 
- *	MemCachedClient mc = new MemCachedClient();
+ *	MemcachedClient mc = new MemcachedClient();
  *	String[] keys      = { "key", "key1", "key2" };
  *	Integer[] hashes   = { new Integer(45), new Integer(32), new Integer(44) };
  *	Map<Object> values = mc.getMulti(keys, hashes);
  * 
 
  * 
To flush all items in server(s)

  * 
- *	MemCachedClient mc = new MemCachedClient();
+ *	MemcachedClient mc = new MemcachedClient();
  *	mc.flushAll();
  * 
 
  * 
To get stats from server(s)

  * 
- *	MemCachedClient mc = new MemCachedClient();
+ *	MemcachedClient mc = new MemcachedClient();
  *	Map stats = mc.stats();
  * 
 
  *
@@ -156,7 +156,7 @@
  * @author Vin Chawla 
  * @version 1.5
  */
-public class MemCachedClient {
+public class MemcachedClient {
 
 	// logger
 	private static Logger log =
@@ -224,7 +224,7 @@ public class MemCachedClient {
 	/**
 	 * Creates a new instance of MemCachedClient.
 	 */
-	public MemCachedClient() {
+	public MemcachedClient() {
 		init();
 	}
 
@@ -234,7 +234,7 @@ public MemCachedClient() {
 	 * 
 	 * @param poolName name of SockIOPool
 	 */
-	public MemCachedClient( String poolName ) {
+	public MemcachedClient( String poolName ) {
 		this.poolName = poolName;
 		init();
 	}
@@ -245,7 +245,7 @@ public MemCachedClient( String poolName ) {
 	 * 
 	 * @param classLoader ClassLoader object.
 	 */
-	public MemCachedClient( ClassLoader classLoader ) {
+	public MemcachedClient( ClassLoader classLoader ) {
 		this.classLoader = classLoader;
 		init();
 	}
@@ -258,7 +258,7 @@ public MemCachedClient( ClassLoader classLoader ) {
 	 * @param classLoader ClassLoader object.
 	 * @param errorHandler ErrorHandler object.
 	 */
-	public MemCachedClient( ClassLoader classLoader, ErrorHandler errorHandler ) {
+	public MemcachedClient( ClassLoader classLoader, ErrorHandler errorHandler ) {
 		this.classLoader  = classLoader;
 		this.errorHandler = errorHandler;
 		init();
@@ -273,7 +273,7 @@ public MemCachedClient( ClassLoader classLoader, ErrorHandler errorHandler ) {
 	 * @param errorHandler ErrorHandler object.
 	 * @param poolName SockIOPool name
 	 */
-	public MemCachedClient( ClassLoader classLoader, ErrorHandler errorHandler, String poolName ) {
+	public MemcachedClient( ClassLoader classLoader, ErrorHandler errorHandler, String poolName ) {
 		this.classLoader  = classLoader;
 		this.errorHandler = errorHandler;
 		this.poolName     = poolName;
@@ -2041,10 +2041,10 @@ else if ( line.startsWith( ERROR ) || line.startsWith( CLIENT_ERROR ) || line.st
 	protected final class NIOLoader {
 		protected Selector selector;
 		protected int numConns = 0;
-		protected MemCachedClient mc;
+		protected MemcachedClient mc;
 		protected Connection[] conns;
 
-		public NIOLoader( MemCachedClient mc ) {
+		public NIOLoader( MemcachedClient mc ) {
 			this.mc = mc;
 		}
 
@@ -2232,7 +2232,7 @@ public void doMulti( boolean asString, Map sockKeys, Stri
 		private void handleError( Throwable e, String[] keys ) {
 		    // if we have an errorHandler, use its hook
 		    if ( errorHandler != null )
-		        errorHandler.handleErrorOnGet( MemCachedClient.this, e, keys );
+		        errorHandler.handleErrorOnGet( MemcachedClient.this, e, keys );
 		
 		    // exception thrown
 		    log.error( "++++ exception thrown while getting from cache on getMulti" );
diff --git a/src/com/whalin/memcached/NativeHandler.java b/src/com/whalin/memcached/NativeHandler.java
index 0a5c81a..fd802e2 100644
--- a/src/com/whalin/memcached/NativeHandler.java
+++ b/src/com/whalin/memcached/NativeHandler.java
@@ -17,7 +17,7 @@
  * @author Greg Whalin  
  * @version 2.0
  */
-package com.danga.MemCached;
+package com.whalin.memcached;
 
 import java.util.Date;
 import org.apache.log4j.Logger;
@@ -130,43 +130,43 @@ public static boolean isHandled( Object value ) {
 	public static int getMarkerFlag( Object value ) {
 
 		if ( value instanceof Byte )
-			return MemCachedClient.MARKER_BYTE;
+			return MemcachedClient.MARKER_BYTE;
 		
 		if ( value instanceof Boolean )
-			return MemCachedClient.MARKER_BOOLEAN;
+			return MemcachedClient.MARKER_BOOLEAN;
 		
 		if ( value instanceof Integer ) 
-			return MemCachedClient.MARKER_INTEGER;
+			return MemcachedClient.MARKER_INTEGER;
 		
 		if ( value instanceof Long )
-			return MemCachedClient.MARKER_LONG;
+			return MemcachedClient.MARKER_LONG;
 
 		if ( value instanceof Character )
-			return MemCachedClient.MARKER_CHARACTER;
+			return MemcachedClient.MARKER_CHARACTER;
 		
 		if ( value instanceof String )
-			return MemCachedClient.MARKER_STRING;
+			return MemcachedClient.MARKER_STRING;
 		
 		if ( value instanceof StringBuffer )
-			return MemCachedClient.MARKER_STRINGBUFFER;
+			return MemcachedClient.MARKER_STRINGBUFFER;
 		
 		if ( value instanceof Float )
-			return MemCachedClient.MARKER_FLOAT;
+			return MemcachedClient.MARKER_FLOAT;
 		
 		if ( value instanceof Short )
-			return MemCachedClient.MARKER_SHORT;
+			return MemcachedClient.MARKER_SHORT;
 		
 		if ( value instanceof Double )
-			return MemCachedClient.MARKER_DOUBLE;
+			return MemcachedClient.MARKER_DOUBLE;
 		
 		if ( value instanceof Date )
-			return MemCachedClient.MARKER_DATE;
+			return MemcachedClient.MARKER_DATE;
 		
 		if ( value instanceof StringBuilder )
-			return MemCachedClient.MARKER_STRINGBUILDER;
+			return MemcachedClient.MARKER_STRINGBUILDER;
 		
 		if ( value instanceof byte[] )
-			return MemCachedClient.MARKER_BYTEARR;
+			return MemcachedClient.MARKER_BYTEARR;
 		
 		return -1;
 	}
@@ -320,43 +320,43 @@ public static Object decode( byte[] b, int flag ) throws Exception {
 			return null;
 
 		
-		if ( ( flag & MemCachedClient.MARKER_BYTE ) == MemCachedClient.MARKER_BYTE )
+		if ( ( flag & MemcachedClient.MARKER_BYTE ) == MemcachedClient.MARKER_BYTE )
 			return decodeByte( b );
 		
-		if ( ( flag & MemCachedClient.MARKER_BOOLEAN ) == MemCachedClient.MARKER_BOOLEAN )
+		if ( ( flag & MemcachedClient.MARKER_BOOLEAN ) == MemcachedClient.MARKER_BOOLEAN )
 			return decodeBoolean( b );
 		
-		if ( ( flag & MemCachedClient.MARKER_INTEGER ) == MemCachedClient.MARKER_INTEGER )
+		if ( ( flag & MemcachedClient.MARKER_INTEGER ) == MemcachedClient.MARKER_INTEGER )
 			return decodeInteger( b );
 		
-		if ( ( flag & MemCachedClient.MARKER_LONG ) == MemCachedClient.MARKER_LONG )
+		if ( ( flag & MemcachedClient.MARKER_LONG ) == MemcachedClient.MARKER_LONG )
 			return decodeLong( b );
 		
-		if ( ( flag & MemCachedClient.MARKER_CHARACTER ) == MemCachedClient.MARKER_CHARACTER )
+		if ( ( flag & MemcachedClient.MARKER_CHARACTER ) == MemcachedClient.MARKER_CHARACTER )
 			return decodeCharacter( b );
 		
-		if ( ( flag & MemCachedClient.MARKER_STRING ) == MemCachedClient.MARKER_STRING )
+		if ( ( flag & MemcachedClient.MARKER_STRING ) == MemcachedClient.MARKER_STRING )
 			return decodeString( b );
 		
-		if ( ( flag & MemCachedClient.MARKER_STRINGBUFFER ) == MemCachedClient.MARKER_STRINGBUFFER )
+		if ( ( flag & MemcachedClient.MARKER_STRINGBUFFER ) == MemcachedClient.MARKER_STRINGBUFFER )
 			return decodeStringBuffer( b );
 		
-		if ( ( flag & MemCachedClient.MARKER_FLOAT ) == MemCachedClient.MARKER_FLOAT )
+		if ( ( flag & MemcachedClient.MARKER_FLOAT ) == MemcachedClient.MARKER_FLOAT )
 			return decodeFloat( b );
 		
-		if ( ( flag & MemCachedClient.MARKER_SHORT ) == MemCachedClient.MARKER_SHORT )
+		if ( ( flag & MemcachedClient.MARKER_SHORT ) == MemcachedClient.MARKER_SHORT )
 			return decodeShort( b );
 		
-		if ( ( flag & MemCachedClient.MARKER_DOUBLE ) == MemCachedClient.MARKER_DOUBLE )
+		if ( ( flag & MemcachedClient.MARKER_DOUBLE ) == MemcachedClient.MARKER_DOUBLE )
 			return decodeDouble( b );
 		
-		if ( ( flag & MemCachedClient.MARKER_DATE ) == MemCachedClient.MARKER_DATE )
+		if ( ( flag & MemcachedClient.MARKER_DATE ) == MemcachedClient.MARKER_DATE )
 			return decodeDate( b );
 		
-		if ( ( flag & MemCachedClient.MARKER_STRINGBUILDER ) == MemCachedClient.MARKER_STRINGBUILDER )
+		if ( ( flag & MemcachedClient.MARKER_STRINGBUILDER ) == MemcachedClient.MARKER_STRINGBUILDER )
 			return decodeStringBuilder( b );
 		
-		if ( ( flag & MemCachedClient.MARKER_BYTEARR ) == MemCachedClient.MARKER_BYTEARR )
+		if ( ( flag & MemcachedClient.MARKER_BYTEARR ) == MemcachedClient.MARKER_BYTEARR )
 			return decodeByteArr( b );
 		
 		return null;
diff --git a/src/com/whalin/memcached/NestedIOException.java b/src/com/whalin/memcached/NestedIOException.java
index f30b865..a7bfd3e 100644
--- a/src/com/whalin/memcached/NestedIOException.java
+++ b/src/com/whalin/memcached/NestedIOException.java
@@ -17,7 +17,7 @@
  * @author Kevin A. Burton  
  * @version 2.0
  */
-package com.danga.MemCached;
+package com.whalin.memcached;
 
 import java.io.*;
 
diff --git a/src/com/whalin/memcached/SockIOPool.java b/src/com/whalin/memcached/SockIOPool.java
index 1bb1d9f..e1b1de9 100644
--- a/src/com/whalin/memcached/SockIOPool.java
+++ b/src/com/whalin/memcached/SockIOPool.java
@@ -17,7 +17,7 @@
  * @author greg whalin  
  * @version 2.0
  */
-package com.danga.MemCached;
+package com.whalin.memcached;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
diff --git a/src/com/whalin/memcached/test/MemCachedBench.java b/src/com/whalin/memcached/test/MemCachedBench.java
index 9b1b317..3db8433 100644
--- a/src/com/whalin/memcached/test/MemCachedBench.java
+++ b/src/com/whalin/memcached/test/MemCachedBench.java
@@ -1,5 +1,5 @@
 /**
- * MemCachedBench.java
+ * MemcachedBench.java
  * Copyright (c) 2007 Greg Whalin
  * All rights reserved.
  *
@@ -17,19 +17,19 @@
  * @author Greg Whalin  
  * @version 1.5.2
  */
-package com.danga.MemCached.test;
+package com.whalin.memcached.test;
 
-import com.danga.MemCached.*;
+import com.whalin.memcached.*;
 import java.util.*;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.BasicConfigurator;
 
-public class MemCachedBench {
+public class MemcachedBench {
 
 	// logger
 	private static Logger log =
-		Logger.getLogger( MemCachedBench.class.getName() );
+		Logger.getLogger( MemcachedBench.class.getName() );
 
 	public static void main(String[] args) {
 
@@ -54,7 +54,7 @@ public static void main(String[] args) {
 		pool.initialize();
 
 		// get client instance
-		MemCachedClient mc = new MemCachedClient( "test" );
+		MemcachedClient mc = new MemcachedClient( "test" );
 		mc.setCompressEnable( false );
 
 		String keyBase = "testKey";
diff --git a/src/com/whalin/memcached/test/MemCachedTest.java b/src/com/whalin/memcached/test/MemCachedTest.java
index b22c95a..f02f480 100644
--- a/src/com/whalin/memcached/test/MemCachedTest.java
+++ b/src/com/whalin/memcached/test/MemCachedTest.java
@@ -1,6 +1,6 @@
 /**
- * MemCachedTest.java
- * Copyright (c) 2007 Greg Whalin
+ * MemcachedTest.java
+ * Copyright (c) 2008 Greg Whalin
  * All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -17,19 +17,19 @@
  * @author Greg Whalin  
  * @version 1.5.2
  */
-package com.danga.MemCached.test;
+package com.whalin.memcached.test;
 
-import com.danga.MemCached.*;
+import com.whalin.memcached.*;
 import java.util.*;
 
-public class MemCachedTest {
+public class MemcachedTest {
 
 	// store results from threads
 	private static Hashtable threadInfo =
 		new Hashtable();
     
 	/**
-	 * This runs through some simple tests of the MemCacheClient.
+	 * This runs through some simple tests of the MemcacheClient.
 	 *
 	 * Command line args:
 	 * args[0] = number of threads to spawn
@@ -117,7 +117,7 @@ public void run() {
 			StringBuilder result = new StringBuilder();
 
 			// get client instance
-			MemCachedClient mc = new MemCachedClient();
+			MemcachedClient mc = new MemcachedClient();
 			mc.setCompressEnable(false);
 			mc.setCompressThreshold(0);
 
diff --git a/src/com/whalin/memcached/test/TestMemcached.java b/src/com/whalin/memcached/test/TestMemcached.java
index b8ea854..48c73a8 100644
--- a/src/com/whalin/memcached/test/TestMemcached.java
+++ b/src/com/whalin/memcached/test/TestMemcached.java
@@ -1,6 +1,5 @@
 /**
- * MemCached Java client
- * Copyright (c) 2007 Greg Whalin
+ * Copyright (c) 2008 Greg Whalin
  * All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -17,9 +16,9 @@
  * @author greg whalin  
  * @version 1.5.2
  */
-package com.danga.MemCached.test;
+package com.whalin.memcached.test;
 
-import com.danga.MemCached.*;
+import com.whalin.memcached.*;
 import org.apache.log4j.*;
 
 public class TestMemcached  {  
@@ -40,14 +39,14 @@ public static void main(String[] args) {
 		pool.setAliveCheck( true );
 		pool.initialize();
 
-		MemCachedClient memCachedClient = new MemCachedClient();
+		MemcachedClient mcc = new MemcachedClient();
 
 		// turn off most memcached client logging:
-		com.danga.MemCached.Logger.getLogger( MemCachedClient.class.getName() ).setLevel( com.danga.MemCached.Logger.LEVEL_WARN );
+		com.whalin.memcached.Logger.getLogger( MemcachedClient.class.getName() ).setLevel( com.whalin.memcached.Logger.LEVEL_WARN );
 
 		for ( int i = 0; i < 10; i++ ) {
-			boolean success = memCachedClient.set( "" + i, "Hello!" );
-			String result = (String)memCachedClient.get( "" + i );
+			boolean success = mcc.set( "" + i, "Hello!" );
+			String result = (String)mcc.get( "" + i );
 			System.out.println( String.format( "set( %d ): %s", i, success ) );
 			System.out.println( String.format( "get( %d ): %s", i, result ) );
 		}
@@ -56,8 +55,8 @@ public static void main(String[] args) {
 		try { Thread.sleep( 10000 ); } catch ( Exception ex ) { }
 
 		for ( int i = 0; i < 10; i++ ) {
-			boolean success = memCachedClient.set( "" + i, "Hello!" );
-			String result = (String)memCachedClient.get( "" + i );
+			boolean success = mcc.set( "" + i, "Hello!" );
+			String result = (String)mcc.get( "" + i );
 			System.out.println( String.format( "set( %d ): %s", i, success ) );
 			System.out.println( String.format( "get( %d ): %s", i, result ) );
 		}
diff --git a/src/com/whalin/memcached/test/UnitTests.java b/src/com/whalin/memcached/test/UnitTests.java
index 0aabf45..c2f6b96 100644
--- a/src/com/whalin/memcached/test/UnitTests.java
+++ b/src/com/whalin/memcached/test/UnitTests.java
@@ -1,6 +1,6 @@
 /**
  * UnitTests.java
- * Copyright (c) 2007 Greg Whalin
+ * Copyright (c) 2008 Greg Whalin
  * All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -18,9 +18,9 @@
  * @author greg whalin  
  * @version 1.2
  */
-package com.danga.MemCached.test;
+package com.whalin.memcached.test;
 
-import com.danga.MemCached.*;
+import com.whalin.memcached.*;
 import java.util.*;
 import java.io.Serializable;
 
@@ -34,7 +34,7 @@ public class UnitTests {
 	private static Logger log =
 		Logger.getLogger( UnitTests.class.getName() );
 
-    public static MemCachedClient mc  = null;
+    public static MemcachedClient mc  = null;
 
     public static void test1() {
         mc.set( "foo", Boolean.TRUE );
@@ -266,7 +266,7 @@ public static void test24() {
 		log.error( "+ getMulti w/ keys that don't exist test passed" );
 	}
 
-	public static void runAlTests( MemCachedClient mc ) {
+	public static void runAlTests( MemcachedClient mc ) {
 		test14();
 		for ( int t = 0; t < 2; t++ ) {
 			mc.setCompressEnable( ( t&1 ) == 1 );
@@ -319,7 +319,7 @@ public static void runAlTests( MemCachedClient mc ) {
 	}
 
 	/**
-	 * This runs through some simple tests of the MemCacheClient.
+	 * This runs through some simple tests of the MemcacheClient.
 	 *
 	 * Command line args:
 	 * args[0] = number of threads to spawn
@@ -365,7 +365,7 @@ public static void main(String[] args) {
 		pool.setHashingAlg( SockIOPool.CONSISTENT_HASH );
 		pool.initialize();
 
-        mc = new MemCachedClient( "test" );
+        mc = new MemcachedClient( "test" );
 		runAlTests( mc );
 	}