Changeset 18693

Show
Ignore:
Timestamp:
16.03.2009 17:40:58 (10 years ago)
Author:
ak19
Message:

Changes to server.properties files so that the one for GS2 can be merged with the one for GS3. Corresponding changes in the java code.

Location:
greenstone3/trunk/src/java/org/greenstone/server
Files:
7 modified

Legend:

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

    r18655 r18693  
    1616    public final String BROWSER_PATH = "browser.path"; 
    1717 
    18     protected BaseProperty(String gsdl_home,  
    19                String gsdl_version, String web_port)  
     18    public final String SERVER_CONTROL; 
     19    public final String SERVER_SETTINGS; 
     20     
     21    protected BaseProperty(String version, String web_port)  
    2022    { 
    21     GSDL_HOME = gsdl_home; 
    22     GSDL_VERSION = gsdl_version; 
     23    // property names 
    2324    WEB_PORT = web_port; 
     25    GSDL_HOME = "gsdl"+version +".home"; 
     26    GSDL_VERSION = "gsdl"+version+".version"; 
     27    SERVER_CONTROL = "Server"+version+"Control"; 
     28    SERVER_SETTINGS = "Server"+version+"Settings"; 
    2429    } 
    2530 
  • greenstone3/trunk/src/java/org/greenstone/server/BaseServerControl.java

    r18690 r18693  
    5050 
    5151 
    52         String title = BaseServer.dictionary.get("ServerControl.Title");            
     52        String title = BaseServer.dictionary.get(BaseServer.Property.SERVER_CONTROL+".Title");            
    5353        title_label.setText(stringToHTML(title));  
    5454        title_label.setOpaque(false);    
     
    5858 
    5959        JLabel version_label = new JLabel(); 
    60         String version = BaseServer.dictionary.get("ServerControl.Version").toLowerCase(); 
     60        String version = BaseServer.dictionary.get(BaseServer.Property.SERVER_CONTROL+".Version").toLowerCase(); 
    6161          
    6262        version_label.setText(stringToHTML(version));  
  • greenstone3/trunk/src/java/org/greenstone/server/BaseServerSettings.java

    r18690 r18693  
    8181    setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); 
    8282 
    83     JLabel port_label = new JLabel(BaseServer.dictionary.get("ServerSettings.Tomcat_Port")); 
     83    JLabel port_label = new JLabel(BaseServer.dictionary.get(BaseServer.Property.SERVER_SETTINGS+".Port")); 
    8484 
    8585    portNumber_spinner = new JSpinner(new SpinnerNumberModel(portNum,1,65535,1)); 
  • greenstone3/trunk/src/java/org/greenstone/server/Server2Property.java

    r18655 r18693  
    88    { 
    99    // Initialising customised final variables  
    10     // GSDL_HOME, GSDL_VERSION, WEB_PORT 
    11     super("gsdl2.home", "gsdl2.version", "apache.port"); 
     10    // Version number, WEB_PORT 
     11    super("2", "apache.port"); 
    1212    } 
    1313 
  • greenstone3/trunk/src/java/org/greenstone/server/Server2Settings.java

    r18668 r18693  
    1515    protected JPanel createServletPanel() 
    1616    { 
    17     JLabel prefix_label = new JLabel(server.dictionary.get("ServerSettings.Library_Prefix")); 
     17    JLabel prefix_label = new JLabel(server.dictionary.get(BaseServer.Property.SERVER_SETTINGS+".URL")); 
    1818 
    1919    JComboBox prefix_combobox = new JComboBox(); 
  • greenstone3/trunk/src/java/org/greenstone/server/Server3Property.java

    r18655 r18693  
    88    { 
    99    // Initialising customised final variables  
    10     // GSDL_HOME, GSDL_VERSION, WEB_PORT 
    11     super("gsdl3.home", "gsdl3.version", "tomcat.port"); 
     10    // Version number, WEB_PORT 
     11    super("3", "tomcat.port"); 
    1212    } 
    1313 
  • greenstone3/trunk/src/java/org/greenstone/server/Server3Settings.java

    r18667 r18693  
    2727    { 
    2828 
    29     JLabel servlet_label = new JLabel(server.dictionary.get("ServerSettings.Servlet")); 
     29    JLabel servlet_label = new JLabel(server.dictionary.get(BaseServer.Property.SERVER_SETTINGS+".URL")); 
    3030 
    3131    servlet_combobox = new JComboBox();