Changeset 4247

Timestamp:

01/10/14 09:35:01 (10 years ago)

Author:

keeloo

Message:

Added parameters controlling the Wicket page store. Please update your VloConfig? files by adding and defining the pagesInApplicationCache and sessionCacheSize parameters.

Location:

vlo/branches/to-wicket-1.6

Files:

• vlo_importer/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) (4 diffs)
• vlo_importer/src/main/resources/VloConfig.xml (modified) (1 diff)
• vlo_importer/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigTest.java (modified) (1 diff)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloWebApplication.java (modified) (4 diffs)

vlo/branches/to-wicket-1.6/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java

@@ -105 +105 @@
 
         /**
-         * Initialize the ConfigFilePersister's reference to the interface 
+         * Initialise the ConfigFilePersister's reference to the interface 
          */
         ConfigFilePersister.setLogger(VloConfig.logger);
@@ -148 +148 @@
     }
 
-    /**
+    /*
      * VLO application parameter members<br><br>
      *
-     * Initialise the annotated members in a proper way. This will allow them to
-     * be linearised to corresponding elements in an XML file.
+     * Please Initialise the annotated members in a proper way. This will allow 
+     * them to be linearised to corresponding elements in an XML file.
      * 
      * Please refer to the general VLO documentation for a description of the
      * member parameters.
      */
+    
+    // page cache related parameters
+    
+    @Element 
+    private static int pagesInApplicationCache = 0;
+    
+    @Element
+    private static int sessionCacheSize = 0;
     
     // data base related parameters
@@ -294 +302 @@
      * application.
      */
-    
+            
+    /**
+     * Get the value of the pagesInApplicationCache parameter<br><br>
+     *
+     * The parameter represents the number of pages that Wicket will allow
+     * to be stored in the application's cache.
+     *
+     * @return the value
+     */ 
+    public static int getPagesInApplicationCache() {
+        return pagesInApplicationCache;
+    }
+
+    /**
+     * Set the value of the pagesInApplicationCache parameter<br><br>
+     * 
+     * The parameter represents the number of pages that Wicket will allow
+     * to be stored in the application's cache.
+     *
+     * @param param the value
+     */
+    public static void setPagesInApplicationCache(int param) {
+        pagesInApplicationCache = param;
+    }
+    
+    /**
+     * Get the value of the sessionCacheSize parameter<br><br>
+     *
+     * The parameter represents the size in kilobytes of the session
+     * page cache.
+     *
+     * @return the value
+     */ 
+    public static int getSessionCacheSize() {
+        return sessionCacheSize;
+    }
+
+    /**
+     * Set the value of the sessionCacheSize parameter<br><br>
+     *
+     * The parameter represents the size in megabytes of the session
+     * page cache.
+     *
+     * @param param the value
+     */
+    public static void setSessionCacheSize(int param) {
+        sessionCacheSize = param;
+    }
+
     /**
      * Get the value of the deleteAllFirst parameter<br><br>
@@ -302 +358 @@
      *
      * @return the value
-     */
-    
+     */ 
     public static boolean deleteAllFirst() {
         return deleteAllFirst;

vlo/branches/to-wicket-1.6/vlo_importer/src/main/resources/VloConfig.xml

@@ -1 +1 @@
 <VloConfig>
+    
+    <pagesInApplicationCache>128</pagesInApplicationCache>
+    
+    <sessionCacheSize>500</sessionCacheSize>
    
     <deleteAllFirst>true</deleteAllFirst>

vlo/branches/to-wicket-1.6/vlo_importer/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigTest.java

@@ -87 +87 @@
     }
 
+    /**
+     * Test the getPagesInApplicationCache method
+     */
+    @Test
+    public void testGetPagesInApplicationCache() {
+        
+        System.out.println("getPagesInApplicationCache");
+        
+        int expResult = 128;
+        int result = VloConfig.getPagesInApplicationCache();
+        
+        assertEquals(expResult, result);
+    }
+
+    /**
+     * Test the setPagesInApplicationCache method
+     */
+    @Test
+    public void testSetPagesInApplicationCache() {
+        
+        System.out.println("setPagesInApplicationCache");
+        
+        int param = 500;
+        
+        VloConfig.setPagesInApplicationCache(param);
+
+        int result = VloConfig.getPagesInApplicationCache();
+        
+        assertEquals(param, result);
+    }
+    
+    
+    /**
+     * Test the getSessionCacheSize method
+     */
+    @Test
+    public void testGetSessionCacheSize() {
+        
+        System.out.println("getPagesInApplicationCache");
+        
+        int expResult = 128;
+        int result = VloConfig.getPagesInApplicationCache();
+        
+        assertEquals(expResult, result);
+    }
+
+    /**
+     * Test the setSessionCacheSize method
+     */
+    @Test
+    public void testSetSessionCacheSize() {
+        
+        System.out.println("setPagesInApplicationCache");
+        
+        int param = 128;
+        
+        VloConfig.setMaxDocsInList(param);
+
+        int result = VloConfig.getPagesInApplicationCache();
+        
+        assertEquals(param, result);
+    }
+    
     /**
      * Test the getMaxDocsInList method

vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloWebApplication.java

@@ -20 +20 @@
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.util.string.StringValue;
+import org.apache.wicket.util.lang.Bytes;
 
 /**
@@ -86 +87 @@
 
         if (inContext) {
-
+            
             /*
              * send messages to objects that need a static reference to this web
@@ -110 +111 @@
             getRequestCycleListeners().add(new CustomRequestCycleListener());
         }
+        
+        // configure cache by applying the vlo configuration settings to it
+        this.getStoreSettings().setInmemoryCacheSize(VloConfig.getPagesInApplicationCache());
+        this.getStoreSettings().setMaxSizePerSession(Bytes.kilobytes((long)VloConfig.getSessionCacheSize()));
 
         // creata an object referring to the search results
@@ -140 +145 @@
      */
     public VloWebApplication() {
-
+        
         /*
          * Read the application's packaged configuration