Changeset 25387

Show
Ignore:
Timestamp:
16.04.2012 19:22:23 (8 years ago)
Author:
ak19
Message:

The GSDL3 web address constructed in GlobalProperties?.java had been changed into a relative URL recently, but Server3.java still requires the full URL for the browser to open the correct page. So now GlobalProperties? maintains a full URL variable alongside.

Location:
main/trunk/greenstone3/src/java/org/greenstone
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/server/Server3.java

    r22085 r25387  
    4040     
    4141    public String getBrowserURL() { 
    42     return GlobalProperties.getGSDL3WebAddress()+ config_properties.getProperty(BaseServer.Property.DEFAULT_SERVLET); 
     42    return GlobalProperties.getFullGSDL3WebAddress()+ config_properties.getProperty(BaseServer.Property.DEFAULT_SERVLET); 
    4343    } 
    4444 
  • main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java

    r25271 r25387  
    3636    private static String gsdl3_home = null; 
    3737    private static String gsdl3_web_address = null; 
     38        private static String full_gsdl3_web_address = null; 
    3839 
    3940    // Note, that if the servlet is reloadable, then it is reloaded each time the file is changed. 
     
    7374    { 
    7475        return gsdl3_web_address; 
     76    } 
     77 
     78        public static String getFullGSDL3WebAddress() 
     79    { 
     80        return full_gsdl3_web_address; 
    7581    } 
    7682 
     
    156162 
    157163            //string it all together 
    158             //gsdl3_web_address = protocolSpecifier + hostSpecifier + portSpecifier + contextSpecifier; 
     164            full_gsdl3_web_address = protocolSpecifier + hostSpecifier + portSpecifier + contextSpecifier; 
    159165            gsdl3_web_address = contextSpecifier; 
    160166        }