Changeset 32357 for main/trunk/greenstone3/src/java/org/greenstone/server
- Timestamp:
- 2018-08-22T22:08:05+12:00 (6 years ago)
- Location:
- main/trunk/greenstone3/src/java/org/greenstone/server
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/server/Server3.java
r32329 r32357 11 11 import org.greenstone.server.BaseProperty; 12 12 import org.greenstone.util.GlobalProperties; 13 import org.greenstone.util.ProtocolPortProperties; 13 14 import org.greenstone.util.RunAnt; 14 15 … … 16 17 { 17 18 String opt_ant_properties = null; 19 ProtocolPortProperties protocolPortProps = null; 18 20 19 21 public Server3(String gsdl3_src_home, String lang) … … 21 23 super(gsdl3_src_home, lang, gsdl3_src_home + File.separatorChar + "build.properties", "web"+File.separator+"logs"); 22 24 23 Property = new Server3Property(); 25 // config properties are loaded into the config_properties object 26 // now test the port and protocol values are sane or exit. 27 protocolPortProps = new ProtocolPortProperties(config_properties); 28 if(protocolPortProps.hadError()) { 29 String errorMsg = "Error with port/protocol in " + config_properties_file + ": " + protocolPortProps.getErrorMsg(); 30 31 // print it everywhere, because port/protocol misconfiguration is a fatal error and we're exiting 32 logger_.error(errorMsg); 33 System.err.println(errorMsg); 34 // If error, then quit this app as soon as possible 35 System.exit(-1); 36 } 37 38 Property = protocolPortProps.legacyMode ? new Server3Property() : new Server3Property(protocolPortProps.getProtocol()); 24 39 25 40 String frame_title = dictionary.get("ServerControl.Frame_Title"); -
main/trunk/greenstone3/src/java/org/greenstone/server/Server3Property.java
r29845 r32357 14 14 } 15 15 16 Server3Property(String protocol) 17 { 18 // Initialising customised final variables 19 // Version number, WEB_PORT, autoenter, startbrowser 20 // For GS3, the last two are controlled by the same property 21 super("3", "tomcat.port."+protocol, "server.auto.start", "server.auto.start", 22 "server.keep.port", "server.external.access"); 23 } 16 24 }
Note:
See TracChangeset
for help on using the changeset viewer.