[Yanel-commits] rev 44188 -
public/yanel/trunk/src/core/java/org/wyona/yanel/core/map
michi at wyona.com
michi at wyona.com
Thu Aug 13 23:31:44 CEST 2009
Author: michi
Date: 2009-08-13 23:31:44 +0200 (Thu, 13 Aug 2009)
New Revision: 44188
Modified:
public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmManager.java
Log:
get label refactored
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-08-13 21:30:57 UTC (rev 44187)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmManager.java 2009-08-13 21:31:44 UTC (rev 44188)
@@ -216,6 +216,7 @@
for (int i = 0;i < rcc.length; i++) {
String mountPoint = rcc[i].getMountPoint();
String realmId = rcc[i].getID();
+ String realmLabel = rcc[i].getLabel();
File realmConfigFile = resolveFile(rcc[i].getUnresolvedConfigurationFile(), realmsConfigFile);
if (realmConfigFile.isDirectory()) {
@@ -230,7 +231,7 @@
String customRealmImplClassName = realmConfig.getAttribute("class");
Class[] classArgs = new Class[]{String.class, String.class, String.class, File.class};
Object[] values = new Object[4];
- values[0] = rcc[i].getLabel();
+ values[0] = realmLabel;
values[1] = realmId;
values[2] = mountPoint;
values[3] = realmConfigFile;
@@ -238,10 +239,10 @@
realm = (Realm) ct.newInstance(values);
} catch(ClassNotFoundException e) {
log.error("Class not found: " + e.getMessage() + ". Fallback to default realm implementation!");
- realm = new RealmDefaultImpl(rcc[i].getLabel(), realmId, mountPoint, realmConfigFile);
+ realm = new RealmDefaultImpl(realmLabel, realmId, mountPoint, realmConfigFile);
} catch(Exception e) {
log.info("Default realm implementation will be used.");
- realm = new RealmDefaultImpl(rcc[i].getLabel(), realmId, mountPoint, realmConfigFile);
+ realm = new RealmDefaultImpl(realmLabel, realmId, mountPoint, realmConfigFile);
}
ReverseProxyConfig rpc = rcc[i].getReverseProxyConfig();
@@ -257,8 +258,7 @@
log.error(errorMsg, e);
// NOTE: Do not throw an exception, because otherwise all other realms are not being loaded either
//throw new ConfigurationException(errorMsg, e);
- realm = new RealmWithConfigurationExceptionImpl(realmId, realmId, mountPoint, realmConfigFile, e);
- //realm = new RealmWithConfigurationExceptionImpl(rcc[i].getLabel(), realmId, mountPoint, realmConfigFile, e);
+ realm = new RealmWithConfigurationExceptionImpl(realmLabel, realmId, mountPoint, realmConfigFile, e);
}
log.info("Realm: " + realm);
More information about the Yanel-commits
mailing list