Mercurial > dive4elements > gnv-client
comparison gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java @ 863:1afa4f5d4190
Removed duplicated mapfile path configurations and replaced absolute path definitions with relative ones (issue218, issue220).
gnv-artifacts/trunk@1001 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 27 Apr 2010 12:52:37 +0000 |
| parents | 05bf8534a35a |
| children | 732cea65cee7 |
comparison
equal
deleted
inserted
replaced
| 862:62cf1a5555b9 | 863:1afa4f5d4190 |
|---|---|
| 147 | 147 |
| 148 /** | 148 /** |
| 149 * | 149 * |
| 150 */ | 150 */ |
| 151 public final static String XPATH_MAP_PATH = | 151 public final static String XPATH_MAP_PATH = |
| 152 "/artifact-database/mapserver/map/@path"; | 152 "/artifact-database/gnv/map-generator/mapfile/@path"; |
| 153 | 153 |
| 154 /** | 154 /** |
| 155 * Constructor | 155 * Constructor |
| 156 */ | 156 */ |
| 157 public GNVArtifactContextFactory() { | 157 public GNVArtifactContextFactory() { |
| 751 String serverPath = (String) Config.getStringXPath( | 751 String serverPath = (String) Config.getStringXPath( |
| 752 config, XPATH_MAPSERVER_PATH); | 752 config, XPATH_MAPSERVER_PATH); |
| 753 | 753 |
| 754 String mapPath = (String) Config.getStringXPath( | 754 String mapPath = (String) Config.getStringXPath( |
| 755 config, XPATH_MAP_PATH); | 755 config, XPATH_MAP_PATH); |
| 756 mapPath = Config.replaceConfigDir(mapPath); | |
| 756 | 757 |
| 757 if (serverPath != null && mapPath != null) { | 758 if (serverPath != null && mapPath != null) { |
| 758 context.put(GNVArtifactContext.MAPSERVER_SERVER_PATH_KEY,serverPath); | 759 context.put(GNVArtifactContext.MAPSERVER_SERVER_PATH_KEY,serverPath); |
| 759 context.put(GNVArtifactContext.MAPSERVER_MAP_PATH_KEY, mapPath); | 760 context.put(GNVArtifactContext.MAPSERVER_MAP_PATH_KEY, mapPath); |
| 760 } | 761 } |