Changeset 27868
- Timestamp:
- 2013-07-15T23:25:48+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java
r27825 r27868 21 21 import java.io.File; 22 22 import java.io.InputStream; 23 import java.io.FileInputStream; 23 24 import java.util.Properties; 24 25 … … 71 72 public static String getGSDL3WebAddress() 72 73 { 74 logger.info("**** Asked for Web Address"); 73 75 return gsdl3_web_address; 74 76 } … … 76 78 public static String getFullGSDL3WebAddress() 77 79 { 80 logger.info("**** Asked for FULL Web Address"); 78 81 return full_gsdl3_web_address; 79 82 } … … 84 87 { 85 88 InputStream in = Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream(properties_filename); 89 90 if (in==null) 91 { 92 // Try to find it through gsdl3.writablehome 93 logger.info("Couldn't find '" + properties_filename + "' through ClassLoader"); 94 logger.info("Trying alternative path through System property gsdl3.writablehome"); 95 gsdl3_writablehome = System.getProperty("gsdl3.writablehome"); 96 if (gsdl3_writablehome!=null) { 97 98 String gp_full_filename = gsdl3_writablehome + File.separator + "WEB-INF" 99 + File.separator + "classes" 100 + File.separator + properties_filename; 101 102 try { 103 in = new FileInputStream(gp_full_filename); 104 logger.info("Found '" + properties_filename + "'"); 105 } 106 catch (Exception e) { 107 logger.info("Unable to locate '" + gp_full_filename + "'"); 108 } 109 } 110 else { 111 logger.info("Java property gsdl3.writablehome was not set"); 112 } 113 } 114 86 115 if (in != null) 87 116 { … … 90 119 in.close(); 91 120 } 92 else 93 { 94 logger.error("Couldn't load global properties: " + properties_filename); 95 } 121 else { 122 logger.error("Failed to find '" + properties_filename + "'"); 123 } 96 124 97 125 gsdl3_home = properties.getProperty("gsdl3.home");
Note:
See TracChangeset
for help on using the changeset viewer.