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/23 00:24:43 UTC
svn commit: r1292583 - in
/incubator/directmemory/trunk/server/directmemory-server/src:
main/java/org/apache/directmemory/server/services/ main/webapp/WEB-INF/
test/java/org/apache/directmemory/server/services/
Author: olamy
Date: Wed Feb 22 23:24:42 2012
New Revision: 1292583
URL: http://svn.apache.org/viewvc?rev=1292583&view=rev
Log:
remove Cache from classes name we know DirectMemory is a cache :-)
Added:
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/ContentTypeHandler.java (contents, props changed)
- copied, changed from r1292582, incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheContentTypeHandler.java
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java (contents, props changed)
- copied, changed from r1292582, incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServlet.java
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedContentTypeHandler.java (contents, props changed)
- copied, changed from r1292582, incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedCacheContentTypeHandler.java
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonContentTypeHandler.java (contents, props changed)
- copied, changed from r1292582, incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonCacheContentTypeHandler.java
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/DirectMemoryServletTest.java (contents, props changed)
- copied, changed from r1292582, incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java
Removed:
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheContentTypeHandler.java
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServlet.java
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedCacheContentTypeHandler.java
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonCacheContentTypeHandler.java
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java
Modified:
incubator/directmemory/trunk/server/directmemory-server/src/main/webapp/WEB-INF/web.xml
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ExtractKeyFromPathTest.java
Copied: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/ContentTypeHandler.java (from r1292582, incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheContentTypeHandler.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/ContentTypeHandler.java?p2=incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/ContentTypeHandler.java&p1=incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheContentTypeHandler.java&r1=1292582&r2=1292583&rev=1292583&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheContentTypeHandler.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/ContentTypeHandler.java Wed Feb 22 23:24:42 2012
@@ -28,7 +28,7 @@ import java.io.IOException;
/**
* @author Olivier Lamy
*/
-public interface CacheContentTypeHandler
+public interface ContentTypeHandler
{
byte[] handleGet( DirectMemoryRequest request, byte[] cacheResponseContent, HttpServletResponse response )
throws DirectMemoryException, IOException;
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/ContentTypeHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/ContentTypeHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java (from r1292582, incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServlet.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java?p2=incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java&p1=incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServlet.java&r1=1292582&r2=1292583&rev=1292583&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServlet.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java Wed Feb 22 23:24:42 2012
@@ -43,7 +43,7 @@ import java.util.Map;
*
* @author Olivier Lamy
*/
-public class CacheServlet
+public class DirectMemoryServlet
extends HttpServlet
{
@@ -51,7 +51,7 @@ public class CacheServlet
private CacheService cacheService = new CacheServiceImpl();
- private Map<String, CacheContentTypeHandler> contentTypeHandlers;
+ private Map<String, ContentTypeHandler> contentTypeHandlers;
@Override
@@ -71,10 +71,10 @@ public class CacheServlet
//
- contentTypeHandlers = new HashMap<String, CacheContentTypeHandler>( 2 );
- contentTypeHandlers.put( MediaType.APPLICATION_JSON, new JsonCacheContentTypeHandler() );
+ contentTypeHandlers = new HashMap<String, ContentTypeHandler>( 2 );
+ contentTypeHandlers.put( MediaType.APPLICATION_JSON, new JsonContentTypeHandler() );
contentTypeHandlers.put( DirectMemoryHttpConstants.JAVA_SERIALIZED_OBJECT_CONTENT_TYPE_HEADER,
- new JavaSerializedCacheContentTypeHandler() );
+ new JavaSerializedContentTypeHandler() );
}
@Override
@@ -103,7 +103,7 @@ public class CacheServlet
DirectMemoryRequest request = null;
- CacheContentTypeHandler contentTypeHandler = findPutCacheContentTypeHandler( req, resp );
+ ContentTypeHandler contentTypeHandler = findPutCacheContentTypeHandler( req, resp );
if ( contentTypeHandler == null )
{
@@ -128,7 +128,7 @@ public class CacheServlet
cacheService.putByteArray( key, request.getCacheContent(), request.getExpiresIn() );
}
- protected CacheContentTypeHandler findPutCacheContentTypeHandler( HttpServletRequest req,
+ protected ContentTypeHandler findPutCacheContentTypeHandler( HttpServletRequest req,
HttpServletResponse response )
{
@@ -183,7 +183,7 @@ public class CacheServlet
return;
}
- CacheContentTypeHandler contentTypeHandler = findGetCacheContentTypeHandler( req, resp );
+ ContentTypeHandler contentTypeHandler = findGetCacheContentTypeHandler( req, resp );
if ( contentTypeHandler == null )
{
@@ -218,7 +218,7 @@ public class CacheServlet
}
- protected CacheContentTypeHandler findGetCacheContentTypeHandler( HttpServletRequest req,
+ protected ContentTypeHandler findGetCacheContentTypeHandler( HttpServletRequest req,
HttpServletResponse response )
{
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedContentTypeHandler.java (from r1292582, incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedCacheContentTypeHandler.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedContentTypeHandler.java?p2=incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedContentTypeHandler.java&p1=incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedCacheContentTypeHandler.java&r1=1292582&r2=1292583&rev=1292583&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedCacheContentTypeHandler.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedContentTypeHandler.java Wed Feb 22 23:24:42 2012
@@ -33,8 +33,8 @@ import java.io.IOException;
/**
* @author Olivier Lamy
*/
-public class JavaSerializedCacheContentTypeHandler
- implements CacheContentTypeHandler
+public class JavaSerializedContentTypeHandler
+ implements ContentTypeHandler
{
private Logger log = LoggerFactory.getLogger( getClass() );
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedContentTypeHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedContentTypeHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonContentTypeHandler.java (from r1292582, incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonCacheContentTypeHandler.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonContentTypeHandler.java?p2=incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonContentTypeHandler.java&p1=incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonCacheContentTypeHandler.java&r1=1292582&r2=1292583&rev=1292583&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonCacheContentTypeHandler.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonContentTypeHandler.java Wed Feb 22 23:24:42 2012
@@ -32,8 +32,8 @@ import java.io.IOException;
/**
* @author Olivier Lamy
*/
-public class JsonCacheContentTypeHandler
- implements CacheContentTypeHandler
+public class JsonContentTypeHandler
+ implements ContentTypeHandler
{
private DirectMemoryParser parser = DirectMemoryParser.instance();
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonContentTypeHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonContentTypeHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/directmemory/trunk/server/directmemory-server/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/main/webapp/WEB-INF/web.xml?rev=1292583&r1=1292582&r2=1292583&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/main/webapp/WEB-INF/web.xml Wed Feb 22 23:24:42 2012
@@ -23,12 +23,12 @@
<display-name>Apache DirectMemory</display-name>
<servlet>
- <servlet-name>CacheServlet</servlet-name>
- <servlet-class>org.apache.directmemory.server.services.CacheServlet</servlet-class>
+ <servlet-name>DirectMemoryServlet</servlet-name>
+ <servlet-class>org.apache.directmemory.server.services.DirectMemoryServlet</servlet-class>
</servlet>
<servlet-mapping>
- <servlet-name>CacheServlet</servlet-name>
+ <servlet-name>DirectMemoryServlet</servlet-name>
<url-pattern>/cache/*</url-pattern>
</servlet-mapping>
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=1292583&r1=1292582&r2=1292583&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:24:42 2012
@@ -62,8 +62,8 @@ public abstract class AbstractServletWit
Context context = tomcat.addContext( "/direct-memory", System.getProperty( "java.io.tmpdir" ) );
- tomcat.addServlet( context, CacheServlet.class.getName(), new CacheServlet() );
- context.addServletMapping( "/CacheServlet/*", CacheServlet.class.getName() );
+ tomcat.addServlet( context, DirectMemoryServlet.class.getName(), new DirectMemoryServlet() );
+ context.addServletMapping( "/DirectMemoryServlet/*", DirectMemoryServlet.class.getName() );
tomcat.start();
@@ -76,7 +76,7 @@ public abstract class AbstractServletWit
new DirectMemoryClientConfiguration()
.setHost( "localhost" )
.setPort( port )
- .setHttpPath( "/direct-memory/CacheServlet" )
+ .setHttpPath( "/direct-memory/DirectMemoryServlet" )
.setSerializer( SerializerFactory.createNewSerializer() )
.setExchangeType( getExchangeType() );
Copied: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/DirectMemoryServletTest.java (from r1292582, incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/DirectMemoryServletTest.java?p2=incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/DirectMemoryServletTest.java&p1=incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java&r1=1292582&r2=1292583&rev=1292583&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/DirectMemoryServletTest.java Wed Feb 22 23:24:42 2012
@@ -43,11 +43,11 @@ import static org.junit.Assert.assertEqu
/**
* @author Olivier Lamy
*/
-public class CacheServletTest
+public class DirectMemoryServletTest
{
private Logger log = LoggerFactory.getLogger( getClass() );
- CacheServlet cacheServlet = new CacheServlet();
+ DirectMemoryServlet directMemoryServlet = new DirectMemoryServlet();
DirectMemoryWriter writer = DirectMemoryWriter.instance();
@@ -63,7 +63,7 @@ public class CacheServletTest
MockServletConfig mockServletConfig = new MockServletConfig( mockServletContext );
- cacheServlet.init( mockServletConfig );
+ directMemoryServlet.init( mockServletConfig );
}
@Test
@@ -76,7 +76,7 @@ public class CacheServletTest
MockHttpServletResponse response = new MockHttpServletResponse();
- cacheServlet.doGet( request, response );
+ directMemoryServlet.doGet( request, response );
assertEquals( HttpServletResponse.SC_BAD_REQUEST, response.getStatus() );
@@ -97,7 +97,7 @@ public class CacheServletTest
MockHttpServletResponse response = new MockHttpServletResponse();
- cacheServlet.doGet( request, response );
+ directMemoryServlet.doGet( request, response );
assertEquals( HttpServletResponse.SC_NO_CONTENT, response.getStatus() );
@@ -129,7 +129,7 @@ public class CacheServletTest
MockHttpServletResponse putResponse = new MockHttpServletResponse();
- cacheServlet.doPut( putRequest, putResponse );
+ directMemoryServlet.doPut( putRequest, putResponse );
assertEquals( HttpServletResponse.SC_OK, putResponse.getStatus() );
@@ -143,7 +143,7 @@ public class CacheServletTest
MockHttpServletResponse getResponse = new MockHttpServletResponse();
- cacheServlet.doGet( getRequest, getResponse );
+ directMemoryServlet.doGet( getRequest, getResponse );
assertEquals( HttpServletResponse.SC_OK, getResponse.getStatus() );
@@ -186,7 +186,7 @@ public class CacheServletTest
MockHttpServletResponse putResponse = new MockHttpServletResponse();
- cacheServlet.doPut( putRequest, putResponse );
+ directMemoryServlet.doPut( putRequest, putResponse );
assertEquals( HttpServletResponse.SC_OK, putResponse.getStatus() );
@@ -202,7 +202,7 @@ public class CacheServletTest
MockHttpServletResponse getResponse = new MockHttpServletResponse();
- cacheServlet.doGet( getRequest, getResponse );
+ directMemoryServlet.doGet( getRequest, getResponse );
assertEquals( HttpServletResponse.SC_NO_CONTENT, getResponse.getStatus() );
@@ -236,7 +236,7 @@ public class CacheServletTest
MockHttpServletResponse putResponse = new MockHttpServletResponse();
- cacheServlet.doPut( putRequest, putResponse );
+ directMemoryServlet.doPut( putRequest, putResponse );
assertEquals( HttpServletResponse.SC_OK, putResponse.getStatus() );
@@ -250,7 +250,7 @@ public class CacheServletTest
MockHttpServletResponse getResponse = new MockHttpServletResponse();
- cacheServlet.doGet( getRequest, getResponse );
+ directMemoryServlet.doGet( getRequest, getResponse );
assertEquals( HttpServletResponse.SC_OK, getResponse.getStatus() );
@@ -272,7 +272,7 @@ public class CacheServletTest
MockHttpServletResponse deleteResponse = new MockHttpServletResponse();
- cacheServlet.doDelete( deleteRq, deleteResponse );
+ directMemoryServlet.doDelete( deleteRq, deleteResponse );
assertEquals( HttpServletResponse.SC_OK, deleteResponse.getStatus() );
@@ -286,7 +286,7 @@ public class CacheServletTest
getResponse = new MockHttpServletResponse();
- cacheServlet.doGet( getRequest, getResponse );
+ directMemoryServlet.doGet( getRequest, getResponse );
assertEquals( HttpServletResponse.SC_NO_CONTENT, getResponse.getStatus() );
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/DirectMemoryServletTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/DirectMemoryServletTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ExtractKeyFromPathTest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ExtractKeyFromPathTest.java?rev=1292583&r1=1292582&r2=1292583&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ExtractKeyFromPathTest.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ExtractKeyFromPathTest.java Wed Feb 22 23:24:42 2012
@@ -28,13 +28,13 @@ import static junit.framework.Assert.ass
public class ExtractKeyFromPathTest
{
- private CacheServlet cacheServlet = new CacheServlet();
+ private DirectMemoryServlet directMemoryServlet = new DirectMemoryServlet();
@Test
public void pathEndedWithSlash()
throws Exception
{
- String key = cacheServlet.retrieveKeyFromPath( "cache/foo/" );
+ String key = directMemoryServlet.retrieveKeyFromPath( "cache/foo/" );
assertEquals( "foo", key );
}
@@ -42,7 +42,7 @@ public class ExtractKeyFromPathTest
public void pathNotEndedWithSlash()
throws Exception
{
- String key = cacheServlet.retrieveKeyFromPath( "/cache/foo" );
+ String key = directMemoryServlet.retrieveKeyFromPath( "/cache/foo" );
assertEquals( "foo", key );
}