Show
Ignore:
Timestamp:
01/10/07 15:39:26 (2 years ago)
Author:
kindlund
Message:

Resolved conflicts between trunk and stephenson-link_scoring branches.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • honeyclient/trunk/etc/honeyclient.xml

    r146 r158  
    6969            <!-- TODO: Update this. --> 
    7070            <timeout description="How long the Driver waits during a drive operation, before timing out (in seconds)." default="60"> 
    71                 5  
     71                10  
    7272            </timeout> 
    7373            <Browser> 
     
    8484                    -1 
    8585                </max_relative_links_to_visit> 
     86                <goodwords description="A comma-separated list of good words which will increase the score of links within a webpage." default=""> 
     87                    news,new,big,latest,main,update,sell,free,buy 
     88                </goodwords> 
     89                <badwords description="A comma-separated list of bad words which will decrease the score of links within a webpage." default=""> 
     90                    archive,privacy,legal,disclaim,about,contact,copyright,jobs,careers 
     91                </badwords> 
    8692                <IE> 
    8793                    <!-- HoneyClient::Agent::Driver::IE Options --> 
     
    174180    </Agent> 
    175181    <Manager> 
     182        <!-- TODO: Update this. --> 
     183        <manager_state description="Upon termination, the Manager will attempt to save a complete copy of its state into this file, if specified." default=""> 
     184            Manager.dump 
     185        </manager_state> 
    176186        <!-- TODO: Update this. --> 
    177187        <address description="The IP or hostname that all Manager modules should use, when accepting SOAP requests." default="localhost"> 
  • honeyclient/trunk/etc/honeyclient_log.conf

    r131 r158  
    6060 
    6161log4perl.rootLogger=INFO, Screen 
     62#log4perl.logger.HoneyClient.Agent.Integrity.Registry=DEBUG, Screen 
    6263# Suppress Parser Debugging Messages 
    6364#log4perl.logger.HoneyClient.Agent.Integrity.Registry.Parser=INFO, Screen