You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by ol...@apache.org on 2012/02/22 23:07:24 UTC
svn commit: r1292538 - 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/
Author: olamy
Date: Wed Feb 22 22:07:24 2012
New Revision: 1292538
URL: http://svn.apache.org/viewvc?rev=1292538&view=rev
Log:
rename client configuration class
Added:
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java (contents, props changed)
- copied, changed from r1292537, incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryServerClientConfiguration.java
Removed:
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryServerClientConfiguration.java
Modified:
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/AbstractDirectMemoryHttpClient.java
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/DirectMemoryHttpClient.java
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
Modified: incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/AbstractDirectMemoryHttpClient.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/AbstractDirectMemoryHttpClient.java?rev=1292538&r1=1292537&r2=1292538&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/AbstractDirectMemoryHttpClient.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/AbstractDirectMemoryHttpClient.java Wed Feb 22 22:07:24 2012
@@ -45,9 +45,9 @@ public abstract class AbstractDirectMemo
private DirectMemoryCacheParser parser = DirectMemoryCacheParser.instance();
- protected DirectMemoryServerClientConfiguration configuration;
+ protected DirectMemoryClientConfiguration configuration;
- protected AbstractDirectMemoryHttpClient( DirectMemoryServerClientConfiguration configuration )
+ protected AbstractDirectMemoryHttpClient( DirectMemoryClientConfiguration configuration )
{
this.configuration = configuration;
}
@@ -98,7 +98,7 @@ public abstract class AbstractDirectMemo
{
DirectMemoryCacheResponse response = new DirectMemoryCacheResponse();
response.setResponse( request.getSerializer().deserialize( IOUtils.toByteArray( inputStream ),
- request.getObjectClass() ) );
+ request.getObjectClass() ) );
return response;
}
Modified: 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/DefaultDirectMemoryServerClient.java?rev=1292538&r1=1292537&r2=1292538&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/DefaultDirectMemoryServerClient.java Wed Feb 22 22:07:24 2012
@@ -33,17 +33,17 @@ public class DefaultDirectMemoryServerCl
implements DirectMemoryServerClient
{
- public static DirectMemoryServerClient instance( DirectMemoryServerClientConfiguration configuration )
+ public static DirectMemoryServerClient instance( DirectMemoryClientConfiguration configuration )
throws DirectMemoryCacheException
{
return new DefaultDirectMemoryServerClient( configuration );
}
- private DirectMemoryServerClientConfiguration clientConfiguration;
+ private DirectMemoryClientConfiguration clientConfiguration;
private DirectMemoryHttpClient directMemoryHttpClient;
- private DefaultDirectMemoryServerClient( DirectMemoryServerClientConfiguration configuration )
+ private DefaultDirectMemoryServerClient( DirectMemoryClientConfiguration configuration )
throws DirectMemoryCacheException
{
this.directMemoryHttpClient = configuration.getDirectMemoryHttpClient();
Copied: incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java (from r1292537, incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryServerClientConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java?p2=incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java&p1=incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryServerClientConfiguration.java&r1=1292537&r2=1292538&rev=1292538&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryServerClientConfiguration.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java Wed Feb 22 22:07:24 2012
@@ -25,7 +25,7 @@ import org.apache.directmemory.server.co
/**
* @author Olivier Lamy
*/
-public class DirectMemoryServerClientConfiguration
+public class DirectMemoryClientConfiguration
{
@@ -55,7 +55,7 @@ public class DirectMemoryServerClientCon
private DirectMemoryHttpClient directMemoryHttpClient;
- public DirectMemoryServerClientConfiguration()
+ public DirectMemoryClientConfiguration()
{
// no op
}
@@ -65,7 +65,7 @@ public class DirectMemoryServerClientCon
return host;
}
- public DirectMemoryServerClientConfiguration setHost( String host )
+ public DirectMemoryClientConfiguration setHost( String host )
{
this.host = host;
return this;
@@ -76,7 +76,7 @@ public class DirectMemoryServerClientCon
return port;
}
- public DirectMemoryServerClientConfiguration setPort( int port )
+ public DirectMemoryClientConfiguration setPort( int port )
{
this.port = port;
return this;
@@ -87,7 +87,7 @@ public class DirectMemoryServerClientCon
return httpPath;
}
- public DirectMemoryServerClientConfiguration setHttpPath( String httpPath )
+ public DirectMemoryClientConfiguration setHttpPath( String httpPath )
{
this.httpPath = httpPath;
return this;
@@ -98,7 +98,7 @@ public class DirectMemoryServerClientCon
return directMemoryHttpClient;
}
- public DirectMemoryServerClientConfiguration setDirectMemoryHttpClient(
+ public DirectMemoryClientConfiguration setDirectMemoryHttpClient(
DirectMemoryHttpClient directMemoryHttpClient )
throws DirectMemoryCacheException
{
@@ -112,7 +112,7 @@ public class DirectMemoryServerClientCon
return maxConcurentConnection;
}
- public DirectMemoryServerClientConfiguration setMaxConcurentConnection( int maxConcurentConnection )
+ public DirectMemoryClientConfiguration setMaxConcurentConnection( int maxConcurentConnection )
{
this.maxConcurentConnection = maxConcurentConnection;
return this;
@@ -123,7 +123,7 @@ public class DirectMemoryServerClientCon
return connectionTimeOut;
}
- public DirectMemoryServerClientConfiguration setConnectionTimeOut( long connectionTimeOut )
+ public DirectMemoryClientConfiguration setConnectionTimeOut( long connectionTimeOut )
{
this.connectionTimeOut = connectionTimeOut;
return this;
@@ -134,7 +134,7 @@ public class DirectMemoryServerClientCon
return readTimeOut;
}
- public DirectMemoryServerClientConfiguration setReadTimeOut( long readTimeOut )
+ public DirectMemoryClientConfiguration setReadTimeOut( long readTimeOut )
{
this.readTimeOut = readTimeOut;
return this;
@@ -145,7 +145,7 @@ public class DirectMemoryServerClientCon
return protocol;
}
- public DirectMemoryServerClientConfiguration setProtocol( String protocol )
+ public DirectMemoryClientConfiguration setProtocol( String protocol )
{
this.protocol = protocol;
return this;
@@ -156,7 +156,7 @@ public class DirectMemoryServerClientCon
return exchangeType;
}
- public DirectMemoryServerClientConfiguration setExchangeType( ExchangeType exchangeType )
+ public DirectMemoryClientConfiguration setExchangeType( ExchangeType exchangeType )
{
this.exchangeType = exchangeType;
return this;
@@ -167,7 +167,7 @@ public class DirectMemoryServerClientCon
return serializer;
}
- public DirectMemoryServerClientConfiguration setSerializer( Serializer serializer )
+ public DirectMemoryClientConfiguration setSerializer( Serializer serializer )
{
this.serializer = serializer;
return this;
Propchange: incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryHttpClient.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryHttpClient.java?rev=1292538&r1=1292537&r2=1292538&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryHttpClient.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryHttpClient.java Wed Feb 22 22:07:24 2012
@@ -29,7 +29,7 @@ import java.util.concurrent.Future;
*/
public interface DirectMemoryHttpClient
{
- void configure( DirectMemoryServerClientConfiguration configuration )
+ void configure( DirectMemoryClientConfiguration configuration )
throws DirectMemoryCacheException;
void put( DirectMemoryCacheRequest request )
Modified: incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java?rev=1292538&r1=1292537&r2=1292538&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java Wed Feb 22 22:07:24 2012
@@ -48,7 +48,7 @@ public class HttpClientDirectMemoryHttpC
{
private Logger log = LoggerFactory.getLogger( getClass() );
- public static HttpClientDirectMemoryHttpClient instance( DirectMemoryServerClientConfiguration configuration )
+ public static HttpClientDirectMemoryHttpClient instance( DirectMemoryClientConfiguration configuration )
{
return new HttpClientDirectMemoryHttpClient( configuration );
}
@@ -56,13 +56,13 @@ public class HttpClientDirectMemoryHttpC
private HttpClient httpClient;
- public HttpClientDirectMemoryHttpClient( DirectMemoryServerClientConfiguration configuration )
+ public HttpClientDirectMemoryHttpClient( DirectMemoryClientConfiguration configuration )
{
super( configuration );
}
@Override
- public void configure( DirectMemoryServerClientConfiguration configuration )
+ public void configure( DirectMemoryClientConfiguration configuration )
throws DirectMemoryCacheException
{
this.configuration = configuration;
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=1292538&r1=1292537&r2=1292538&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 22:07:24 2012
@@ -22,9 +22,9 @@ 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.DirectMemoryClientConfiguration;
import org.apache.directmemory.server.client.DirectMemoryHttpClient;
import org.apache.directmemory.server.client.DirectMemoryServerClient;
-import org.apache.directmemory.server.client.DirectMemoryServerClientConfiguration;
import org.apache.directmemory.server.client.HttpClientDirectMemoryHttpClient;
import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
import org.apache.directmemory.server.commons.DirectMemoryCacheResponse;
@@ -72,8 +72,8 @@ public abstract class AbstractServletWit
log.info( "Tomcat started on port:" + port );
// START SNIPPET: client-configuration
- DirectMemoryServerClientConfiguration configuration =
- new DirectMemoryServerClientConfiguration()
+ DirectMemoryClientConfiguration configuration =
+ new DirectMemoryClientConfiguration()
.setHost( "localhost" )
.setPort( port )
.setHttpPath( "/direct-memory/CacheServlet" )