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:54 UTC
svn commit: r1292539 - in /incubator/directmemory/trunk/server: directmemory-server-client/src/main/java/org/apache/directmemory/server/client/ directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/ directmemory-server/src/ma...

Author: olamy
Date: Wed Feb 22 22:07:53 2012
New Revision: 1292539

URL: http://svn.apache.org/viewvc?rev=1292539&view=rev
Log:
move constants to common part

Added:
    incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryHttpConstants.java   (contents, props changed)
      - copied, changed from r1292538, incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServletConstants.java
Removed:
    incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServletConstants.java
Modified:
    incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java
    incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/ExchangeType.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

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=1292539&r1=1292538&r2=1292539&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:53 2012
@@ -21,6 +21,7 @@ package org.apache.directmemory.server.c
 import org.apache.directmemory.server.commons.DirectMemoryCacheException;
 import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
 import org.apache.directmemory.server.commons.DirectMemoryCacheResponse;
+import org.apache.directmemory.server.commons.DirectMemoryHttpConstants;
 import org.apache.directmemory.server.commons.ExchangeType;
 import org.apache.http.HttpResponse;
 import org.apache.http.StatusLine;
@@ -83,7 +84,8 @@ public class HttpClientDirectMemoryHttpC
 
         if ( request.getExchangeType() == ExchangeType.JAVA_SERIALIZED_OBJECT && request.getExpiresIn() > 0 )
         {
-            httpPut.addHeader( "X-DirectMemory-ExpiresIn", Integer.toString( request.getExpiresIn() ) );
+            httpPut.addHeader( DirectMemoryHttpConstants.EXPIRES_IN_HTTP_HEADER,
+                               Integer.toString( request.getExpiresIn() ) );
         }
 
         httpPut.setEntity( new ByteArrayEntity( getPutContent( request ) ) );

Copied: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryHttpConstants.java (from r1292538, incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServletConstants.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryHttpConstants.java?p2=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryHttpConstants.java&p1=incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServletConstants.java&r1=1292538&r2=1292539&rev=1292539&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServletConstants.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryHttpConstants.java Wed Feb 22 22:07:53 2012
@@ -1,4 +1,4 @@
-package org.apache.directmemory.server.services;
+package org.apache.directmemory.server.commons;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,7 +21,7 @@ package org.apache.directmemory.server.s
 /**
  * @author Olivier Lamy
  */
-public class CacheServletConstants
+public class DirectMemoryHttpConstants
 {
     public static final String JAVA_SERIALIZED_OBJECT_CONTENT_TYPE_HEADER = "application/x-java-serialized-object";
 
@@ -30,7 +30,7 @@ public class CacheServletConstants
     public static final String EXPIRES_IN_HTTP_HEADER = "X-DirectMemory-ExpiresIn";
 
 
-    private CacheServletConstants()
+    private DirectMemoryHttpConstants()
     {
         // no op only a constants class
     }

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

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

Modified: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/ExchangeType.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/ExchangeType.java?rev=1292539&r1=1292538&r2=1292539&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/ExchangeType.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/ExchangeType.java Wed Feb 22 22:07:53 2012
@@ -23,8 +23,8 @@ package org.apache.directmemory.server.c
  */
 public enum ExchangeType
 {
-    JSON( "application/json", 1 ), JAVA_SERIALIZED_OBJECT( "application/x-java-serialized-object", 2 ), TEXT_PLAIN(
-    "text/plain", 3 );
+    JSON( "application/json", 1 ), JAVA_SERIALIZED_OBJECT(
+    DirectMemoryHttpConstants.JAVA_SERIALIZED_OBJECT_CONTENT_TYPE_HEADER, 2 ), TEXT_PLAIN( "text/plain", 3 );
 
     private String contentType;
 

Modified: 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/CacheServlet.java?rev=1292539&r1=1292538&r2=1292539&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/CacheServlet.java Wed Feb 22 22:07:53 2012
@@ -22,6 +22,7 @@ import org.apache.commons.lang.StringUti
 import org.apache.directmemory.cache.CacheService;
 import org.apache.directmemory.cache.CacheServiceImpl;
 import org.apache.directmemory.memory.Pointer;
+import org.apache.directmemory.server.commons.DirectMemoryHttpConstants;
 import org.apache.directmemory.server.commons.DirectMemoryCacheException;
 import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
 import org.slf4j.Logger;
@@ -72,7 +73,7 @@ public class CacheServlet
 
         contentTypeHandlers = new HashMap<String, CacheContentTypeHandler>( 2 );
         contentTypeHandlers.put( MediaType.APPLICATION_JSON, new JsonCacheContentTypeHandler() );
-        contentTypeHandlers.put( CacheServletConstants.JAVA_SERIALIZED_OBJECT_CONTENT_TYPE_HEADER,
+        contentTypeHandlers.put( DirectMemoryHttpConstants.JAVA_SERIALIZED_OBJECT_CONTENT_TYPE_HEADER,
                                  new JavaSerializedCacheContentTypeHandler() );
     }
 

Modified: 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/JavaSerializedCacheContentTypeHandler.java?rev=1292539&r1=1292538&r2=1292539&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/JavaSerializedCacheContentTypeHandler.java Wed Feb 22 22:07:53 2012
@@ -20,6 +20,7 @@ package org.apache.directmemory.server.s
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.directmemory.server.commons.DirectMemoryHttpConstants;
 import org.apache.directmemory.server.commons.DirectMemoryCacheException;
 import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
 import org.slf4j.Logger;
@@ -41,7 +42,7 @@ public class JavaSerializedCacheContentT
     public byte[] handleGet( DirectMemoryCacheRequest request, byte[] cacheResponseContent, HttpServletResponse resp )
         throws DirectMemoryCacheException, IOException
     {
-        resp.setContentType( CacheServletConstants.JAVA_SERIALIZED_OBJECT_CONTENT_TYPE_HEADER );
+        resp.setContentType( DirectMemoryHttpConstants.JAVA_SERIALIZED_OBJECT_CONTENT_TYPE_HEADER );
         return cacheResponseContent;
     }
 
@@ -49,7 +50,7 @@ public class JavaSerializedCacheContentT
     public DirectMemoryCacheRequest handlePut( HttpServletRequest request, HttpServletResponse response )
         throws DirectMemoryCacheException, IOException
     {
-        String expiresInHeader = request.getHeader( CacheServletConstants.EXPIRES_IN_HTTP_HEADER );
+        String expiresInHeader = request.getHeader( DirectMemoryHttpConstants.EXPIRES_IN_HTTP_HEADER );
         int expiresIn = StringUtils.isEmpty( expiresInHeader ) ? 0 : Integer.valueOf( expiresInHeader );
         log.debug( "expiresIn: {} for header value: {}", expiresIn, expiresInHeader );
         return new DirectMemoryCacheRequest().setExpiresIn( expiresIn ).setCacheContent(