Changeset 5041

Timestamp:

04/24/14 09:59:58 (10 years ago)

Author:

yana.panchenko@uni-tuebingen.de

Message:

code clean-up

• use context (environment) variables (in web.xml) instead of constants to define e.g. scan crawl interval, location property to store/get the scan data, etc.
• replace hard-coded data location with the one defined by system property, with fallback 2 default locations: /data and user.home
• re-enable live mode support
• add documentation

Location:

SRUAggregator/trunk

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java (modified) (11 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/app/PagesVisibility.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/app/SearchOptions.java (modified) (10 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/app/WebAppListener.java (modified) (9 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CenterRegistryLive.java (modified) (4 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/Corpus.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusByInstitutionComparator.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusByInstitutionDComparator.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusByNameComparator.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusByNameDComparator.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusModelCached.java (modified) (3 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusModelI.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusModelLive.java (modified) (16 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusRendererLive.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/Endpoint.java (modified) (2 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/Institution.java (modified) (2 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/Language.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/sopt/Languages.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/sresult/Kwic.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/sresult/SearchResultContent.java (modified) (2 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/sresult/SearchResultGroupRenderer.java (modified) (4 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/util/SRUCQL.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/util/ZKComp.java (modified) (2 diffs)
• src/main/webapp/WEB-INF/web.xml (modified) (2 diffs)

SRUAggregator/trunk/pom.xml

@@ -140 +140 @@
             <version>1.9.5</version> 
             <scope>test</scope> 
-        </dependency>  
-        
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
     </dependencies>
     

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java

@@ -14 +14 @@
 import org.zkoss.zul.Textbox;
 import eu.clarin.sru.fcs.aggregator.sopt.Corpus;
+import eu.clarin.sru.fcs.aggregator.sopt.Languages;
 import eu.clarin.sru.fcs.aggregator.util.SRUCQL;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 import org.zkoss.zul.A;
 import org.zkoss.zul.Div;
@@ -60 +63 @@
  * page is displayed and search results of the provided query start to fill
  * it in immediately (i.e. users don't need to click 'search' in the aggregator 
- * page). Was done to meet the request from CLARIN ERIC ( Martin Wynne 
+ * page). Was done to meet the request from CLARIN ERIC (Martin Wynne 
  * contacted us).
+ * 
+ * /?mode=live
+ * corresponds to the mode where the information about corpora are taken not 
+ * from the scan cache (crawled in advance), but loaded live, starting from
+ * the request to center registry and then performing scan operation requests on 
+ * each CQL  endpoint listed there. It takes time to get the corresponding 
+ * responses from the endpoints, therefore the Aggregator page loads very slow 
+ * in this mode. But this mode is useful for testing of the newly added or 
+ * changed corpora without waiting for the next crawl.
  *
+ * 
  * @author Yana Panchenko
  */
@@ -96 +109 @@
     private Label helpLabel;
     @Wire
-    Progressmeter pMeter;
-    @Wire
-    Menubar menubar;
-    @Wire
-    North controls1;
-    @Wire
-    South controls2;
-    @Wire
-    A prevButton;
-    @Wire
-    A nextButton;
-    @Wire
-    Label tooltipPrevText;
-    @Wire
-    Label tooltipNextText;
-    
-    @Wire
-    Menuitem weblichtTcf;
+    private Progressmeter pMeter;
+    @Wire
+    private Menubar menubar;
+    @Wire
+    private North controls1;
+    @Wire
+    private South controls2;
+    @Wire
+    private A prevButton;
+    @Wire
+    private A nextButton;
+    @Wire
+    private Label tooltipPrevText;
+    @Wire
+    private Label tooltipNextText;
+    @Wire
+    private Menuitem weblichtTcf;
     
     private int[] searchOffset = new int[]{1, 0}; // start and size
@@ -119 +131 @@
     private PagesVisibility pagesVisibility;
 
-    private static final String WEBLICHT_URL = 
-            "https://weblicht.sfs.uni-tuebingen.de/WebLicht-4/?input=";
-    
+    private String weblichtUrl; // defined in web.xml
     public static final String MODE_PARAM = "mode";
     public static final String MODE_PARAM_VALUE_TEST = "testing";
@@ -132 +142 @@
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
+        processContext();
         processParameters();
         searchOptionsComposer = (SearchOptions) soDiv.getChildren().get(0).getChildren().get(0).getAttribute("$" + SearchOptions.class.getSimpleName());
@@ -163 +174 @@
             searchOffset[1] = maxRecords;
             searchResultsComposer.executeSearch(selectedCorpora, searchOffset[0], maxRecords, searchString.getText(), searchLang);
-            if (searchLang.equals("anylang")) {
+            if (searchLang.equals(Languages.ANY_LANGUAGE_NAME)) {
                 this.weblichtTcf.setVisible(false);
             } else {
@@ -230 +241 @@
         String url = searchResultsComposer.useWebLichtOnText();
         if (url != null) {
-            Executions.getCurrent().sendRedirect(WEBLICHT_URL
+            Executions.getCurrent().sendRedirect(weblichtUrl
                 + url, "_blank");
         }
@@ -239 +250 @@
         String url = searchResultsComposer.useWebLichtOnToks();
         if (url != null) {
-            Executions.getCurrent().sendRedirect(WEBLICHT_URL
+            Executions.getCurrent().sendRedirect(weblichtUrl
                 + url, "_blank");
         }
@@ -335 +346 @@
             searchOffset[1] = maxRecords;
             searchResultsComposer.executeSearch(selectedCorpora, searchOffset[0], maxRecords, searchString.getText(), searchLang);
-            if (searchLang.equals("anylang")) {
+            if (searchLang.equals(Languages.ANY_LANGUAGE_NAME)) {
                 this.weblichtTcf.setVisible(false);
             } else {
@@ -365 +376 @@
             searchOffset[1] = maxRecords;
             searchResultsComposer.executeSearch(selectedCorpora, searchOffset[0], maxRecords, searchString.getText(), searchLang);
-            if (searchLang.equals("anylang")) {
+            if (searchLang.equals(Languages.ANY_LANGUAGE_NAME)) {
                 this.weblichtTcf.setVisible(false);
             } else {
@@ -408 +419 @@
     }
 
+    private void processContext() {
+        InitialContext context;
+        try {
+            context = new InitialContext();
+            weblichtUrl = (String) context.lookup("java:comp/env/weblicht-url");
+        } catch (NamingException ex) {
+            LOGGER.log(Level.SEVERE, null, ex);
+        }
+    }
+
 }

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/PagesVisibility.java

@@ -6 +6 @@
 /**
  * Class to control which/how page is to be displayed in the main Aggregator window 
- * (about page, search options page, results page or help page).
+ * ('about' page, 'search options' page, 'results' page or 'help' page).
  * 
  * @author Yana Panchenko

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/SearchOptions.java

@@ -63 +63 @@
     @Wire
     private Comboitem anyLanguage;
+    @Wire
+    private Combobox maximumRecordsSelect;
+    @Wire
+    private Groupbox allCorpora;
+    @Wire
+    private Tree tree;
+    @Wire
+    private Treecol nameCol;
+    @Wire
+    private Treecol instCol;
+    
     private Languages languages;
-    
-    @Wire
-    private Combobox maximumRecordsSelect;
-    
-    @Wire
-    private Groupbox allCorpora;
-    @Wire
-    private Tree tree;
     private Map<String, List<String>> xAggregationContext;
-    
     private CorpusModelI corporaModel;
     private CorpusRenderer corpusRenderer;
-    
-    private boolean liveMode = false;
-
     private ScanCache cache;
-    
     private Aggregator aggregatorController;
     
@@ -88 +86 @@
         setUpAggerationContext();
         cache = (ScanCache) Executions.getCurrent().getDesktop().getWebApp().getAttribute(WebAppListener.CORPUS_CACHE);
-        //if (cache.isEmpty()) {
-        //    liveMode = true;
-        //}
         setUpCorpusTree();
         languages = (Languages) Executions.getCurrent().getDesktop().getWebApp().getAttribute(WebAppListener.LANGUAGES);
@@ -176 +171 @@
         Treechildren openTreeItems = tree.getTreechildren();
         for (Treeitem openItem : openTreeItems.getItems()) {
-            
             DefaultTreeNode<Corpus> node = (DefaultTreeNode<Corpus>) openItem.getValue();
-            //Corpus data = node.getData();
-            //System.out.println(data);
-            
             corpusRenderer.updateItem(openItem, false);
         }
@@ -214 +205 @@
                         }
                     }
-                    
-//                    // this is a temporary solution,
-//                    // the whole concept on how selected externally resources
-//                    // are displayed has to be changed, otherwise endpoints with
-//                    // hundreds of subresources will break the tree interface
-//                    // by loading all their resources...
-//                    List<String> handlesCopy = new ArrayList<String>(handles.size());
-//                    handlesCopy.addAll(handles);
-//                    selectCorpora(openItem, data, handlesCopy);
                 }
             }
@@ -249 +231 @@
                 availableLangs.add(corpus.getLanguages().iterator().next());
             }
-            //for (String langCode : corpus.getLanguages()) {
-            //    availableLangs.add(langCode);
-            //}
-        }
-
-        //List<String> sortedAvailableLanguages = new ArrayList<String>(availableLangs.size());
-        //sortedAvailableLanguages.addAll(availableLangs);
-        //Collections.sort(sortedAvailableLanguages);
+        }
+
         List<Language> sortedLangs = new ArrayList<Language>(availableLangs.size());
         for (String langCode : availableLangs) {
@@ -307 +283 @@
             this.corporaModel = model;
             this.corpusRenderer = renderer;
-        } else if (liveMode) {
+        } else if (isLiveModeOn()) {
             CenterRegistryI registry = new CenterRegistryLive();
             CorpusModelLive model = new CorpusModelLive(registry);
@@ -325 +301 @@
             this.corpusRenderer = renderer;
         }
-        Treecol nameCol = (Treecol) tree.getTreecols().getFellow("nameCol");
+        //Treecol nameCol = (Treecol) tree.getTreecols().getFellow("nameCol");
         nameCol.setSortAscending(new CorpusByNameComparator());
         nameCol.setSortDescending(new CorpusByNameDComparator());
-        Treecol instCol = (Treecol) tree.getTreecols().getFellow("instCol");
+        //Treecol instCol = (Treecol) tree.getTreecols().getFellow("instCol");
         instCol.setSortAscending(new CorpusByInstitutionComparator());
         instCol.setSortDescending(new CorpusByInstitutionDComparator());
@@ -335 +311 @@
 
 
-    private void selectCorpora(Treeitem openItem, Corpus data, List<String> handles) {
-        List<String> handlesFound = new ArrayList<String>();
-        for (String handle : handles) {
-            if (handle.equals(data.getHandle())) {
-                handlesFound.add(handle);
-            }
-        }
-        for (String handle : handlesFound) {
-            corpusRenderer.updateItem(openItem, true);
-            handles.remove(handle);
-        }
-        
-        if (!handles.isEmpty()) {
-            int sizeBefore = handles.size();
-            openItem.setOpen(true);
-            Treechildren tchildren = openItem.getTreechildren();
-            List<Treeitem> tcitems = new ArrayList<Treeitem>();
-            tcitems.addAll(tchildren.getItems());
-            for (Treeitem child : tcitems) {
-                DefaultTreeNode<Corpus> node = (DefaultTreeNode<Corpus>) child.getValue();
-                Corpus cdata = node.getData();
-                selectCorpora(child, cdata, handles);
-                if (handles.isEmpty()) {
-                    break;
-                }
-            }
-            if (sizeBefore == handles.size()) {
-                openItem.setOpen(false);
-            }
-        }
-    }
+//    private void selectCorpora(Treeitem openItem, Corpus data, List<String> handles) {
+//        List<String> handlesFound = new ArrayList<String>();
+//        for (String handle : handles) {
+//            if (handle.equals(data.getHandle())) {
+//                handlesFound.add(handle);
+//            }
+//        }
+//        for (String handle : handlesFound) {
+//            corpusRenderer.updateItem(openItem, true);
+//            handles.remove(handle);
+//        }
+//        
+//        if (!handles.isEmpty()) {
+//            int sizeBefore = handles.size();
+//            openItem.setOpen(true);
+//            Treechildren tchildren = openItem.getTreechildren();
+//            List<Treeitem> tcitems = new ArrayList<Treeitem>();
+//            tcitems.addAll(tchildren.getItems());
+//            for (Treeitem child : tcitems) {
+//                DefaultTreeNode<Corpus> node = (DefaultTreeNode<Corpus>) child.getValue();
+//                Corpus cdata = node.getData();
+//                selectCorpora(child, cdata, handles);
+//                if (handles.isEmpty()) {
+//                    break;
+//                }
+//            }
+//            if (sizeBefore == handles.size()) {
+//                openItem.setOpen(false);
+//            }
+//        }
+//    }
     
     
@@ -373 +349 @@
         if (paramValue != null) {
             String mode = paramValue[0].trim();
-            LOGGER.log(Level.INFO, "Received parameter: {0}[{1}]", new String[]{Aggregator.MODE_PARAM, mode});
             if (mode.equals(Aggregator.MODE_PARAM_VALUE_TEST)) {
                 testingOn = true;
+                LOGGER.log(Level.INFO, "Received parameter: {0}[{1}]", new String[]{Aggregator.MODE_PARAM, mode});
             }
         }
         return testingOn;
+    }
+    
+    private boolean isLiveModeOn() {
+        boolean liveOn = false;
+        String[] paramValue = Executions.getCurrent().getParameterMap().get(Aggregator.MODE_PARAM);
+        if (paramValue != null) {
+            String mode = paramValue[0].trim();
+            if (mode.equals(Aggregator.MODE_PARAM_VALUE_LIVE)) {
+                liveOn = true;
+                LOGGER.log(Level.INFO, "Received parameter: {0}[{1}]", new String[]{Aggregator.MODE_PARAM, mode});
+            }
+        }
+        return liveOn;
     }
         
@@ -386 +375 @@
         if (paramValue != null) {
             String mode = paramValue[0].trim();
-            LOGGER.log(Level.INFO, "Received parameter: {0}[{1}]", new String[]{Aggregator.MODE_PARAM, mode});
             if (mode.equals(Aggregator.MODE_PARAM_VALUE_SEARCH)) {
                 searchOn = true;
+                LOGGER.log(Level.INFO, "Received parameter: {0}[{1}]", new String[]{Aggregator.MODE_PARAM, mode});
             }
         }

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/WebAppListener.java

@@ -25 +25 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.ServletContext;
 import opennlp.tools.tokenize.TokenizerModel;
 import org.joda.time.DateTime;
@@ -40 +43 @@
 public class WebAppListener implements WebAppInit, WebAppCleanup {
 
+    private static final Logger LOGGER = Logger.getLogger(WebAppListener.class.getName());
     public static final String ACTIVE_SEARCH_CONTROLLERS = "ACTIVE_SEARCH_CONTROLLERS";
     public static final String SHARED_SRU_CLIENT = "SHARED_SRU_CLIENT";
     public static final String LANGUAGES = "LANG";
     public static final String CORPUS_CACHE = "CORPUS_CACHE";
-    private static final Logger LOGGER = Logger.getLogger(WebAppListener.class.getName());
-    //private static final int HOURS_BETWEEN_CACHE_UPDATE = 3;
+    public static final String CORPUS_CRAWLER = "CORPUS_CRAWLER";
+    public static final int WAITING_TIME_FOR_SRUCLIENT_SHUTDOWN_MS = 10000;
+    public static final int WAITING_TIME_FOR_POOL_SHUTDOWN_MS = 60000;
     //private Timer cacheTimer;
     public static final String DE_TOK_MODEL = "/tokenizer/de-tuebadz-8.0-token.bin";
-    private static final String AGGREGATOR_DIR_NAME = "aggregator";
+    private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+    private static final String DEFAULT_DATA_LOCATION = "/data";
+    private String dataLocation; // defined in web.xml with fall-back in the code
+    private String aggregatorDirName; // defined in web.xml
     private static final String SCAN_DIR_NAME = "scan";
-    private static final TimeUnit CACHE_UPDATE_INTERVAL_UNIT = TimeUnit.HOURS;
-    private static final int CACHE_UPDATE_INTERVAL = 6;
-    private static final int CACHE_MAX_DEPTH = 3;
-    private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
-    public static final String CORPUS_CRAWLER = "CORPUS_CRAWLER";
+    private TimeUnit cacheUpdateIntervalUnit; // defined in web.xml
+    private Integer cacheUpdateInterval; // defined in web.xml
+    private Integer cacheMaxDepth; // defined in web.xml
 
     @Override
-    public void init(WebApp webapp) throws Exception {
+    public void init(WebApp webapp) {
 
         LOGGER.info("Aggregator is starting.");
-        
+        processContext();
+
         Set<SearchResults> activeControllers = new HashSet<SearchResults>();
         webapp.setAttribute(ACTIVE_SEARCH_CONTROLLERS, activeControllers);
-        
+
         SRUThreadedClient sruClient = new SRUThreadedClient();
         sruClient.registerRecordParser(new ClarinFCSRecordParser());
@@ -70 +77 @@
         Languages languages = new Languages();
         webapp.setAttribute(LANGUAGES, languages);
-        
-        //setUpScanCache(webapp);
-        setUpScanCacheForReadOnly(webapp);
-        
+
+        setUpScanCache(webapp);
+        //setUpScanCacheForReadOnly(webapp);
+
         setUpTokenizers(webapp);
-        
+
     }
 
@@ -92 +99 @@
 
     private String getScanDirectory() {
-        File aggregatorDir = new File(System.getProperty("user.home"), "/." + AGGREGATOR_DIR_NAME);
-        //File aggregatorDir = new File("/var/www", "/." + AGGREGATOR_DIR_NAME);
-        //File aggregatorDir = new File("/data/fcsAggregator");
-        
+
+        File aggregatorDir = new File(dataLocation, aggregatorDirName);
         if (!aggregatorDir.exists()) {
-            if (!aggregatorDir.mkdir()) {
-                LOGGER.info("Scan directory does not exist and cannot be created: " 
+            LOGGER.severe("Aggregator directory does not exist and cannot be created: "
+                        + aggregatorDir.getAbsolutePath());
+        }
+        File scanDir = new File(aggregatorDir, SCAN_DIR_NAME);
+        if (!scanDir.exists()) {
+            if (!scanDir.mkdir()) {
+                LOGGER.severe("Scan directory does not exist and cannot be created: "
                         + aggregatorDir.getAbsolutePath());
             }
         }
-        File scanDir = new File(aggregatorDir, SCAN_DIR_NAME);
-        if (!scanDir.exists()) {
-            scanDir.mkdir();
-        }
         String scanPath = scanDir.getAbsolutePath();
-        LOGGER.info("Scan location: " + scanPath);
+        LOGGER.info("Scan data location: " + scanPath);
         return scanPath;
     }
-    
+
     /**
-     * Use this method instead of setUpScanCache() method if it is necessary
-     * to run the application without scan data crawl, given that the scan 
-     * data was crawled before and was stored as cache under appropriate
-     * location (useful when testing or when smth is wrong with the endpoint 
-     * scan responses).
-     * 
-     * @param webapp 
+     * Use this method instead of setUpScanCache() method if it is necessary to
+     * run the application without scan data crawl, given that the scan data was
+     * crawled before and was stored as cache under appropriate location (useful
+     * when testing or when smth is wrong with the endpoint scan responses).
+     *
+     * @param webapp
      */
     private void setUpScanCacheForReadOnly(WebApp webapp) {
@@ -145 +150 @@
         //filter.urlShouldContainAnyOf("dspin.dwds.de", "lindat.");
         //ScanCrawler scanCrawler = new ScanCrawler(centerRegistry, sruScanClient, filter, CACHE_MAX_DEPTH);
-        ScanCrawler scanCrawler = new ScanCrawler(centerRegistry, sruScanClient, null, CACHE_MAX_DEPTH);
+        ScanCrawler scanCrawler = new ScanCrawler(centerRegistry, sruScanClient, null, cacheMaxDepth);
         ScanCache scanCache;
 
-        //synchronized (scanCrawler) {
-            LOGGER.info("Start cache read");
-            try {
-                scanCache = scanCacheFiled.read();
-                LOGGER.info("Finished cache read, number of root corpora: " + scanCache.getRootCorpora().size());
-            } catch (Exception e) {
-                LOGGER.log(Level.SEVERE, "Error while reading the scan cache!", e);
-                scanCache = new SimpleInMemScanCache();
-            }
-        //}
+        LOGGER.info("Start cache read");
+        try {
+            scanCache = scanCacheFiled.read();
+            LOGGER.info("Finished cache read, number of root corpora: " + scanCache.getRootCorpora().size());
+        } catch (Exception e) {
+            LOGGER.log(Level.SEVERE, "Error while reading the scan cache!", e);
+            scanCache = new SimpleInMemScanCache();
+        }
         webapp.setAttribute(CORPUS_CACHE, scanCache);
         webapp.setAttribute(CORPUS_CRAWLER, scanCrawler);
@@ -163 +166 @@
         scheduler.scheduleAtFixedRate(
                 new ScanCrawlTask(scanCrawler, scanCacheFiled, webapp),
-                0, CACHE_UPDATE_INTERVAL, CACHE_UPDATE_INTERVAL_UNIT);
+                0, cacheUpdateInterval, cacheUpdateIntervalUnit);
 
     }
@@ -176 +179 @@
             // Wait 10 secs for existing tasks to terminate
             // replace with awaitTermination if ever provided in SRUClient API
-            Thread.sleep(10000);
+            Thread.sleep(WAITING_TIME_FOR_SRUCLIENT_SHUTDOWN_MS);
             sruClient.shutdownNow(); // Cancel currently executing tasks
             // Wait 10 secs for tasks to respond to being cancelled
             // replace with awaitTermination if ever provided in SRUClient API
-            Thread.sleep(10000);
+            Thread.sleep(WAITING_TIME_FOR_SRUCLIENT_SHUTDOWN_MS);
         } catch (InterruptedException ie) {
             // (Re-)Cancel if current thread also interrupted
@@ -193 +196 @@
         try {
             // Wait a while for existing tasks to terminate
-            if (!pool.awaitTermination(60, TimeUnit.SECONDS)) {
+            if (!pool.awaitTermination(WAITING_TIME_FOR_POOL_SHUTDOWN_MS, 
+                    TimeUnit.MILLISECONDS)) {
                 pool.shutdownNow(); // Cancel currently executing tasks
                 // Wait a while for tasks to respond to being cancelled
-                if (!pool.awaitTermination(60, TimeUnit.SECONDS)) {
+                if (!pool.awaitTermination(WAITING_TIME_FOR_POOL_SHUTDOWN_MS, 
+                        TimeUnit.MILLISECONDS)) {
                     LOGGER.info("Pool did not terminate");
                 }
@@ -220 +225 @@
     }
 
+    private void processContext() {
+        try {
+            InitialContext context;
+            context = new InitialContext();
+            String dataLocationPropertyName = (String) context.lookup("java:comp/env/data-location-property");
+            aggregatorDirName = (String) context.lookup("java:comp/env/aggregator-folder");
+            String updateIntervalUnitString = (String) context.lookup("java:comp/env/update-interval-unit");
+            cacheUpdateIntervalUnit = TimeUnit.valueOf(updateIntervalUnitString);
+            cacheUpdateInterval = (Integer) context.lookup("java:comp/env/update-interval");
+            cacheMaxDepth = (Integer) context.lookup("java:comp/env/scan-max-depth");
+            // see if data location is set in properties
+            dataLocation = System.getProperty(dataLocationPropertyName);
+            if (dataLocation == null || !(new File(dataLocation, aggregatorDirName).exists())) {
+                dataLocation = DEFAULT_DATA_LOCATION;
+                if (!(new File(dataLocation, aggregatorDirName).exists())) {
+                    dataLocation = System.getProperty("user.home");
+                }
+                if ((new File(dataLocation, aggregatorDirName).exists())) {
+                    LOGGER.info(dataLocationPropertyName + " property is not defined, "
+                            + "setting to default: " + dataLocation);
+                } else {
+                    LOGGER.info(dataLocationPropertyName + " property is not defined, "
+                            + "default location does not extist: " + dataLocation);
+                    throw new RuntimeException("Data location not found");
+                }
+            }
+        } catch (NamingException ex) {
+            Logger.getLogger(WebAppListener.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
 }

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CenterRegistryLive.java

@@ -13 +13 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 
 /**
@@ -22 +24 @@
 
     private static final Logger LOGGER = Logger.getLogger(CenterRegistryLive.class.getName());
-    private static final String CENTER_REGISTRY_URL = "http://130.183.206.32/restxml/";
+    //private static final String CENTER_REGISTRY_URL = "http://130.183.206.32/restxml/";
+    private String centerRegistryUrl; //defined in web.xml
     //https://centerregistry-clarin.esc.rzg.mpg.de/restxml/
     private boolean hasInstitutionsLoaded = false;
     private List<Institution> centers = new ArrayList<Institution>();
+    
+    public CenterRegistryLive() {
+        super();
+        processContext();
+    }
 
     @Override
@@ -39 +47 @@
             }
             hasInstitutionsLoaded = true;
-            URI url = URI.create(CENTER_REGISTRY_URL);
+            URI url = URI.create(centerRegistryUrl);
             CenterRegistryConnector connector = new CenterRegistryConnector(url, 30000);
              try {
@@ -90 +98 @@
         return centers.get(index);
     }
+    
+    private void processContext() {
+        InitialContext context;
+        try {
+            context = new InitialContext();
+            centerRegistryUrl = (String) context.lookup("java:comp/env/center-registry-url");
+        } catch (NamingException ex) {
+            LOGGER.log(Level.SEVERE, null, ex);
+        }
+    }
 
 }

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/Corpus.java

@@ -6 +6 @@
 
 /**
+ * Represents information about corpus resource, such as corpus handle (id),
+ * institution, title, description, language(s), etc. Does not store the
+ * information about corpus sub-corpora.
  *
  * @author Yana Panchenko

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusByInstitutionComparator.java

@@ -5 +5 @@
 
 /**
+ * Comparator necessary for sorting the corpora according to their 
+ * institution name in ascending order.
  *
  * @author Yana Panchenko

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusByInstitutionDComparator.java

@@ -5 +5 @@
 
 /**
- *
+ * Comparator necessary for sorting the corpora according to their 
+ * institution name in descending order.
+ * 
  * @author Yana Panchenko
  */

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusByNameComparator.java

@@ -5 +5 @@
 
 /**
- *
+ * Comparator necessary for sorting the corpora according to the corpus name
+ * in ascending order.
+ * 
  * @author Yana Panchenko
  */

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusByNameDComparator.java

@@ -5 +5 @@
 
 /**
- *
+ * Comparator necessary for sorting the corpora according to the corpus name
+ * in descending order.
+ * 
  * @author Yana Panchenko
  */

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusModelCached.java

@@ -15 +15 @@
 
 /**
- *
+ * Represents corpora model where corpora data is taken from cache of the 
+ * pre-crawled scan requests.
+ * 
  * @author Yana Panchenko
  */
@@ -161 +163 @@
 
     private void initCorpusTree() {
-        //System.out.println("Initializing tree");
-        //System.out.println(cache);
         for (Corpus c : cache.getRootCorpora()) {
             // create node from root corpora
-            DefaultTreeNode<Corpus> rootChildNode = new DefaultTreeNode(c, new ArrayList<DefaultTreeNode<Corpus>>());
-            
-            //System.out.println("Adding children to root node " + c.getEndpointUrl() + " " + c.getHandle());
+            DefaultTreeNode<Corpus> rootChildNode = 
+                    new DefaultTreeNode(c, new ArrayList<DefaultTreeNode<Corpus>>());
             // add children to that node
             addChildren(rootChildNode);
-            
-            //System.out.println("Adding root to tree " + c.getEndpointUrl() + " " + c.getHandle());
             // add to the root of the model
             super.getRoot().getChildren().add(rootChildNode);
@@ -182 +179 @@
         
         List<Corpus> corpusChildren = cache.getChildren(corpus);
-        //System.out.println("Getting children of " + corpus.getEndpointUrl() + " " + corpus.getHandle() + "--> " + corpusChildren);
         for (Corpus corpusChild : corpusChildren) {
             DefaultTreeNode<Corpus> child = new DefaultTreeNode(corpusChild, new ArrayList<DefaultTreeNode<Corpus>>());
             parentNode.add(child);
-            //System.out.println("Adding child " + corpusChild.getEndpointUrl() + " " + corpusChild.getHandle());
             addChildren(child);
         }

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusModelI.java

@@ -7 +7 @@
 
 /**
- *
+ * Represents corpora model that has access to Corpus objects and their 
+ * information about corpora.
+ * 
  * @author Yana Panchenko
  */

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusModelLive.java

@@ -1 +1 @@
 package eu.clarin.sru.fcs.aggregator.sopt;
 
-import eu.clarin.sru.client.SRUClientException;
-import eu.clarin.sru.client.SRUScanRequest;
-import eu.clarin.sru.client.SRUScanResponse;
-import eu.clarin.sru.client.SRUTerm;
 import eu.clarin.sru.client.SRUThreadedClient;
 import eu.clarin.sru.fcs.aggregator.app.WebAppListener;
 import eu.clarin.sru.fcs.aggregator.cache.ScanCrawler;
-import static eu.clarin.sru.fcs.aggregator.sopt.Corpus.ROOT_HANDLE;
-import eu.clarin.sru.fcs.aggregator.util.SRUCQL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -17 +11 @@
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zul.DefaultTreeModel;
@@ -33 +18 @@
 
 /**
- *
+ * Represents corpora model where corpora data is taken from live requests to 
+ * corpus endpoints.
+ * 
  * @author Yana Panchenko
  */
@@ -48 +35 @@
     }
 
+    @Override
     public boolean isCorpusSelected(DefaultTreeNode<Corpus> node) {
         if (selectedCorpora.containsKey(node.getData().getEndpointUrl())) {
@@ -68 +56 @@
      * parent's children
      */
+    @Override
     public void remove(DefaultTreeNode<Corpus> parent, int indexFrom, int indexTo) {
         for (int i = indexTo; i >= indexFrom; i--) {
@@ -85 +74 @@
      * parent's children
      */
+    @Override
     public void remove(DefaultTreeNode<Corpus> parent, int index) {
         parent.getChildren().remove(index);
@@ -102 +92 @@
      * parent's children
      */
+    @Override
     public void insert(DefaultTreeNode<Corpus> parent, int indexFrom, int indexTo, DefaultTreeNode<Corpus>[] newNodes) {
         for (int i = indexFrom; i <= indexTo; i++) {
@@ -116 +107 @@
      * @param newNodes New nodes which are appended
      */
+    @Override
     public void add(DefaultTreeNode<Corpus> parent, DefaultTreeNode<Corpus>[] newNodes) {
         parent.getChildren().addAll(Arrays.asList(newNodes));
@@ -128 +120 @@
      * @param newNode New node which is appended
      */
+    @Override
     public void add(DefaultTreeNode<Corpus> parent, DefaultTreeNode<Corpus> newNode) {
         parent.getChildren().add(newNode);
     }
 
+    @Override
     public boolean hasChildren(Treeitem item) {
         return !item.getTreechildren().getChildren().isEmpty();
@@ -165 +159 @@
      * @param corpus The corpus that the new appended node should contain
      */
+    @Override
     public void add(DefaultTreeNode<Corpus> parent, Corpus corpus) {
         DefaultTreeNode<Corpus> childNode = createNodeWithTempChildren(corpus);
@@ -170 +165 @@
     }
 
+    @Override
     public void addToSelected(Corpus data) {
         if (!this.selectedCorpora.containsKey(data.getEndpointUrl())) {
@@ -178 +174 @@
     }
 
+    @Override
     public void removeFromSelected(Corpus data) {
         if (this.selectedCorpora.containsKey(data.getEndpointUrl())) {
@@ -184 +181 @@
     }
 
+    @Override
     public Map<String, Set<Corpus>> getSelectedCorpora() {
         return selectedCorpora;
@@ -192 +190 @@
         for (Institution instit : startingPoint.getCQLInstitutions()) {
             for (Endpoint endp : instit.getEndpoints()) {
-                //try {
-                    //TODO: temp for testing, this 3 lines are to be removed:
-                    //if (//!endp.getUrl().contains("uni-leipzig.de") && 
-                    //        !endp.getUrl().contains("mpi.")
-                    //        && !endp.getUrl().contains("ids-mannheim")
-                    //        && !endp.getUrl().contains("weblicht")) {
-                    //    continue;
-                    //}
-                    
                     List<Corpus> rootCorpora = ScanCrawler.doScan(sruClient, endp.getUrl(), instit, null);
                     for (Corpus c : rootCorpora) {
@@ -206 +195 @@
                         super.getRoot().add(rootChild);
                     }
-//                    Future<SRUScanResponse> corporaResponse = null;
-//                    SRUScanRequest corporaRequest = new SRUScanRequest(endp.getUrl());
-//                    StringBuilder scanClause = new StringBuilder(SRUCQL.SCAN_RESOURCE_PARAMETER);
-//                    scanClause.append("=");
-//                    scanClause.append(ROOT_HANDLE);
-//                    corporaRequest.setScanClause(scanClause.toString());
-//                    corporaRequest.setExtraRequestData(SRUCQL.SCAN_RESOURCE_INFO_PARAMETER, "true");
-//                    corporaResponse = sruClient.scan(corporaRequest);
-//                    SRUScanResponse response = corporaResponse.get(200, TimeUnit.SECONDS);
-//                    if (response != null && response.hasTerms()) {
-//                        for (SRUTerm term : response.getTerms()) {
-//                            Corpus c = new Corpus(instit, endp.getUrl());
-//                            c.setHandle(term.getValue());
-//                            c.setDisplayName(term.getDisplayTerm());
-//                            c.setNumberOfRecords(term.getNumberOfRecords());
-//                            addExtraInfo(c, term);
-//                            DefaultTreeNode<Corpus> rootChild = createNodeWithTempChildren(c);
-//                            super.getRoot().add(rootChild);
-//                        }
-//                    } else {
-//                        Corpus endpCorpus = new Corpus(endp.getInstitution(), endp.getUrl());
-//                        DefaultTreeNode<Corpus> rootChild = createNodeWithTempChildren(endpCorpus);
-//                        super.getRoot().add(rootChild);
-//                    }
-//                } catch (SRUClientException ex) {
-//                    logger.log(Level.SEVERE, "Error accessing corpora {0} at {1} {2} {3}",
-//                            new String[]{ROOT_HANDLE, endp.getUrl(), ex.getClass().getName(), ex.getMessage()});
-//                } catch (InterruptedException ex) {
-//                    logger.log(Level.SEVERE, "Error accessing corpora {0} at {1} {2} {3}",
-//                            new String[]{ROOT_HANDLE, endp.getUrl(), ex.getClass().getName(), ex.getMessage()});
-//                } catch (ExecutionException ex) {
-//                    logger.log(Level.SEVERE, "Error accessing corpora {0} at {1} {2} {3}",
-//                            new String[]{ROOT_HANDLE, endp.getUrl(), ex.getClass().getName(), ex.getMessage()});
-//                } catch (TimeoutException ex) {
-//                    logger.log(Level.SEVERE, "Timeout scanning corpora {0} at {1} {2} {3}",
-//                            new String[]{ROOT_HANDLE, endp.getUrl(), ex.getClass().getName(), ex.getMessage()});
-//                }
             }
 
@@ -249 +201 @@
     
     private Iterable<Corpus> getSubcorpora(Corpus corpus) {
-        //get rid of institution and endpoint? get get this info from corpus
+        
         return ScanCrawler.doScan(sruClient, corpus.getEndpointUrl(), corpus.getInstitution(), corpus);
-    }
-
-//    private Iterable<Corpus> getSubcorpora(Corpus corpus) {
-//        logger.info("OBTAINING SUBCORPORA");
-//        ArrayList<Corpus> subCorpora = new ArrayList<Corpus>();
-//        try {
-//            
-//            
-//            SRUScanRequest corporaRequest = new SRUScanRequest(corpus.getEndpointUrl());
-//            StringBuilder scanClause = new StringBuilder(SRUCQL.SCAN_RESOURCE_PARAMETER);
-//            scanClause.append("=");
-//            String resourceValue = corpus.getHandle();
-//            if (corpus.getHandle() == null) {
-//                resourceValue = ROOT_HANDLE;
-//            }
-//            if (Corpus.HANDLE_WITH_SPECIAL_CHARS.matcher(resourceValue).matches()) {
-//                resourceValue = "%22" + resourceValue + "%22";
-//            }
-//            scanClause.append(resourceValue);
-//            corporaRequest.setScanClause(scanClause.toString());
-//            //!!!TODO request doesn't work for scan with resource handle???
-//            //corporaRequest.setExtraRequestData(SRUCQLscan.RESOURCE_INFO_PARAMETER, "true");
-//            Future<SRUScanResponse> corporaResponse = sruClient.scan(corporaRequest);
-//            logger.info("BEFORE get " + resourceValue);
-//            SRUScanResponse response = corporaResponse.get(200, TimeUnit.SECONDS);
-//            logger.info("AFTER get " + resourceValue);
-//            if (response != null && response.hasTerms()) {
-//            for (SRUTerm term : response.getTerms()) {
-//                Corpus c = new Corpus(corpus.getInstitution(), corpus.getEndpointUrl());
-//                c.setHandle(term.getValue());
-//                c.setDisplayName(term.getDisplayTerm());
-//                c.setNumberOfRecords(term.getNumberOfRecords());
-//                addExtraInfo(c, term);
-//                subCorpora.add(c);
-//            }
-//            logger.info("OBTAINED SUBCORPORA " + subCorpora.size());
-//        }
-//        } catch (SRUClientException ex) {
-//            logger.log(Level.SEVERE, "Error accessing corpora {0} at {1} {2} {3}",
-//                    new String[]{corpus.getHandle(), corpus.getEndpointUrl(), ex.getClass().getName(), ex.getMessage()});
-//        } catch (InterruptedException ex) {
-//            logger.log(Level.SEVERE, "Error accessing corpora {0} at {1} {2} {3}",
-//                    new String[]{corpus.getHandle(), corpus.getEndpointUrl(), ex.getClass().getName(), ex.getMessage()});
-//        } catch (ExecutionException ex) {
-//            logger.log(Level.SEVERE, "Error accessing corpora {0} at {1} {2} {3}",
-//                    new String[]{corpus.getHandle(), corpus.getEndpointUrl(), ex.getClass().getName(), ex.getMessage()});
-//        } catch (TimeoutException ex) {
-//            logger.log(Level.SEVERE, "Timeout scanning corpora {0} at {1} {2} {3}",
-//                    new String[]{corpus.getHandle(), corpus.getEndpointUrl(), ex.getClass().getName(), ex.getMessage()});
-//        }
-//        
-//        return subCorpora;
-//    }
-
-    private void addExtraInfo(Corpus c, SRUTerm term) {
-
-        DocumentFragment extraInfo = term.getExtraTermData();
-        String enDescription = null;
-        if (extraInfo != null) {
-            NodeList infoNodes = extraInfo.getChildNodes().item(0).getChildNodes();
-            for (int i = 0; i < infoNodes.getLength(); i++) {
-                Node infoNode = infoNodes.item(i);
-                if (infoNode.getNodeType() == Node.ELEMENT_NODE && infoNode.getLocalName().equals("LandingPageURI")) {
-                    c.setLandingPage(infoNode.getTextContent().trim());
-                } else if (infoNode.getNodeType() == Node.ELEMENT_NODE && infoNode.getLocalName().equals("Languages")) {
-                    NodeList languageNodes = infoNode.getChildNodes();
-                    for (int j = 0; j < languageNodes.getLength(); j++) {
-                        if (languageNodes.item(j).getNodeType() == Node.ELEMENT_NODE && languageNodes.item(j).getLocalName().equals("Language")) {
-                            Element languageNode = (Element) languageNodes.item(j);
-                            String languageText = languageNode.getTextContent().trim();
-                            if (!languageText.isEmpty()) {
-                                c.addLanguage(languageText.trim());
-                            }
-                        }
-
-                    }
-                } else if (infoNode.getNodeType() == Node.ELEMENT_NODE && infoNode.getLocalName().equals("Description")) {
-                    Element element = (Element) infoNode;
-                    c.setDescription(infoNode.getTextContent().trim());
-                    //String lang = element.getAttributeNS("http://clarin.eu/fcs/1.0/resource-info", "lang");
-                    //System.out.println("ATTRIBUTE LANG: " + lang);
-                    if ("en".equals(element.getAttribute("xml:lang"))) {
-                        enDescription = infoNode.getTextContent().trim();
-                    }
-                }
-            }
-            // description in Engish has priority
-            if (enDescription != null && !enDescription.isEmpty()) {
-                c.setDescription(enDescription);
-            }
-        }
     }
 

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusRendererLive.java

@@ -14 +14 @@
  * renderer.
  *
- * TODO: maybe remove the loaded sub-resources from the tree when they are
- * closed by the user.
+ * TODO: remove the loaded sub-resources from the tree when they are
+ * closed by the user?
  *
  * @author Yana Panchenko

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/Endpoint.java

@@ -2 +2 @@
 
 /**
- * Endpoint. Contains the parent Institution.
+ * Endpoint. Contains information about CQL endpoint url and the parent 
+ * Institution.
  * 
  * @author Yana Panchenko
@@ -58 +59 @@
         return true;
     }
-
-    
-    
     
 }

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/Institution.java

@@ -4 +4 @@
 
 /**
- * Institution. Can have Endpoint children.
+ * Institution. Contains information about institution name and link (url). 
+ * Can have information about its CQL Endpoints.
  * 
  * @author Yana Panchenko
@@ -58 +59 @@
     }
     
+    @Override
     public String toString() {
         if (name != null && name.length() > 0) {

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/Language.java

@@ -2 +2 @@
 
 /**
- *
+ * Represents language and contains information about language name and 
+ * language codes according to ISO-639 codes.
+ * 
  * @author Yana Panchenko
  */

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/Languages.java

@@ -12 +12 @@
 
 /**
- *
+ * Represents collection of languages.
+ * 
  * @author Yana Panchenko
  */

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sresult/Kwic.java

@@ -4 +4 @@
 
 /**
- *
+ * Represents keyword in context data view and information about its
+ * PID and reference.
+ * 
  * @author Yana Panchenko
  */

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sresult/SearchResultContent.java

@@ -31 +31 @@
 
 /**
- *
- * @author Yana Panchenko <yana.panchenko@uni-tuebingen.de>
+ * Utility for representing SearchResult data in different formats.
+ * 
+ * @author Yana Panchenko
  */
 public class SearchResultContent {
@@ -337 +338 @@
     public String getExportText(List<SearchResult> resultsProcessed) {
         StringBuilder text = new StringBuilder();
-        //Set<String> resultsLangs = new HashSet<String>();
-        if (resultsProcessed != null && !resultsProcessed.isEmpty()) {
-            for (SearchResult result : resultsProcessed) {
-                //resultsLangs.addAll(result.getCorpus().getLanguages());
+        if (resultsProcessed != null && !resultsProcessed.isEmpty()) {
+            for (SearchResult result : resultsProcessed) {
                 for (Kwic kwic : result.getKwics()) {
                     text.append(kwic.getLeft());

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sresult/SearchResultGroupRenderer.java

@@ -28 +28 @@
  * the corresponding SearchResult.
  * 
- * @author Yana Panchenko <yana.panchenko@uni-tuebingen.de>
+ * @author Yana Panchenko
  */
 public class SearchResultGroupRenderer {
@@ -114 +114 @@
         Label recordsFound = null;
         final Toolbarbutton infoCell = new Toolbarbutton();
-        
-
         
         if (resultsItem.getCorpus().getLandingPage() != null) {
@@ -161 +159 @@
             sb2.append(" from " + resultsItem.getResponse().getNumberOfRecords() + " found");
         }
-
         recordsFound = new Label(sb2.toString());
         recordsFound.setStyle("margin-left:10px;margin-right:30px;");
-            
-
         if (hasInfo) {
             Image infoImage = new Image("img/help-about.png");
             infoImage.setStyle("margin-right:10px;");
-            //infoCell.appendChild(infoImage);
             infoCell.setImage("img/help-about.png");
             infoCell.addEventListener(Events.ON_CLICK, new EventListener() {
@@ -181 +175 @@
 
         } else {
-            //Label label = new Label("");
-            //label.setParent(infoCell);
             infoCell.setLabel("");
         }
-        //infoCell.setStyle("margin-left:10px;margin-right:10px;");
-        
-        //caption.appendChild(name);
-        
         caption.appendChild(recordsFound);
         if (homeLink != null) {
             caption.appendChild(homeLink);
         }
-        
         caption.appendChild(infoCell);
         
-         //align="left" width="300px">
-                
-                
         return caption;
     }

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/util/SRUCQL.java

@@ -2 +2 @@
 
 /**
- *
- * @author Yana Panchenko <yana.panchenko@uni-tuebingen.de>
+ * Utility for storing constants related to SRU/CQL specification.
+ * 
+ * @author Yana Panchenko
  */
 public class SRUCQL {

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/util/ZKComp.java

@@ -1 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package eu.clarin.sru.fcs.aggregator.util;
 
@@ -8 +4 @@
 
 /**
- *
+ * Utility for reusable ZK components created for Aggregator.
+ * 
  * @author Yana Panchenko <yana.panchenko@uni-tuebingen.de>
  */

SRUAggregator/trunk/src/main/webapp/WEB-INF/web.xml

@@ -3 +3 @@
     <description>CLARIN-D Federated Content Search Aggregator</description>
     <display-name>CLARIN-D Federated Content Search Aggregator</display-name>
+    
+    <env-entry>
+        <env-entry-name>center-registry-url</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>http://centerregistry-clarin.esc.rzg.mpg.de/restxml/</env-entry-value>
+    </env-entry>
+    <env-entry>
+        <env-entry-name>weblicht-url</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>https://weblicht.sfs.uni-tuebingen.de/WebLicht-4/?input=</env-entry-value>
+    </env-entry>
+    <env-entry>
+        <env-entry-name>update-interval-unit</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>HOURS</env-entry-value>
+    </env-entry>
+    <env-entry>
+        <env-entry-name>update-interval</env-entry-name>
+        <env-entry-type>java.lang.Integer</env-entry-type>
+        <env-entry-value>6</env-entry-value>
+    </env-entry>
+    <env-entry>
+        <env-entry-name>scan-max-depth</env-entry-name>
+        <env-entry-type>java.lang.Integer</env-entry-type>
+        <env-entry-value>3</env-entry-value>
+    </env-entry>
+    <!-- Value of this property (data.location) should be specified in CATALINA_OPT
+         (e.g. inside /etc/init.d/tomcat7*), unless the default is used. 
+         Currently defaults to /data/ or user.home -->
+    <env-entry>
+        <env-entry-name>data-location-property</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>data.location</env-entry-value>
+    </env-entry>
+    <!-- Folder for the data specific to the current Aggregator application,
+         supposed to be inside the data location folder above  -->
+    <env-entry>
+        <env-entry-name>aggregator-folder</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>fcsAggregator</env-entry-value>
+    </env-entry>
+    
     <listener>
         <description>ZK listener for session cleanup</description>
         <listener-class>org.zkoss.zk.ui.http.HttpSessionListener</listener-class>
     </listener>
+    
     <servlet>
         <description>ZK loader for ZUML pages</description>
@@ -61 +104 @@
         <welcome-file>index.htm</welcome-file>
     </welcome-file-list>
+    
 </web-app>