src/main/java/net/spy/memcached/compat/BaseMockCase.java src/main/java/net/spy/memcached/compat/CloseUtil.java src/main/java/net/spy/memcached/compat/SpyObject.java src/main/java/net/spy/memcached/compat/SpyThread.java src/main/java/net/spy/memcached/compat/SyncThread.java src/main/java/net/spy/memcached/compat/log/AbstractLogger.java src/main/java/net/spy/memcached/compat/log/DefaultLogger.java src/main/java/net/spy/memcached/compat/log/Level.java src/main/java/net/spy/memcached/compat/log/Log4JLogger.java src/main/java/net/spy/memcached/compat/log/Logger.java src/main/java/net/spy/memcached/compat/log/LoggerFactory.java src/main/java/net/spy/memcached/compat/log/SunLogger.java src/main/java/net/spy/memcached/compat/package.html @@ -6,7 +6,7 @@ <classpathentry kind="src" path="src/test/manual"/> <classpathentry kind="var" path="M2_REPO/jmock/jmock/1.2.0/jmock-1.2.0.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> - <classpathentry kind="var" path="M2_REPO/spy/spy/2.4/spy-2.4.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.15/log4j-1.2.15.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> .classpath @@ -4,3 +4,4 @@ target/ reports/ junit* *.iml +*~ \ No newline at end of file .gitignore @@ -44,7 +44,8 @@ define "memcached" do project.version = VERSION_NUMBER project.group = GROUP manifest["Implementation-Vendor"] = COPYRIGHT - compile.with m1("spy:spy:jar:2.4") + compile.with "log4j:log4j:jar:1.2.15", "jmock:jmock:jar:1.2.0", + "junit:junit:jar:4.4" # Gen build gen_build_info "net.spy.memcached", "git" buildfile @@ -1,6 +1,6 @@ package net.spy.memcached; -import net.spy.SpyObject; +import net.spy.memcached.compat.SpyObject; import net.spy.memcached.transcoders.Transcoder; /** src/main/java/net/spy/memcached/CASMutator.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; -import net.spy.SpyObject; +import net.spy.memcached.compat.SpyObject; import net.spy.memcached.ops.Operation; import net.spy.memcached.protocol.ascii.AsciiMemcachedNodeImpl; import net.spy.memcached.protocol.ascii.AsciiOperationFactory; src/main/java/net/spy/memcached/DefaultConnectionFactory.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import net.spy.SpyObject; +import net.spy.memcached.compat.SpyObject; /** * This is an implementation of the Ketama consistent hash strategy from src/main/java/net/spy/memcached/KetamaNodeLocator.java @@ -24,7 +24,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -import net.spy.SpyThread; +import net.spy.memcached.compat.SpyThread; import net.spy.memcached.ops.CASOperationStatus; import net.spy.memcached.ops.CancelledOperationStatus; import net.spy.memcached.ops.ConcatenationType; src/main/java/net/spy/memcached/MemcachedClient.java @@ -25,7 +25,7 @@ import java.util.TreeMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CountDownLatch; -import net.spy.SpyObject; +import net.spy.memcached.compat.SpyObject; import net.spy.memcached.ops.Operation; import net.spy.memcached.ops.OperationState; src/main/java/net/spy/memcached/MemcachedConnection.java @@ -3,7 +3,7 @@ package net.spy.memcached.protocol; import java.io.IOException; import java.nio.ByteBuffer; -import net.spy.SpyObject; +import net.spy.memcached.compat.SpyObject; import net.spy.memcached.ops.CancelledOperationStatus; import net.spy.memcached.ops.OperationCallback; import net.spy.memcached.ops.OperationErrorType; src/main/java/net/spy/memcached/protocol/BaseOperationImpl.java @@ -9,8 +9,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.concurrent.BlockingQueue; -import net.spy.SpyObject; import net.spy.memcached.MemcachedNode; +import net.spy.memcached.compat.SpyObject; import net.spy.memcached.ops.GetOperation; import net.spy.memcached.ops.Operation; import net.spy.memcached.ops.OperationState; src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java @@ -9,8 +9,8 @@ import java.io.UnsupportedEncodingException; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import net.spy.SpyObject; -import net.spy.util.CloseUtil; +import net.spy.memcached.compat.CloseUtil; +import net.spy.memcached.compat.SpyObject; /** * Base class for any transcoders that may want to work with serialized or src/main/java/net/spy/memcached/transcoders/BaseSerializingTranscoder.java @@ -2,8 +2,8 @@ package net.spy.memcached.transcoders; -import net.spy.SpyObject; import net.spy.memcached.CachedData; +import net.spy.memcached.compat.SpyObject; /** * Transcoder that serializes and unserializes longs. src/main/java/net/spy/memcached/transcoders/IntegerTranscoder.java @@ -2,8 +2,8 @@ package net.spy.memcached.transcoders; -import net.spy.SpyObject; import net.spy.memcached.CachedData; +import net.spy.memcached.compat.SpyObject; /** * Transcoder that serializes and unserializes longs. src/main/java/net/spy/memcached/transcoders/LongTranscoder.java @@ -2,8 +2,8 @@ package net.spy.memcached; import java.util.concurrent.Callable; +import net.spy.memcached.compat.SyncThread; import net.spy.memcached.transcoders.LongTranscoder; -import net.spy.test.SyncThread; /** * Test the CAS mutator. src/test/java/net/spy/memcached/CASMutatorTest.java @@ -13,7 +13,6 @@ import java.util.Map; import java.util.SortedMap; import junit.framework.TestCase; - import net.spy.memcached.ops.Operation; /** src/test/java/net/spy/memcached/ConsistentHashingTest.java @@ -11,7 +11,7 @@ import java.util.Random; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import net.spy.test.SyncThread; +import net.spy.memcached.compat.SyncThread; /** * Longer running test case. src/test/java/net/spy/memcached/LongClientTest.java @@ -13,12 +13,12 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import net.spy.memcached.compat.SyncThread; import net.spy.memcached.ops.OperationErrorType; import net.spy.memcached.ops.OperationException; import net.spy.memcached.transcoders.BaseSerializingTranscoder; import net.spy.memcached.transcoders.SerializingTranscoder; import net.spy.memcached.transcoders.Transcoder; -import net.spy.test.SyncThread; public abstract class ProtocolBaseCase extends ClientBaseCase { src/test/java/net/spy/memcached/ProtocolBaseCase.java @@ -7,7 +7,7 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import net.spy.test.BaseMockCase; +import net.spy.memcached.compat.BaseMockCase; /** * Test the basic operation buffer handling stuff. src/test/java/net/spy/memcached/protocol/ascii/BaseOpTest.java @@ -1,10 +1,9 @@ package net.spy.memcached.protocol.ascii; +import junit.framework.TestCase; import net.spy.memcached.ops.OperationErrorType; import net.spy.memcached.ops.OperationException; -import junit.framework.TestCase; - /** * Test operation exception constructors and accessors and stuff. */ src/test/java/net/spy/memcached/protocol/ascii/OperationExceptionTest.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Date; import net.spy.memcached.CachedData; -import net.spy.test.BaseMockCase; +import net.spy.memcached.compat.BaseMockCase; /** * Basic behavior validation for all transcoders that work with objects. src/test/java/net/spy/memcached/transcoders/BaseTranscoderCase.java @@ -1,7 +1,6 @@ package net.spy.memcached.transcoders; import junit.framework.TestCase; - import net.spy.memcached.CachedData; /** src/test/java/net/spy/memcached/transcoders/CachedDataTest.java @@ -1,7 +1,6 @@ package net.spy.memcached.transcoders; import junit.framework.TestCase; - import net.spy.memcached.CachedData; /** src/test/java/net/spy/memcached/transcoders/LongTranscoderTest.java bc1ef9e47bf6444483d480f9162a3c2fc9539e72 Dustin Sallings dustin@spy.net http://github.com/dustin/java-memcached-client/commit/c2d8c778fbc64c0687b135beb3af53a27270b65f c2d8c778fbc64c0687b135beb3af53a27270b65f 2009-01-26T22:37:57-08:00 2009-01-26T22:37:57-08:00 Remove dependency on spy.jar. 239aaf0fd8651baaff441249f17463d63a7e51df Dustin Sallings dustin@spy.net