svn commit: r1292581 - in /incubator/directmemory/trunk/server: directmemory-server-client/src/main/java/org/apache/directmemory/server/client/ directmemory-server/src/test/java/org/apache/directmemory/server/services/

Wed, 22 Feb 2012 15:23:49 -0800 

Author: olamy
Date: Wed Feb 22 23:23:22 2012
New Revision: 1292581

URL: http://svn.apache.org/viewvc?rev=1292581&view=rev
Log:
simplify class name

Added:
    
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryClient.java
   (contents, props changed)
      - copied, changed from r1292562, 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryServerClient.java
    
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClient.java
   (contents, props changed)
      - copied, changed from r1292562, 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryServerClient.java
Removed:
    
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryServerClient.java
    
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryServerClient.java
Modified:
    
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java

Copied: 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryClient.java
 (from r1292562, 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryServerClient.java)
URL: 
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryClient.java?p2=incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryClient.java&p1=incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryServerClient.java&r1=1292562&r2=1292581&rev=1292581&view=diff
==============================================================================
--- 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryServerClient.java
 (original)
+++ 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryClient.java
 Wed Feb 22 23:23:22 2012
@@ -29,21 +29,21 @@ import java.util.concurrent.Future;
 /**
  * @author Olivier Lamy
  */
-public class DefaultDirectMemoryServerClient
-    implements DirectMemoryServerClient
+public class DefaultDirectMemoryClient
+    implements DirectMemoryClient
 {
 
-    public static DirectMemoryServerClient instance( 
DirectMemoryClientConfiguration configuration )
+    public static DirectMemoryClient instance( DirectMemoryClientConfiguration 
configuration )
         throws DirectMemoryCacheException
     {
-        return new DefaultDirectMemoryServerClient( configuration );
+        return new DefaultDirectMemoryClient( configuration );
     }
 
     private DirectMemoryClientConfiguration clientConfiguration;
 
     private DirectMemoryHttpClient directMemoryHttpClient;
 
-    private DefaultDirectMemoryServerClient( DirectMemoryClientConfiguration 
configuration )
+    private DefaultDirectMemoryClient( DirectMemoryClientConfiguration 
configuration )
         throws DirectMemoryCacheException
     {
         this.directMemoryHttpClient = 
configuration.getDirectMemoryHttpClient();

Propchange: 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryClient.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryClient.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClient.java
 (from r1292562, 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryServerClient.java)
URL: 
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClient.java?p2=incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClient.java&p1=incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryServerClient.java&r1=1292562&r2=1292581&rev=1292581&view=diff
==============================================================================
--- 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryServerClient.java
 (original)
+++ 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClient.java
 Wed Feb 22 23:23:22 2012
@@ -28,7 +28,7 @@ import java.util.concurrent.Future;
 /**
  * @author Olivier Lamy
  */
-public interface DirectMemoryServerClient
+public interface DirectMemoryClient
 {
 
     DirectMemoryCacheResponse retrieve( DirectMemoryCacheRequest 
directMemoryCacheRequest )

Propchange: 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClient.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClient.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: 
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
URL: 
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java?rev=1292581&r1=1292580&r2=1292581&view=diff
==============================================================================
--- 
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
 (original)
+++ 
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
 Wed Feb 22 23:23:22 2012
@@ -21,10 +21,10 @@ package org.apache.directmemory.server.s
 import org.apache.catalina.Context;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.directmemory.serialization.SerializerFactory;
-import org.apache.directmemory.server.client.DefaultDirectMemoryServerClient;
+import org.apache.directmemory.server.client.DefaultDirectMemoryClient;
 import org.apache.directmemory.server.client.DirectMemoryClientConfiguration;
 import org.apache.directmemory.server.client.DirectMemoryHttpClient;
-import org.apache.directmemory.server.client.DirectMemoryServerClient;
+import org.apache.directmemory.server.client.DirectMemoryClient;
 import org.apache.directmemory.server.client.HttpClientDirectMemoryHttpClient;
 import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
 import org.apache.directmemory.server.commons.DirectMemoryCacheResponse;
@@ -48,7 +48,7 @@ public abstract class AbstractServletWit
 
     private int port;
 
-    DirectMemoryServerClient client;
+    DirectMemoryClient client;
 
     protected abstract ExchangeType getExchangeType();
 
@@ -83,7 +83,7 @@ public abstract class AbstractServletWit
         DirectMemoryHttpClient httpClient = 
HttpClientDirectMemoryHttpClient.instance( configuration );
         configuration.setDirectMemoryHttpClient( httpClient );
 
-        client = DefaultDirectMemoryServerClient.instance( configuration );
+        client = DefaultDirectMemoryClient.instance( configuration );
         // END SNIPPET: client-configuration
     }

Reply via email to