Revision 4708
Added by daigle over 15 years ago
| src/edu/ucsb/nceas/metacat/advancedsearch/AdvancedSearchServlet.java | ||
|---|---|---|
| 121 | 121 |
dirPath = context.getRealPath(CONFIG_DIR); |
| 122 | 122 |
|
| 123 | 123 |
try {
|
| 124 |
PropertyService.getInstance(dirPath);
|
|
| 124 |
PropertyService.getInstance(); |
|
| 125 | 125 |
this.contextString = PropertyService.getProperty("application.context");
|
| 126 | 126 |
} catch (ServiceException se) {
|
| 127 | 127 |
System.err.println("Error in loading properties: " + se.getMessage());
|
| src/edu/ucsb/nceas/metacat/advancedsearch/BrowseServlet.java | ||
|---|---|---|
| 123 | 123 |
dirPath = context.getRealPath(CONFIG_DIR); |
| 124 | 124 |
|
| 125 | 125 |
try {
|
| 126 |
PropertyService.getInstance(dirPath);
|
|
| 126 |
PropertyService.getInstance(); |
|
| 127 | 127 |
this.contextString = PropertyService.getProperty("application.context");
|
| 128 | 128 |
} catch (ServiceException se) {
|
| 129 | 129 |
System.err.println("Error in loading properties: " + se.getMessage());
|
| src/edu/ucsb/nceas/metacat/advancedsearch/SearchServlet.java | ||
|---|---|---|
| 124 | 124 |
dirPath = context.getRealPath(CONFIG_DIR); |
| 125 | 125 |
|
| 126 | 126 |
try {
|
| 127 |
PropertyService.getInstance(dirPath);
|
|
| 127 |
PropertyService.getInstance(); |
|
| 128 | 128 |
this.contextString = PropertyService.getProperty("application.context");
|
| 129 | 129 |
} catch (ServiceException se) {
|
| 130 | 130 |
System.err.println("Error in loading properties: " + se.getMessage());
|
| src/edu/ucsb/nceas/metacat/advancedsearch/LoginServlet.java | ||
|---|---|---|
| 137 | 137 |
dirPath = context.getRealPath(CONFIG_DIR); |
| 138 | 138 |
|
| 139 | 139 |
try {
|
| 140 |
PropertyService.getInstance(dirPath);
|
|
| 140 |
PropertyService.getInstance(); |
|
| 141 | 141 |
this.contextString = PropertyService.getProperty("application.context");
|
| 142 | 142 |
} catch (ServiceException se) {
|
| 143 | 143 |
System.err.println("Error in loading properties: " + se.getMessage());
|
| src/edu/ucsb/nceas/metacat/harvesterClient/Harvester.java | ||
|---|---|---|
| 88 | 88 |
String configDir = test ? CONFIG_DIR_TEST : CONFIG_DIR; |
| 89 | 89 |
|
| 90 | 90 |
try {
|
| 91 |
PropertyService.getInstance(configDir);
|
|
| 91 |
PropertyService.getInstance(); |
|
| 92 | 92 |
} |
| 93 | 93 |
catch (ServiceException e) {
|
| 94 | 94 |
System.out.println("Error in loading properties: " + e.getMessage());
|
| src/edu/ucsb/nceas/metacat/harvesterClient/MetUpload.java | ||
|---|---|---|
| 193 | 193 |
dirPath = context.getRealPath(CONFIG_DIR); |
| 194 | 194 |
|
| 195 | 195 |
try {
|
| 196 |
PropertyService.getInstance(dirPath);
|
|
| 196 |
PropertyService.getInstance(); |
|
| 197 | 197 |
metacatURL = SystemUtil.getServletURL(); |
| 198 | 198 |
} catch (ServiceException se) {
|
| 199 | 199 |
System.out.println("Service problem while initializing MetUpload: " + se.getMessage());
|
| src/edu/ucsb/nceas/metacat/harvesterClient/HarvesterRegistration.java | ||
|---|---|---|
| 743 | 743 |
dirPath = context.getRealPath(CONFIG_DIR); |
| 744 | 744 |
|
| 745 | 745 |
try {
|
| 746 |
PropertyService.getInstance(dirPath);
|
|
| 746 |
PropertyService.getInstance(); |
|
| 747 | 747 |
|
| 748 | 748 |
dbDriver = PropertyService.getProperty("database.driver");
|
| 749 | 749 |
defaultDB = PropertyService.getProperty("database.connectionURI");
|
Also available in: Unified diff
Remove the configuration directory from the PropertyService constructor