java/src/org/openantivirus/engine ScanConfiguration.java,1.1,1.2 DefaultScanConfiguration.java,1.2,1.3 ScanEngine.java,1.6,1.7

Update of /cvsroot/openantivirus/java/src/org/openantivirus/engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27654/src/org/openantivirus/engine

Modified Files:
	ScanConfiguration.java DefaultScanConfiguration.java 
	ScanEngine.java 
Log Message:
Restored command line handling

Index: DefaultScanConfiguration.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/engine/DefaultScanConfiguration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DefaultScanConfiguration.java	19 May 2004 07:33:38 -0000	1.2
+++ DefaultScanConfiguration.java	25 May 2004 06:49:09 -0000	1.3
@@ -26,9 +26,6 @@
 
 package org.openantivirus.engine;
 
-import org.openantivirus.engine.censor.matcharray.*;
-import org.openantivirus.engine.censor.trie.*;
-
 /**
  * The default configuration used by the scanner
  *
@@ -39,11 +36,11 @@
 public class DefaultScanConfiguration extends WriteableScanConfiguration {
 
     public DefaultScanConfiguration() {
-        putBoolean(HALT_ON_VIRUS_FOUND, true);
+        putBoolean(HALT_ON_MALWARE_FOUND, true);
+        putBoolean("engine.use-trie", false);
+        putBoolean("engine.follow-symlinks", false);
         putString("credo.directory", "credo");
         putInt("credo.level", 3);
-        putObject("trie.instance", new Trie());
-        putObject("matcharray.instance", new MatchArray());
-        putString("tempdirectory", "temp");
+        putString("engine.tempdirectory", "temp");
     }
 }

Index: ScanConfiguration.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/engine/ScanConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ScanConfiguration.java	14 Dec 2003 11:08:26 -0000	1.1
+++ ScanConfiguration.java	25 May 2004 06:49:09 -0000	1.2
@@ -34,7 +34,7 @@
  * @version $Revision$
  */
 public interface ScanConfiguration {
-    String HALT_ON_VIRUS_FOUND = "haltOnVirusFound";
+    String HALT_ON_MALWARE_FOUND = "engine.halt-on-malware-found";
     
     boolean getBoolean(String key);
     String getString(String key);

Index: ScanEngine.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/engine/ScanEngine.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ScanEngine.java	20 May 2004 13:43:17 -0000	1.6
+++ ScanEngine.java	25 May 2004 06:49:09 -0000	1.7
@@ -50,7 +50,7 @@
                 new DirectoryContainerFactory(),
                 new CompressedContainerFactory()};
 
-    private final CensorFactory[] censorFactories;
+    private final CensorFactory[] censorFactories = new CensorFactory[1];
 
     private final List scanListeners = new LinkedList();
     private final ScanConfiguration scanConfiguration;
@@ -63,25 +63,26 @@
     throws IOException, CredoException {
         this.scanConfiguration = scanConfiguration;
         
+        loadCredoFiles(scanConfiguration);
+    }
+    
+    public void loadCredoFiles(ScanConfiguration scanConfiguration)
+    throws CredoException, IOException {
         final StringSearch stringSearch;
-        if (false) {
-            stringSearch = (Trie) scanConfiguration.getObject("trie.instance");
+        if (scanConfiguration.getBoolean("engine.use-trie")) {
+            stringSearch = new Trie();
         } else {
-            stringSearch =
-                (MatchArray) scanConfiguration.getObject("matcharray.instance");
+            stringSearch = new MatchArray();
         }
         
-        final CredoParser credoParser =
-            new CredoParser(scanConfiguration, stringSearch);
-        
-        credoParser.parse(new File(
-                scanConfiguration.getString("credo.directory")));
+        new CredoParser(scanConfiguration, stringSearch).parse(
+                new File(scanConfiguration.getString("credo.directory")));
         
         stringSearch.prepare();
-        censorFactories = new CensorFactory[] {stringSearch};
+        censorFactories[0] = stringSearch;
         System.gc();
     }
-    
+
     /**
 	 * scans the file using the default configuration
 	 * 
@@ -132,7 +133,7 @@
                 } catch (MalwareFoundException mfe) {
                     notifyMalwareFound(mfe);
                     if (conf.getBoolean(
-                            ScanConfiguration.HALT_ON_VIRUS_FOUND)) {
+                            ScanConfiguration.HALT_ON_MALWARE_FOUND)) {
                         throw mfe;
                     }
                 } catch (Exception e) {



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click