Author: olamy
Date: Thu Oct 13 10:15:16 2011
New Revision: 1182757
URL: http://svn.apache.org/viewvc?rev=1182757&view=rev
Log:
move source package to org.apache.directmemory
Removed:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/directmemory/
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/aspect/org/directmemory/monitoring/Performance.aj
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheLightConcurrentTest.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/TestCachePlusSerialization.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests2.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests3.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Starter.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmarks.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmarks.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/test/SerializerTest.java
incubator/directmemory/trunk/directmemory-cache/src/test/resources/logback-test.xml
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/aspect/org/directmemory/monitoring/Performance.aj
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/aspect/org/directmemory/monitoring/Performance.aj?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/aspect/org/directmemory/monitoring/Performance.aj
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/main/aspect/org/directmemory/monitoring/Performance.aj
Thu Oct 13 10:15:16 2011
@@ -1,9 +1,9 @@
-package org.directmemory.monitoring;
+package org.apache.directmemory.monitoring;
-import org.directmemory.cache.Cache;
-import org.directmemory.measures.Monitor;
-import org.directmemory.memory.Pointer;
-import org.directmemory.misc.Format;
+import org.apache.directmemory.cache.Cache;
+import org.apache.directmemory.measures.Monitor;
+import org.apache.directmemory.memory.Pointer;
+import org.apache.directmemory.misc.Format;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,37 +26,37 @@ public aspect Performance {
private static Logger logger = LoggerFactory.getLogger(Cache.class);
pointcut putByteArrayPointcut(String key, byte[] payload) :
- execution(Pointer
org.directmemory.cache.Cache.putByteArray(String, byte[])) &&
+ execution(Pointer
org.apache.directmemory.cache.Cache.putByteArray(String, byte[])) &&
args(key, payload);
pointcut putObjectPointcut(String key, Object object, int expiresIn) :
- execution(Pointer org.directmemory.cache.Cache.put(String,
Object, int)) &&
+ execution(Pointer
org.apache.directmemory.cache.Cache.put(String, Object, int)) &&
args(key, object, expiresIn);
pointcut retrieveByteArrayPointcut(String key) :
- execution(byte[]
org.directmemory.cache.Cache.retrieveByteArray(String)) &&
+ execution(byte[]
org.apache.directmemory.cache.Cache.retrieveByteArray(String)) &&
args(key);
pointcut retrieveObjectPointcut(String key) :
- execution(Object org.directmemory.cache.Cache.retrieve(String))
&&
+ execution(Object
org.apache.directmemory.cache.Cache.retrieve(String)) &&
args(key);
pointcut getPointcut(String key) :
- execution(Pointer
org.directmemory.cache.Cache.getPointer(String)) &&
+ execution(Pointer
org.apache.directmemory.cache.Cache.getPointer(String)) &&
args(key);
pointcut collectLFUPointcut() :
- execution(void org.directmemory.cache.Cache.collectLFU());
+ execution(void
org.apache.directmemory.cache.Cache.collectLFU());
pointcut collectExpiredPointcut() :
- execution(void org.directmemory.cache.Cache.collectExpired());
+ execution(void
org.apache.directmemory.cache.Cache.collectExpired());
pointcut serializePointcut(Object obj, @SuppressWarnings("rawtypes")
Class clazz) :
- execution(byte[]
org.directmemory.serialization.ProtoStuffSerializerV1.serialize(Object, Class))
&&
+ execution(byte[]
org.apache.directmemory.serialization.ProtoStuffSerializerV1.serialize(Object,
Class)) &&
args(obj, clazz);
pointcut deserializePointcut(byte[] source,
@SuppressWarnings("rawtypes") Class clazz) :
- execution(Object
org.directmemory.serialization.ProtoStuffSerializerV1.deserialize(byte[],
Class)) &&
+ execution(Object
org.apache.directmemory.serialization.ProtoStuffSerializerV1.deserialize(byte[],
Class)) &&
args(source, clazz);
Pointer around(String key, byte[] payload): putByteArrayPointcut(key,
payload) {
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTests.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTests.java?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTests.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTests.java
Thu Oct 13 10:15:16 2011
@@ -3,11 +3,11 @@ package org.apache.directmemory.cache.te
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
-import org.directmemory.cache.Cache;
-import org.directmemory.measures.Monitor;
-import org.directmemory.measures.Ram;
-import org.directmemory.memory.MemoryManager;
-import org.directmemory.memory.Pointer;
+import org.apache.directmemory.cache.Cache;
+import org.apache.directmemory.measures.Monitor;
+import org.apache.directmemory.measures.Ram;
+import org.apache.directmemory.memory.MemoryManager;
+import org.apache.directmemory.memory.Pointer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheLightConcurrentTest.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheLightConcurrentTest.java?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheLightConcurrentTest.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheLightConcurrentTest.java
Thu Oct 13 10:15:16 2011
@@ -3,12 +3,12 @@ package org.apache.directmemory.cache.te
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
-import org.directmemory.cache.Cache;
-import org.directmemory.measures.Every;
-import org.directmemory.measures.Monitor;
-import org.directmemory.measures.Ram;
-import org.directmemory.memory.MemoryManager;
-import org.directmemory.memory.Pointer;
+import org.apache.directmemory.cache.Cache;
+import org.apache.directmemory.measures.Every;
+import org.apache.directmemory.measures.Monitor;
+import org.apache.directmemory.measures.Ram;
+import org.apache.directmemory.memory.MemoryManager;
+import org.apache.directmemory.memory.Pointer;
import org.josql.QueryExecutionException;
import org.josql.QueryParseException;
import org.junit.AfterClass;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/TestCachePlusSerialization.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/TestCachePlusSerialization.java?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/TestCachePlusSerialization.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/TestCachePlusSerialization.java
Thu Oct 13 10:15:16 2011
@@ -4,10 +4,10 @@ import static org.junit.Assert.*;
import java.util.Random;
-import org.directmemory.cache.Cache;
-import org.directmemory.measures.Monitor;
-import org.directmemory.measures.Ram;
-import org.directmemory.misc.DummyPojo;
+import org.apache.directmemory.cache.Cache;
+import org.apache.directmemory.measures.Monitor;
+import org.apache.directmemory.measures.Ram;
+import org.apache.directmemory.misc.DummyPojo;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTests.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTests.java?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTests.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTests.java
Thu Oct 13 10:15:16 2011
@@ -9,9 +9,9 @@ import java.util.Random;
import java.util.zip.CRC32;
import java.util.zip.Checksum;
-import org.directmemory.measures.Ram;
-import org.directmemory.memory.OffHeapMemoryBuffer;
-import org.directmemory.memory.Pointer;
+import org.apache.directmemory.measures.Ram;
+import org.apache.directmemory.memory.OffHeapMemoryBuffer;
+import org.apache.directmemory.memory.Pointer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests.java?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests.java
Thu Oct 13 10:15:16 2011
@@ -4,9 +4,9 @@ import java.util.Random;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
-import org.directmemory.measures.Ram;
-import org.directmemory.memory.OffHeapMemoryBuffer;
-import org.directmemory.memory.Pointer;
+import org.apache.directmemory.measures.Ram;
+import org.apache.directmemory.memory.OffHeapMemoryBuffer;
+import org.apache.directmemory.memory.Pointer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests2.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests2.java?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests2.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests2.java
Thu Oct 13 10:15:16 2011
@@ -4,10 +4,10 @@ import java.util.Random;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
-import org.directmemory.measures.Ram;
-import org.directmemory.memory.MemoryManager;
-import org.directmemory.memory.OffHeapMemoryBuffer;
-import org.directmemory.memory.Pointer;
+import org.apache.directmemory.measures.Ram;
+import org.apache.directmemory.memory.MemoryManager;
+import org.apache.directmemory.memory.OffHeapMemoryBuffer;
+import org.apache.directmemory.memory.Pointer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests3.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests3.java?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests3.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests3.java
Thu Oct 13 10:15:16 2011
@@ -4,10 +4,10 @@ import java.util.Random;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
-import org.directmemory.measures.Ram;
-import org.directmemory.memory.MemoryManager;
-import org.directmemory.memory.OffHeapMemoryBuffer;
-import org.directmemory.memory.Pointer;
+import org.apache.directmemory.measures.Ram;
+import org.apache.directmemory.memory.MemoryManager;
+import org.apache.directmemory.memory.OffHeapMemoryBuffer;
+import org.apache.directmemory.memory.Pointer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTests.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTests.java?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTests.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTests.java
Thu Oct 13 10:15:16 2011
@@ -6,9 +6,9 @@ import static org.junit.Assert.assertNot
import java.util.Random;
import java.util.concurrent.ConcurrentMap;
-import org.directmemory.measures.Ram;
-import org.directmemory.memory.OffHeapMemoryBuffer;
-import org.directmemory.memory.Pointer;
+import org.apache.directmemory.measures.Ram;
+import org.apache.directmemory.memory.OffHeapMemoryBuffer;
+import org.apache.directmemory.memory.Pointer;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTests.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTests.java?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTests.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTests.java
Thu Oct 13 10:15:16 2011
@@ -6,10 +6,10 @@ import static org.junit.Assert.assertNot
import java.util.Map;
import java.util.Random;
-import org.directmemory.measures.Ram;
-import org.directmemory.memory.MemoryManager;
-import org.directmemory.memory.OffHeapMemoryBuffer;
-import org.directmemory.memory.Pointer;
+import org.apache.directmemory.measures.Ram;
+import org.apache.directmemory.memory.MemoryManager;
+import org.apache.directmemory.memory.OffHeapMemoryBuffer;
+import org.apache.directmemory.memory.Pointer;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.rules.MethodRule;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Starter.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Starter.java?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Starter.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Starter.java
Thu Oct 13 10:15:16 2011
@@ -2,9 +2,9 @@ package org.apache.directmemory.memory.t
import static org.junit.Assert.assertNotNull;
-import org.directmemory.measures.Ram;
-import org.directmemory.memory.MemoryManager;
-import org.directmemory.memory.OffHeapMemoryBuffer;
+import org.apache.directmemory.measures.Ram;
+import org.apache.directmemory.memory.MemoryManager;
+import org.apache.directmemory.memory.OffHeapMemoryBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmarks.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmarks.java?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmarks.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmarks.java
Thu Oct 13 10:15:16 2011
@@ -4,7 +4,7 @@ import java.nio.ByteBuffer;
import java.util.Map;
import java.util.concurrent.ConcurrentMap;
-import org.directmemory.measures.Ram;
+import org.apache.directmemory.measures.Ram;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmarks.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmarks.java?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmarks.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmarks.java
Thu Oct 13 10:15:16 2011
@@ -7,7 +7,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
-import org.directmemory.measures.Ram;
+import org.apache.directmemory.measures.Ram;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/test/SerializerTest.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/test/SerializerTest.java?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/test/SerializerTest.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/test/SerializerTest.java
Thu Oct 13 10:15:16 2011
@@ -5,13 +5,13 @@ import static org.junit.Assert.assertNot
import java.io.IOException;
-import org.directmemory.measures.Monitor;
-import org.directmemory.measures.Ram;
-import org.directmemory.misc.DummyPojo;
-import org.directmemory.serialization.ProtoStuffSerializerV1;
-import org.directmemory.serialization.ProtoStuffWithLinkedBufferSerializer;
-import org.directmemory.serialization.Serializer;
-import org.directmemory.serialization.StandardSerializer;
+import org.apache.directmemory.measures.Monitor;
+import org.apache.directmemory.measures.Ram;
+import org.apache.directmemory.misc.DummyPojo;
+import org.apache.directmemory.serialization.ProtoStuffSerializerV1;
+import
org.apache.directmemory.serialization.ProtoStuffWithLinkedBufferSerializer;
+import org.apache.directmemory.serialization.Serializer;
+import org.apache.directmemory.serialization.StandardSerializer;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.MethodRule;
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/resources/logback-test.xml
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/resources/logback-test.xml?rev=1182757&r1=1182756&r2=1182757&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/resources/logback-test.xml
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/resources/logback-test.xml
Thu Oct 13 10:15:16 2011
@@ -9,22 +9,22 @@
- <logger name="org.directmemory.serialization" level="warn">
+ <logger name="org.apache.directmemory.serialization" level="warn">
<appender-ref ref="STDOUT" />
</logger>
- <logger name="org.directmemory.measures" level="info">
+ <logger name="org.apache.directmemory.measures" level="info">
<appender-ref ref="STDOUT" />
</logger>
- <logger name="org.directmemory.memory" level="info">
+ <logger name="org.apache.directmemory.memory" level="info">
<appender-ref ref="STDOUT" />
</logger>
- <logger name="org.directmemory.cache" level="info">
+ <logger name="org.apache.directmemory.cache" level="info">
<appender-ref ref="STDOUT" />
</logger>
