svn commit: r1294821 - in /incubator/directmemory/trunk: examples/server-example/src/main/webapp/ examples/server-example/src/main/webapp/js/ server/directmemory-server/src/main/java/org/apache/directmemory/server/services/

[ol...@apache.org]

Author: olamy
Date: Tue Feb 28 20:47:17 2012
New Revision: 1294821

URL: http://svn.apache.org/viewvc?rev=1294821&view=rev
Log:
sample with deleted remote content entry

Modified:
    incubator/directmemory/trunk/examples/server-example/src/main/webapp/index.html
    incubator/directmemory/trunk/examples/server-example/src/main/webapp/js/sample.js
    incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java

Modified: incubator/directmemory/trunk/examples/server-example/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/examples/server-example/src/main/webapp/index.html?rev=1294821&r1=1294820&r2=1294821&view=diff
==============================================================================
--- incubator/directmemory/trunk/examples/server-example/src/main/webapp/index.html (original)
+++ incubator/directmemory/trunk/examples/server-example/src/main/webapp/index.html Tue Feb 28 20:47:17 2012
@@ -62,6 +62,14 @@
               <button class="btn" id="get_cache_btn">Get</button>
           </div>
         </div>
+        <div id="wine-cache-delete-div">
+          <div class="page-header"><h4>Delete from cache</h4></div>
+          <div class="well">
+              Wine Key:&nbsp<input type="text" id="wine_key_cache" name="wine_key_cache">
+              <br/>
+              <button class="btn" id="delete_cache_btn">Delete</button>
+          </div>
+        </div>
 
     </div>
   </div>

Modified: incubator/directmemory/trunk/examples/server-example/src/main/webapp/js/sample.js
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/examples/server-example/src/main/webapp/js/sample.js?rev=1294821&r1=1294820&r2=1294821&view=diff
==============================================================================
--- incubator/directmemory/trunk/examples/server-example/src/main/webapp/js/sample.js (original)
+++ incubator/directmemory/trunk/examples/server-example/src/main/webapp/js/sample.js Tue Feb 28 20:47:17 2012
@@ -64,6 +64,26 @@ $(function() {
     });
   }
 
+  deleteFromCache=function(key){
+    $.ajax({
+      url: 'cache/'+encodeURIComponent(key),
+      cache: false,
+      type: 'DELETE',
+      dataType: 'text',
+      statusCode: {
+        204: function() {
+          displayWarning("not found in cache");
+        },
+        200:function( data ) {
+          displayInfo(' key '+key+ ' deleted from cache');
+        },
+        500:function(data){
+          displayError("error delete from cache");
+        }
+      }
+    });
+  }
+
   $(document).ready(function() {
 
     $("#put-cache-btn").on('click',function(){
@@ -104,6 +124,16 @@ $(function() {
 
     });
 
+    $("#delete_cache_btn").on('click',function(){
+      var key = $("#wine_key_cache" ).val();
+      if ( $.trim(key).length<1){
+        displayError("key mandatory");
+        return;
+      }
+      deleteFromCache(key);
+    });
+
+
   });
 
 

Modified: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java?rev=1294821&r1=1294820&r2=1294821&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java Tue Feb 28 20:47:17 2012
@@ -137,7 +137,6 @@ public class DirectMemoryServlet
             resp.sendError( HttpServletResponse.SC_NO_CONTENT, "Content not put in cache for key: " + key );
             return;
         }
-
     }
 
     protected ContentTypeHandler findPutCacheContentTypeHandler( HttpServletRequest req, HttpServletResponse response )
@@ -165,7 +164,6 @@ public class DirectMemoryServlet
         String servletPath = req.getServletPath();
         String key = retrieveKeyFromPath( path );
 
-        // TODO if key == null -> BAD_REQUEST http response or SC_NO_CONTENT (olamy: I prefer SC_NO_CONTENT )
         Pointer pointer = cacheService.getPointer( key );
         if ( pointer == null )
         {