You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ad...@apache.org on 2004/05/31 02:05:24 UTC
cvs commit: incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas ConfigurationEntry.java GeronimoLoginConfiguration.java
adc 2004/05/30 17:05:24
Modified: modules/security/src/java/org/apache/geronimo/security/jaas
ConfigurationEntry.java
GeronimoLoginConfiguration.java
Log:
Change JAASId to ApplicationConfigName.
Revision Changes Path
1.6 +9 -9 incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntry.java
Index: ConfigurationEntry.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntry.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConfigurationEntry.java 30 May 2004 19:43:01 -0000 1.5
+++ ConfigurationEntry.java 31 May 2004 00:05:24 -0000 1.6
@@ -50,7 +50,7 @@
private static final GBeanInfo GBEAN_INFO;
protected GBeanMBeanContext context;
- protected String JAASId;
+ protected String applicationConfigName;
protected LoginModuleControlFlag controlFlag;
protected Properties options = new Properties();
@@ -59,17 +59,17 @@
*
* @return the JAAS config id for this configuration entry
*/
- public String getJAASId() {
- return JAASId;
+ public String getApplicationConfigName() {
+ return applicationConfigName;
}
/**
- * Set the JAAS config id for this configuration entry.
+ * Set the JAAS application configuration name for this configuration entry.
*
- * @param JAASId the JAAS config id for this configuration entry
+ * @param applicationConfigName the JAAS config id for this configuration entry
*/
- public void setJAASId(String JAASId) {
- this.JAASId = JAASId;
+ public void setApplicationConfigName(String applicationConfigName) {
+ this.applicationConfigName = applicationConfigName;
}
public LoginModuleControlFlag getControlFlag() {
@@ -111,7 +111,7 @@
static {
GBeanInfoFactory infoFactory = new GBeanInfoFactory(ConfigurationEntry.class.getName());
- infoFactory.addAttribute(new GAttributeInfo("JAASId", true));
+ infoFactory.addAttribute(new GAttributeInfo("ApplicationConfigName", true));
infoFactory.addAttribute(new GAttributeInfo("ControlFlag", true));
infoFactory.addAttribute(new GAttributeInfo("Options", true));
GBEAN_INFO = infoFactory.getBeanInfo();
1.7 +6 -6 incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java
Index: GeronimoLoginConfiguration.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GeronimoLoginConfiguration.java 30 May 2004 19:44:05 -0000 1.6
+++ GeronimoLoginConfiguration.java 31 May 2004 00:05:24 -0000 1.7
@@ -38,8 +38,8 @@
private static Map entries = new Hashtable();
private Configuration oldConfiguration;
- public AppConfigurationEntry[] getAppConfigurationEntry(String JAASId) {
- ConfigurationEntry entry = (ConfigurationEntry) entries.get(JAASId);
+ public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
+ ConfigurationEntry entry = (ConfigurationEntry) entries.get(name);
if (entry == null) return null;
@@ -53,16 +53,16 @@
SecurityManager sm = System.getSecurityManager();
if (sm != null) sm.checkPermission(SecurityService.CONFIGURE);
- if (entries.containsKey(entry.getJAASId())) throw new java.lang.IllegalArgumentException("ConfigurationEntry already registered");
+ if (entries.containsKey(entry.getApplicationConfigName())) throw new java.lang.IllegalArgumentException("ConfigurationEntry already registered");
- entries.put(entry.getJAASId(), entry);
+ entries.put(entry.getApplicationConfigName(), entry);
}
public static void unRegister(ConfigurationEntry entry) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) sm.checkPermission(SecurityService.CONFIGURE);
- entries.remove(entry.getJAASId());
+ entries.remove(entry.getApplicationConfigName());
}
public void setGBeanContext(GBeanContext context) {