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/30 20:39:40 UTC
cvs commit: incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/jaas ConfigurationEntryTest.java LoginKerberosNonGeronimoTest.java LoginPropertiesFileTest.java
adc 2004/05/30 11:39:40
Modified: modules/security/src/test/org/apache/geronimo/security/jaas
ConfigurationEntryTest.java
LoginKerberosNonGeronimoTest.java
LoginPropertiesFileTest.java
Log:
Options are now Properties instead of HashMap.
Revision Changes Path
1.6 +4 -4 incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
Index: ConfigurationEntryTest.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConfigurationEntryTest.java 30 May 2004 01:27:36 -0000 1.5
+++ ConfigurationEntryTest.java 30 May 2004 18:39:40 -0000 1.6
@@ -21,11 +21,10 @@
import javax.security.auth.Subject;
import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginContext;
-
import java.io.File;
import java.net.URI;
import java.util.Collections;
-import java.util.HashMap;
+import java.util.Properties;
import com.sun.security.auth.login.ConfigFile;
import junit.framework.TestCase;
@@ -43,6 +42,7 @@
* @version $Revision$ $Date$
*/
public class ConfigurationEntryTest extends TestCase {
+
protected Kernel kernel;
protected ObjectName serverInfo;
protected ObjectName loginService;
@@ -102,7 +102,7 @@
gbean.setAttribute("JAASId", "properties");
gbean.setAttribute("RealmName", "properties-realm");
gbean.setAttribute("ControlFlag", LoginModuleControlFlag.REQUIRED);
- gbean.setAttribute("Options", new HashMap());
+ gbean.setAttribute("Options", new Properties());
kernel.loadGBean(testCE, gbean);
gbean = new GBeanMBean("org.apache.geronimo.security.realm.providers.PropertiesFileSecurityRealm");
1.4 +3 -4 incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java
Index: LoginKerberosNonGeronimoTest.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoginKerberosNonGeronimoTest.java 30 May 2004 01:27:36 -0000 1.3
+++ LoginKerberosNonGeronimoTest.java 30 May 2004 18:39:40 -0000 1.4
@@ -22,8 +22,7 @@
import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-
-import java.util.HashMap;
+import java.util.Properties;
import com.sun.security.auth.login.ConfigFile;
@@ -57,7 +56,7 @@
super.setUp();
- HashMap options = new HashMap();
+ Properties options = new Properties();
options.put("debug", "true");
options.put("useTicketCache", "true");
options.put("doNotPrompt", "true");
1.6 +4 -4 incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
Index: LoginPropertiesFileTest.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LoginPropertiesFileTest.java 30 May 2004 01:27:36 -0000 1.5
+++ LoginPropertiesFileTest.java 30 May 2004 18:39:40 -0000 1.6
@@ -21,10 +21,9 @@
import javax.security.auth.Subject;
import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginContext;
-
import java.io.File;
-import java.util.HashMap;
import java.util.Collections;
+import java.util.Properties;
import com.sun.security.auth.login.ConfigFile;
@@ -40,6 +39,7 @@
* @version $Revision$ $Date$
*/
public class LoginPropertiesFileTest extends AbstractTest {
+
protected ObjectName serverInfo;
protected ObjectName propertiesRealm;
protected ObjectName propertiesCE;
@@ -71,7 +71,7 @@
gbean.setAttribute("JAASId", "properties");
gbean.setAttribute("RealmName", "properties-realm");
gbean.setAttribute("ControlFlag", LoginModuleControlFlag.REQUIRED);
- gbean.setAttribute("Options", new HashMap());
+ gbean.setAttribute("Options", new Properties());
kernel.loadGBean(propertiesCE, gbean);
kernel.startGBean(propertiesRealm);