Changeset 5291

Timestamp:

05/27/14 07:41:55 (10 years ago)

Author:

Marie Hinrichs

Message:

Added some comments in WebAppListener?.java about code changes needed for testing.
Fixed dependency problem.

Location:

SRUAggregator/trunk

Files:

• nb-configuration.xml (added)
• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/app/WebAppListener.java (modified) (7 diffs)

SRUAggregator/trunk/pom.xml

@@ -145 +145 @@
             <artifactId>javax.servlet-api</artifactId>
             <version>3.1.0</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>

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

@@ -7 +7 @@
 import eu.clarin.sru.client.SRUThreadedClient;
 import eu.clarin.sru.client.fcs.ClarinFCSRecordParser;
-import eu.clarin.sru.fcs.aggregator.cache.EndpointUrlFilter;
 import eu.clarin.sru.fcs.aggregator.sopt.CenterRegistryI;
 import eu.clarin.sru.fcs.aggregator.sopt.CenterRegistryLive;
@@ -15 +14 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.Timer;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -27 +24 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.servlet.ServletContext;
 import opennlp.tools.tokenize.TokenizerModel;
-import org.joda.time.DateTime;
 import org.zkoss.zk.ui.WebApp;
 import org.zkoss.zk.ui.util.WebAppCleanup;
@@ -78 +73 @@
         webapp.setAttribute(LANGUAGES, languages);
 
+        // toggle following 2 comments to test user interface
         setUpScanCache(webapp);
         //setUpScanCacheForReadOnly(webapp);
@@ -103 +99 @@
         if (!aggregatorDir.exists()) {
             LOGGER.severe("Aggregator directory does not exist and cannot be created: "
-                        + aggregatorDir.getAbsolutePath());
+                    + aggregatorDir.getAbsolutePath());
         }
         File scanDir = new File(aggregatorDir, SCAN_DIR_NAME);
@@ -144 +140 @@
         CenterRegistryI centerRegistry = new CenterRegistryLive();
         SRUThreadedClient sruScanClient = (SRUThreadedClient) webapp.getAttribute(WebAppListener.SHARED_SRU_CLIENT);
-        //EndpointUrlFilter filter = new EndpointUrlFilter();
-        //filter.urlShouldContainAnyOf("leipzig");
-        //filter.urlShouldContainAnyOf("uni-tuebingen.de");
-        //filter.urlShouldContainAnyOf("uni-tuebingen.de", ".mpi.nl");
-        //filter.urlShouldContainAnyOf("dspin.dwds.de", "lindat.");
-        //ScanCrawler scanCrawler = new ScanCrawler(centerRegistry, sruScanClient, filter, CACHE_MAX_DEPTH);
+
+        // Comment-out when testing:
         ScanCrawler scanCrawler = new ScanCrawler(centerRegistry, sruScanClient, null, cacheMaxDepth);
+
+        // For Testing:
+//        EndpointUrlFilter filter = new EndpointUrlFilter();
+//        //filter.urlShouldContainAnyOf("leipzig");
+//        //filter.urlShouldContainAnyOf("uni-tuebingen.de");
+//        filter.urlShouldContainAnyOf("uni-tuebingen.de", ".mpi.nl");
+//        //filter.urlShouldContainAnyOf("dspin.dwds.de", "lindat.");
+//        ScanCrawler scanCrawler = new ScanCrawler(centerRegistry, sruScanClient, filter, cacheMaxDepth);
         ScanCache scanCache;
 
@@ -196 +196 @@
         try {
             // Wait a while for existing tasks to terminate
-            if (!pool.awaitTermination(WAITING_TIME_FOR_POOL_SHUTDOWN_MS, 
+            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(WAITING_TIME_FOR_POOL_SHUTDOWN_MS, 
+                if (!pool.awaitTermination(WAITING_TIME_FOR_POOL_SHUTDOWN_MS,
                         TimeUnit.MILLISECONDS)) {
                     LOGGER.info("Pool did not terminate");