Revision 6503
Added by ben leinfelder over 12 years ago
| ConfigurableProperties.java | ||
|---|---|---|
| 35 | 35 |
import javax.servlet.http.HttpServletRequest; |
| 36 | 36 |
import javax.xml.transform.TransformerException; |
| 37 | 37 |
|
| 38 |
import org.apache.commons.configuration.ConfigurationException; |
|
| 38 | 39 |
import org.apache.log4j.Logger; |
| 40 |
import org.dataone.configuration.Settings; |
|
| 39 | 41 |
|
| 40 | 42 |
import edu.ucsb.nceas.metacat.service.ServiceService; |
| 41 | 43 |
import edu.ucsb.nceas.metacat.shared.BaseService; |
| ... | ... | |
| 127 | 129 |
// metacat. |
| 128 | 130 |
mainProperties = new SortedProperties(mainConfigFilePath); |
| 129 | 131 |
mainProperties.load(); |
| 132 |
|
|
| 133 |
// include main metacat properties in d1 properties as overrides |
|
| 134 |
try {
|
|
| 135 |
Settings.augmentConfiguration(mainConfigFilePath); |
|
| 136 |
} catch (ConfigurationException e) {
|
|
| 137 |
logMetacat.error("Could not augment DataONE properties. " + e.getMessage(), e);
|
|
| 138 |
} |
|
| 130 | 139 |
|
| 131 | 140 |
// mainMetaData holds configuration information about main |
| 132 | 141 |
// properties. This is primarily used to display input fields on |
Also available in: Unified diff
use Settings augmentation to customize the D1Client.CN_URL when used in a Metacat deployment.