Changeset 20603


Ignore:
Timestamp:
2009-09-15T20:08:34+12:00 (12 years ago)
Author:
ak19
Message:

Changes to Server.jar and affected files to add address_resolution options. 1. glisite.cfg.in and llssite.cfg.in have a host property where the host as specified or resolved from IP is stored. 2. gsicontrol.sh changed to set AllowFrom value to either the host specified OR to All if allow from all is checked in the GSI dialog. 3. New string properties added to server.properties for the updated GSI dialog for GS2. 4. log4j.properties.in updated so that the logger now can write to the console as well as the logfile specified (server.log in this case). At present only ERROR messages written to the logger are displayed in the console as well as logger message types that are higher up in the log4j hierarchy. 5. Server.jar updated after the changes to the GS3 server code (recompiled with Java 5).

Location:
gsdl/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/glisite.cfg.in

    r19299 r20603  
    99start_browser=0
    1010address_resolution_method=2
    11 
     11host=localhost
  • gsdl/trunk/gsicontrol.sh

    r20342 r20603  
    5858        allowfrom="all"
    5959    else
    60         allowfrom="127.0.0.1"
     60    echo "Enter host (hostname, IP, localhost, 127.0.0.1) to use:"
     61    read host ;
     62    allowfrom=$host
     63    if [ $allowfrom == "localhost" ]; then
     64        allowfrom="127.0.0.1" ;
     65    fi
    6166    fi
    6267
     
    9499    echo "Configuring the apache webserver..." ;
    95100    port=`egrep "^portnumber" $configfile | awk -F= '{print $2}'` ;
    96 
     101   
    97102    externalaccess=`egrep "^externalaccess" $configfile | awk -F= '{print $2}'` ;
    98103    if [ $externalaccess == "1" ] ; then
     
    100105    else
    101106    externalaccess="no"
    102     fi
    103 
    104     echo -e "$port\n$externalaccess" | _configure-port-and-connection ;
     107    host=`egrep "^host" $configfile | awk -F= '{print $2}'` ;
     108    fi
     109
     110    echo -e "$port\n$externalaccess\n$host" | _configure-port-and-connection ;
    105111    if test -e "$GSDLHOME/apache-httpd/$GSDLOS/conf/httpd.conf" ; then
    106112    echo $MONITOR_SUCCESS;
  • gsdl/trunk/lib/java/log4j.properties.in

    r19424 r20603  
    1212
    1313#####configure the loggers####
    14 ##general logger                                                   
     14##general logger
    1515log4j.rootCategory=INFO, infolog
    1616
     
    2222##Set to INFO if you want INFO (success) messages to appear as well
    2323##Set to WARN if you want to turn INFO and DEBUG messages off.
    24 log4j.category.org.greenstone.server=INFO, serverlog
     24log4j.category.org.greenstone.server=INFO, stdout, serverlog
    2525log4j.additivity.org.greenstone.server=false
    2626
    27 #####configure appenders and their oprions####                                 
     27#####configure appenders and their options####
     28##console logger - send only ERROR messages out to the console
     29log4j.appender.stdout=org.apache.log4j.ConsoleAppender
     30log4j.appender.stdout.Threshold=ERROR
     31log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
     32log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
     33
    2834##general logger
    2935log4j.appender.infolog=org.apache.log4j.RollingFileAppender
  • gsdl/trunk/lib/java/server.properties

    r19425 r20603  
    22Server2Settings.Port=Apache port:
    33Server2Settings.URL=Library URL prefix:
     4Server2Settings.ExternalAccess=Allow external connections
     5Server2Settings.ResolveIP=Get local IP and resolve to a name
     6Server2Settings.LocalIP=Get local IP
     7Server2Settings.AlwaysUse=Always use
    48Server2Control.Version=Version 2-trunk
    59Server2Control.Title=Greenstone 2 Digital Library
     
    1923ServerSettings.ChooseBrowser=Enter library using:
    2024ServerSettings.Browse=Browse
     25ServerSettings.SettingChanged=The new settings will be available after the server has been restarted
    2126
    2227ServerControl.EnterLibrary=Enter Library
     
    3742ServerControl.Failed={0} failed
    3843ServerControl.Success={0} success
    39 ServerSetting.SettingChanged=The new settings will be available after the server has been restarted
  • gsdl/trunk/llssite.cfg.in

    r19314 r20603  
    99start_browser=1
    1010address_resolution_method=2
     11host=localhost
Note: See TracChangeset for help on using the changeset viewer.