[Yanel-commits] rev 42464 -
public/yanel/trunk/src/core/java/org/wyona/yanel/core/map
michi at wyona.com
michi at wyona.com
Wed Apr 22 10:00:55 CEST 2009
Author: michi
Date: 2009-04-22 10:00:55 +0200 (Wed, 22 Apr 2009)
New Revision: 42464
Modified:
public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmContextConfig.java
public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmManager.java
Log:
making clear that the config of each realm might not be resolved yet
Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmContextConfig.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmContextConfig.java 2009-04-22 07:50:22 UTC (rev 42463)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmContextConfig.java 2009-04-22 08:00:55 UTC (rev 42464)
@@ -30,23 +30,23 @@
private String id;
private String mountPoint;
private boolean rootFlag;
- private File realmConfigFile;
+ private File unresolvedRealmConfigFile;
private String label;
private ReverseProxyConfig reverseProxyConfig;
- public RealmContextConfig(String id, String mountPoint, boolean rootFlag, File realmConfigFile) {
+ public RealmContextConfig(String id, String mountPoint, boolean rootFlag, File unresolvedRealmConfigFile) {
this.id = id;
this.mountPoint = mountPoint;
this.rootFlag = rootFlag;
- this.realmConfigFile = realmConfigFile;
+ this.unresolvedRealmConfigFile = unresolvedRealmConfigFile;
}
/**
- * Get realm configuration file
+ * Get realm configuration file not resolved yet
*/
- public File getConfigurationFile() {
- return realmConfigFile;
+ public File getUnresolvedConfigurationFile() {
+ return unresolvedRealmConfigFile;
}
/**
@@ -106,7 +106,7 @@
s = s + " ID = " + id + ", ";
s = s + " Mount point = " + mountPoint + ", ";
s = s + " Root flag = " + rootFlag + ", ";
- s = s + " Realm config file = " + realmConfigFile;
+ s = s + " Unresolved realm config file = " + unresolvedRealmConfigFile;
return s;
}
}
Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmManager.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmManager.java 2009-04-22 07:50:22 UTC (rev 42463)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmManager.java 2009-04-22 08:00:55 UTC (rev 42464)
@@ -217,7 +217,7 @@
String mountPoint = rcc[i].getMountPoint();
String realmId = rcc[i].getID();
- File realmConfigFile = resolveFile(rcc[i].getConfigurationFile(), realmsConfigFile);
+ File realmConfigFile = resolveFile(rcc[i].getUnresolvedConfigurationFile(), realmsConfigFile);
if (realmConfigFile.isDirectory()) {
realmConfigFile = new File(realmConfigFile, REALM_DEFAULT_CONFIG_NAME);
}
More information about the Yanel-commits
mailing list