Author: jboynes
Date: Tue Feb 22 21:07:36 2005
New Revision: 154957
URL: http://svn.apache.org/viewcvs?view=rev&rev=154957
Log:
remove use of deprecated GBeanMBean
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/ContextManager.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/RealmPrincipal.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Principal.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DecouplingCallbackHandler.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleConfiguration.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginService.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginServiceMBean.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlag.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlagEditor.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ServerRealmConfigurationEntry.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactory.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/network/protocol/SubjectCarryingChannel.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/FileAuditLoginModule.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/GeronimoPasswordCredentialLoginModule.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptorInvoker.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/CallerIdentityUserPasswordBridgeTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/ConfiguredIdentityUserPasswordBridgeTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/TestLoginModule.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/MultipleLoginDomainTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactoryTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/ContextManager.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/ContextManager.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/ContextManager.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/ContextManager.java
Tue Feb 22 21:07:36 2005
@@ -17,11 +17,6 @@
package org.apache.geronimo.security;
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-import javax.security.auth.Subject;
-import javax.security.jacc.EJBRoleRefPermission;
import java.io.Serializable;
import java.security.AccessControlContext;
import java.security.AccessControlException;
@@ -34,6 +29,11 @@
import java.util.IdentityHashMap;
import java.util.Map;
import java.util.Set;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import javax.security.auth.Subject;
+import javax.security.jacc.EJBRoleRefPermission;
/**
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/RealmPrincipal.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/RealmPrincipal.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/RealmPrincipal.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/RealmPrincipal.java
Tue Feb 22 21:07:36 2005
@@ -19,6 +19,7 @@
import java.io.Serializable;
import java.security.Principal;
+
import org.apache.geronimo.common.NullArgumentException;
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
Tue Feb 22 21:07:36 2005
@@ -23,7 +23,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.security.jacc.GeronimoPolicy;
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Principal.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Principal.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Principal.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/deploy/Principal.java
Tue Feb 22 21:07:36 2005
@@ -16,11 +16,11 @@
*/
package org.apache.geronimo.security.deploy;
-import java.io.Serializable;
import java.beans.PropertyEditorManager;
+import java.io.Serializable;
-import org.apache.geronimo.common.propertyeditor.TextPropertyEditorSupport;
import org.apache.geronimo.common.propertyeditor.PropertyEditorException;
+import org.apache.geronimo.common.propertyeditor.TextPropertyEditorSupport;
/**
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DecouplingCallbackHandler.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DecouplingCallbackHandler.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DecouplingCallbackHandler.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DecouplingCallbackHandler.java
Tue Feb 22 21:07:36 2005
@@ -16,10 +16,9 @@
*/
package org.apache.geronimo.security.jaas;
-import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
-import java.io.IOException;
/**
* This callback handler separates the process of obtaining callbacks from
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleConfiguration.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleConfiguration.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleConfiguration.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleConfiguration.java
Tue Feb 22 21:07:36 2005
@@ -16,15 +16,15 @@
*/
package org.apache.geronimo.security.jaas;
-import org.apache.geronimo.common.GeronimoSecurityException;
-
-import javax.security.auth.spi.LoginModule;
-import java.io.Serializable;
import java.io.Externalizable;
-import java.util.Map;
+import java.io.Serializable;
+import java.rmi.Remote;
import java.util.HashMap;
import java.util.Iterator;
-import java.rmi.Remote;
+import java.util.Map;
+import javax.security.auth.spi.LoginModule;
+
+import org.apache.geronimo.common.GeronimoSecurityException;
/**
* Describes the configuration of a LoginModule -- its name, class, control
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginService.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginService.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginService.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginService.java
Tue Feb 22 21:07:36 2005
@@ -19,6 +19,7 @@
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.Principal;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Hashtable;
@@ -26,7 +27,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.ArrayList;
import javax.crypto.Mac;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
@@ -35,8 +35,10 @@
import javax.security.auth.callback.Callback;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
+
import EDU.oswego.cs.dl.util.concurrent.ClockDaemon;
import EDU.oswego.cs.dl.util.concurrent.ThreadFactory;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.common.GeronimoSecurityException;
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginServiceMBean.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginServiceMBean.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginServiceMBean.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginServiceMBean.java
Tue Feb 22 21:07:36 2005
@@ -16,13 +16,12 @@
*/
package org.apache.geronimo.security.jaas;
-import org.apache.geronimo.common.GeronimoSecurityException;
-import org.apache.geronimo.security.IdentificationPrincipal;
-
-import javax.security.auth.login.LoginException;
-import javax.security.auth.callback.Callback;
import java.security.Principal;
import java.util.Collection;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.login.LoginException;
+
+import org.apache.geronimo.common.GeronimoSecurityException;
/**
* Interface used to connect to the JaasLoginService via remoting, etc. This
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java
Tue Feb 22 21:07:36 2005
@@ -16,12 +16,16 @@
*/
package org.apache.geronimo.security.jaas;
-import org.apache.geronimo.security.RealmPrincipal;
-import org.apache.geronimo.security.ContextManager;
-
-import javax.security.auth.Subject;
-import java.util.*;
import java.security.Principal;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import javax.security.auth.Subject;
+
+import org.apache.geronimo.security.ContextManager;
+import org.apache.geronimo.security.RealmPrincipal;
/**
* Tracks security information about a single user. This is used before,
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlag.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlag.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlag.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlag.java
Tue Feb 22 21:07:36 2005
@@ -17,9 +17,9 @@
package org.apache.geronimo.security.jaas;
-import javax.security.auth.login.AppConfigurationEntry;
-import java.io.Serializable;
import java.io.ObjectStreamException;
+import java.io.Serializable;
+import javax.security.auth.login.AppConfigurationEntry;
/**
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlagEditor.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlagEditor.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlagEditor.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlagEditor.java
Tue Feb 22 21:07:36 2005
@@ -17,8 +17,8 @@
package org.apache.geronimo.security.jaas;
-import org.apache.geronimo.common.propertyeditor.TextPropertyEditorSupport;
import org.apache.geronimo.common.propertyeditor.PropertyEditorException;
+import org.apache.geronimo.common.propertyeditor.TextPropertyEditorSupport;
/**
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java
Tue Feb 22 21:07:36 2005
@@ -17,6 +17,7 @@
package org.apache.geronimo.security.jaas;
import java.util.Properties;
+
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ServerRealmConfigurationEntry.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ServerRealmConfigurationEntry.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ServerRealmConfigurationEntry.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ServerRealmConfigurationEntry.java
Tue Feb 22 21:07:36 2005
@@ -17,10 +17,11 @@
package org.apache.geronimo.security.jaas;
import java.util.Properties;
+
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.Kernel;
/**
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactory.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactory.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactory.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactory.java
Tue Feb 22 21:07:36 2005
@@ -25,7 +25,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.geronimo.security.GeronimoSecurityPermission;
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/network/protocol/SubjectCarryingChannel.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/network/protocol/SubjectCarryingChannel.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/network/protocol/SubjectCarryingChannel.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/network/protocol/SubjectCarryingChannel.java
Tue Feb 22 21:07:36 2005
@@ -21,7 +21,6 @@
import java.io.IOException;
import java.security.AccessController;
import java.util.Collection;
-
import javax.security.auth.Subject;
import org.activeio.AsynchChannel;
@@ -32,6 +31,7 @@
import org.activeio.packet.AppendedPacket;
import org.activeio.packet.ByteArrayPacket;
import org.activeio.packet.FilterPacket;
+
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.IdentificationPrincipal;
import org.apache.geronimo.security.SubjectId;
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
Tue Feb 22 21:07:36 2005
@@ -16,8 +16,6 @@
*/
package org.apache.geronimo.security.realm;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
@@ -26,9 +24,12 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.proxy.ProxyManager;
import org.apache.geronimo.security.deploy.Principal;
@@ -39,7 +40,6 @@
import org.apache.geronimo.security.jaas.LoginModuleControlFlagEditor;
import org.apache.geronimo.security.jaas.LoginModuleGBean;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
/**
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/FileAuditLoginModule.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/FileAuditLoginModule.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/FileAuditLoginModule.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/FileAuditLoginModule.java
Tue Feb 22 21:07:36 2005
@@ -16,24 +16,25 @@
*/
package org.apache.geronimo.security.realm.providers;
-import java.util.Map;
-import java.util.Date;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.PrintWriter;
import java.io.IOException;
+import java.io.PrintWriter;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import javax.security.auth.spi.LoginModule;
+import java.util.Date;
+import java.util.Map;
import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
+import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.Callback;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+
import org.apache.geronimo.security.realm.GenericSecurityRealm;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
/**
* Writes audit records to a file for all authentication activity. Currently
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/GeronimoPasswordCredentialLoginModule.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/GeronimoPasswordCredentialLoginModule.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/GeronimoPasswordCredentialLoginModule.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/GeronimoPasswordCredentialLoginModule.java
Tue Feb 22 21:07:36 2005
@@ -17,6 +17,7 @@
package org.apache.geronimo.security.realm.providers;
+import java.util.Map;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -25,8 +26,6 @@
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-
-import java.util.Map;
/**
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java
Tue Feb 22 21:07:36 2005
@@ -21,12 +21,12 @@
import java.io.InputStream;
import java.net.URI;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import java.util.HashMap;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -35,6 +35,7 @@
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.common.GeronimoSecurityException;
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java
Tue Feb 22 21:07:36 2005
@@ -18,8 +18,16 @@
package org.apache.geronimo.security.realm.providers;
import java.io.IOException;
-import java.sql.*;
-import java.util.*;
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -28,6 +36,7 @@
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
+
import org.apache.geronimo.security.realm.GenericSecurityRealm;
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java
Tue Feb 22 21:07:36 2005
@@ -20,7 +20,6 @@
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
-
import javax.management.ObjectName;
import org.activeio.AcceptListener;
@@ -37,14 +36,15 @@
import org.activeio.filter.PacketAggregatingAsynchChannel;
import org.activeio.net.SocketMetadata;
import org.activeio.net.SocketSynchChannelFactory;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.geronimo.proxy.ReflexiveInterceptor;
import org.apache.geronimo.security.jaas.JaasLoginServiceMBean;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
/**
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java
Tue Feb 22 21:07:36 2005
@@ -33,6 +33,7 @@
import org.activeio.net.SocketMetadata;
import org.activeio.net.SocketSynchChannelFactory;
import org.activeio.packet.ByteArrayPacket;
+
import org.apache.geronimo.core.service.Interceptor;
import org.apache.geronimo.core.service.Invocation;
import org.apache.geronimo.core.service.InvocationResult;
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptorInvoker.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptorInvoker.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptorInvoker.java
(original)
+++
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptorInvoker.java
Tue Feb 22 21:07:36 2005
@@ -23,6 +23,7 @@
import org.activeio.Packet;
import org.activeio.RequestListener;
import org.activeio.packet.EmptyPacket;
+
import org.apache.geronimo.core.service.Interceptor;
import org.apache.geronimo.core.service.Invocation;
import org.apache.geronimo.core.service.InvocationResult;
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java
Tue Feb 22 21:07:36 2005
@@ -17,6 +17,10 @@
package org.apache.geronimo.security;
+import java.io.IOException;
+import java.net.URI;
+import java.util.Collections;
+import java.util.Properties;
import javax.management.ObjectName;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -24,17 +28,15 @@
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
-import java.io.IOException;
-import java.net.URI;
-import java.util.Collections;
-import java.util.Properties;
-
import junit.framework.TestCase;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.security.bridge.TestLoginModule;
import org.apache.geronimo.security.jaas.JaasLoginService;
+import org.apache.geronimo.security.jaas.LoginModuleGBean;
+import org.apache.geronimo.security.realm.GenericSecurityRealm;
+import
org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer;
/**
@@ -51,38 +53,38 @@
kernel = new Kernel("test.kernel");
kernel.boot();
- GBeanMBean gbean;
+ GBeanData gbean;
// Create all the parts
- gbean = new GBeanMBean(JaasLoginService.class.getName());
loginService = JaasLoginService.OBJECT_NAME;
+ gbean = new GBeanData(loginService, JaasLoginService.getGBeanInfo());
gbean.setReferencePatterns("Realms", Collections.singleton(new
ObjectName("geronimo.security:type=SecurityRealm,*")));
// gbean.setAttribute("reclaimPeriod", new Long(10 * 1000)); // todo
check other tests to see if ok
gbean.setAttribute("algorithm", "HmacSHA1");
gbean.setAttribute("password", "secret");
- kernel.loadGBean(loginService, gbean);
+ kernel.loadGBean(gbean, JaasLoginService.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.LoginModuleGBean");
testLoginModule = new
ObjectName("geronimo.security:type=LoginModule,name=TestModule");
+ gbean = new GBeanData(testLoginModule,
LoginModuleGBean.getGBeanInfo());
gbean.setAttribute("loginModuleClass",
"org.apache.geronimo.security.bridge.TestLoginModule");
gbean.setAttribute("serverSide", new Boolean(true));
gbean.setAttribute("loginDomainName", "TestLoginDomain");
- kernel.loadGBean(testLoginModule, gbean);
+ kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.realm.GenericSecurityRealm");
testRealm = new
ObjectName("geronimo.security:type=SecurityRealm,realm="+TestLoginModule.REALM_NAME);
+ gbean = new GBeanData(testRealm, GenericSecurityRealm.getGBeanInfo());
gbean.setAttribute("realmName", TestLoginModule.REALM_NAME);
Properties props = new Properties();
props.setProperty("LoginModule.1.REQUIRED","geronimo.security:type=LoginModule,name=TestModule");
gbean.setAttribute("loginModuleConfiguration", props);
- kernel.loadGBean(testRealm, gbean);
+ kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer");
+ serverStub = new
ObjectName("geronimo.remoting:target=JaasLoginServiceRemotingServer");
+ gbean = new GBeanData(serverStub,
JaasLoginServiceRemotingServer.getGBeanInfo());
gbean.setAttribute("bindURI", new URI("tcp://0.0.0.0:4242"));
gbean.setReferencePattern("loginService", loginService);
- serverStub = new
ObjectName("geronimo.remoting:target=JaasLoginServiceRemotingServer");
- kernel.loadGBean(serverStub, gbean);
+ kernel.loadGBean(gbean,
JaasLoginServiceRemotingServer.class.getClassLoader());
kernel.startGBean(loginService);
kernel.startGBean(testLoginModule);
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/CallerIdentityUserPasswordBridgeTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/CallerIdentityUserPasswordBridgeTest.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/CallerIdentityUserPasswordBridgeTest.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/CallerIdentityUserPasswordBridgeTest.java
Tue Feb 22 21:07:36 2005
@@ -17,14 +17,13 @@
package org.apache.geronimo.security.bridge;
+import java.util.Set;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
-import org.apache.geronimo.security.realm.providers.GeronimoPasswordCredential;
-import org.apache.geronimo.security.IdentificationPrincipal;
import org.apache.geronimo.security.ContextManager;
-
-import java.util.Set;
+import org.apache.geronimo.security.IdentificationPrincipal;
+import org.apache.geronimo.security.realm.providers.GeronimoPasswordCredential;
/**
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/ConfiguredIdentityUserPasswordBridgeTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/ConfiguredIdentityUserPasswordBridgeTest.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/ConfiguredIdentityUserPasswordBridgeTest.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/ConfiguredIdentityUserPasswordBridgeTest.java
Tue Feb 22 21:07:36 2005
@@ -17,11 +17,11 @@
package org.apache.geronimo.security.bridge;
-import org.apache.geronimo.security.IdentificationPrincipal;
-import org.apache.geronimo.security.ContextManager;
-
-import javax.security.auth.Subject;
import java.util.Set;
+import javax.security.auth.Subject;
+
+import org.apache.geronimo.security.ContextManager;
+import org.apache.geronimo.security.IdentificationPrincipal;
/**
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/TestLoginModule.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/TestLoginModule.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/TestLoginModule.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/TestLoginModule.java
Tue Feb 22 21:07:36 2005
@@ -17,6 +17,8 @@
package org.apache.geronimo.security.bridge;
+import java.io.IOException;
+import java.util.Map;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -25,9 +27,6 @@
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-
-import java.io.IOException;
-import java.util.Map;
import org.apache.geronimo.security.realm.providers.GeronimoPasswordCredential;
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
Tue Feb 22 21:07:36 2005
@@ -17,24 +17,26 @@
package org.apache.geronimo.security.jaas;
-import javax.management.ObjectName;
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginContext;
import java.io.File;
import java.net.URI;
import java.util.Collections;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
+import javax.management.ObjectName;
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginContext;
import junit.framework.TestCase;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.security.AbstractTest;
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.IdentificationPrincipal;
import org.apache.geronimo.security.RealmPrincipal;
+import org.apache.geronimo.security.realm.GenericSecurityRealm;
+import
org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer;
import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -125,40 +127,40 @@
kernel = new Kernel("test.kernel");
kernel.boot();
- GBeanMBean gbean;
+ GBeanData gbean;
// Create all the parts
- gbean = new GBeanMBean(ServerInfo.GBEAN_INFO);
serverInfo = new ObjectName("geronimo.system:role=ServerInfo");
+ gbean = new GBeanData(serverInfo, ServerInfo.GBEAN_INFO);
gbean.setAttribute("baseDirectory", ".");
- kernel.loadGBean(serverInfo, gbean);
+ kernel.loadGBean(gbean, ServerInfo.class.getClassLoader());
kernel.startGBean(serverInfo);
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.GeronimoLoginConfiguration");
loginConfiguration = new
ObjectName("geronimo.security:type=LoginConfiguration");
+ gbean = new GBeanData(loginConfiguration,
GeronimoLoginConfiguration.getGBeanInfo());
Set configurations = new HashSet();
configurations.add(new
ObjectName("geronimo.security:type=SecurityRealm,*"));
configurations.add(new
ObjectName("geronimo.security:type=ConfigurationEntry,*"));
gbean.setReferencePatterns("Configurations", configurations);
- kernel.loadGBean(loginConfiguration, gbean);
+ kernel.loadGBean(gbean,
GeronimoLoginConfiguration.class.getClassLoader());
- gbean = new GBeanMBean(JaasLoginService.class.getName());
loginService = JaasLoginService.OBJECT_NAME;
+ gbean = new GBeanData(loginService, JaasLoginService.getGBeanInfo());
gbean.setReferencePatterns("Realms", Collections.singleton(new
ObjectName("geronimo.security:type=SecurityRealm,*")));
// gbean.setAttribute("reclaimPeriod", new Long(100));
gbean.setAttribute("algorithm", "HmacSHA1");
gbean.setAttribute("password", "secret");
- kernel.loadGBean(loginService, gbean);
+ kernel.loadGBean(gbean, JaasLoginService.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry");
clientCE = new
ObjectName("geronimo.security:type=ConfigurationEntry,jaasId=properties-client");
+ gbean = new GBeanData(clientCE,
ServerRealmConfigurationEntry.getGBeanInfo());
gbean.setAttribute("applicationConfigName", "properties-client");
gbean.setAttribute("realmName", "properties-realm");
- kernel.loadGBean(clientCE, gbean);
+ kernel.loadGBean(gbean,
ServerRealmConfigurationEntry.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.LoginModuleGBean");
testCE = new
ObjectName("geronimo.security:type=LoginModule,name=properties");
+ gbean = new GBeanData(testCE, LoginModuleGBean.getGBeanInfo());
gbean.setAttribute("loginModuleClass",
"org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
gbean.setAttribute("serverSide", new Boolean(true));
Properties props = new Properties();
@@ -166,26 +168,26 @@
props.put("groupsURI", new File(new File("."),
"src/test-data/data/groups.properties").toURI().toString());
gbean.setAttribute("options", props);
gbean.setAttribute("loginDomainName", "TestProperties");
- kernel.loadGBean(testCE, gbean);
+ kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.LoginModuleGBean");
testUPCred = new
ObjectName("geronimo.security:type=LoginModule,name=UPCred");
+ gbean = new GBeanData(testUPCred, LoginModuleGBean.getGBeanInfo());
gbean.setAttribute("loginModuleClass",
"org.apache.geronimo.security.jaas.UPCredentialLoginModule");
gbean.setAttribute("serverSide", new Boolean(true));
gbean.setAttribute("options", new Properties());
- kernel.loadGBean(testUPCred, gbean);
+ kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.LoginModuleGBean");
testCE = new
ObjectName("geronimo.security:type=LoginModule,name=audit");
+ gbean = new GBeanData(testCE, LoginModuleGBean.getGBeanInfo());
gbean.setAttribute("loginModuleClass",
"org.apache.geronimo.security.realm.providers.FileAuditLoginModule");
gbean.setAttribute("serverSide", new Boolean(true));
props = new Properties();
props.put("file", "target/login-audit.log");
gbean.setAttribute("options", props);
- kernel.loadGBean(testCE, gbean);
+ kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.realm.GenericSecurityRealm");
testRealm = new
ObjectName("geronimo.security:type=SecurityRealm,realm=properties-realm");
+ gbean = new GBeanData(testRealm, GenericSecurityRealm.getGBeanInfo());
gbean.setAttribute("realmName", "properties-realm");
props = new Properties();
props.setProperty("LoginModule.3.REQUIRED","geronimo.security:type=LoginModule,name=UPCred");
@@ -193,13 +195,13 @@
props.setProperty("LoginModule.1.REQUIRED","geronimo.security:type=LoginModule,name=properties");
gbean.setAttribute("loginModuleConfiguration", props);
gbean.setReferencePatterns("ServerInfo",
Collections.singleton(serverInfo));
- kernel.loadGBean(testRealm, gbean);
+ kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer");
+ serverStub = new
ObjectName("geronimo.remoting:target=JaasLoginServiceRemotingServer");
+ gbean = new GBeanData(serverStub,
JaasLoginServiceRemotingServer.getGBeanInfo());
gbean.setAttribute("bindURI", new URI("tcp://0.0.0.0:4242"));
gbean.setReferencePattern("loginService", loginService);
- serverStub = new
ObjectName("geronimo.remoting:target=JaasLoginServiceRemotingServer");
- kernel.loadGBean(serverStub, gbean);
+ kernel.loadGBean(gbean,
JaasLoginServiceRemotingServer.class.getClassLoader());
kernel.startGBean(loginConfiguration);
kernel.startGBean(loginService);
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java
Tue Feb 22 21:07:36 2005
@@ -17,16 +17,16 @@
package org.apache.geronimo.security.jaas;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
import javax.management.ObjectName;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-import java.util.Properties;
-import java.util.Collections;
-import java.util.Set;
-import java.util.HashSet;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.security.AbstractTest;
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.RealmPrincipal;
@@ -56,16 +56,18 @@
public void setUp() throws Exception {
super.setUp();
- GBeanMBean gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.GeronimoLoginConfiguration");
+ GBeanData gbean;
+
loginConfiguration = new
ObjectName("geronimo.security:type=LoginConfiguration");
+ gbean = new GBeanData(loginConfiguration,
GeronimoLoginConfiguration.getGBeanInfo());
Set configurations = new HashSet();
configurations.add(new
ObjectName("geronimo.security:type=SecurityRealm,*"));
configurations.add(new
ObjectName("geronimo.security:type=ConfigurationEntry,*"));
gbean.setReferencePatterns("Configurations", configurations);
- kernel.loadGBean(loginConfiguration, gbean);
+ kernel.loadGBean(gbean,
GeronimoLoginConfiguration.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.LoginModuleGBean");
kerberosLM = new
ObjectName("geronimo.security:type=LoginModule,name=TOOLAZYDOGS.COM");
+ gbean = new GBeanData(kerberosLM, LoginModuleGBean.getGBeanInfo());
gbean.setAttribute("loginModuleClass",
"com.sun.security.auth.module.Krb5LoginModule");
gbean.setAttribute("serverSide", new Boolean(true)); // normally not,
but in this case, it's treated as server-side
Properties props = new Properties();
@@ -73,14 +75,14 @@
props.put("useTicketCache", "true");
props.put("doNotPrompt", "true");
gbean.setAttribute("options", props);
- kernel.loadGBean(kerberosLM, gbean);
+ kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.DirectConfigurationEntry");
kerberosCE = new
ObjectName("geronimo.security:type=ConfigurationEntry,jaasId=kerberos-foobar");
+ gbean = new GBeanData(kerberosCE,
DirectConfigurationEntry.getGBeanInfo());
gbean.setAttribute("applicationConfigName", "kerberos-foobar");
gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
gbean.setReferencePatterns("Module",
Collections.singleton(kerberosLM));
- kernel.loadGBean(kerberosCE, gbean);
+ kernel.loadGBean(gbean,
DirectConfigurationEntry.class.getClassLoader());
kernel.startGBean(loginConfiguration);
kernel.startGBean(kerberosLM);
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosTest.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosTest.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosTest.java
Tue Feb 22 21:07:36 2005
@@ -17,18 +17,19 @@
package org.apache.geronimo.security.jaas;
+import java.util.Properties;
import javax.management.ObjectName;
import javax.security.auth.Subject;
import javax.security.auth.kerberos.KerberosPrincipal;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-import java.util.Properties;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.security.AbstractTest;
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.IdentificationPrincipal;
import org.apache.geronimo.security.RealmPrincipal;
+import org.apache.geronimo.security.realm.GenericSecurityRealm;
/**
@@ -42,8 +43,8 @@
public void setUp() throws Exception {
super.setUp();
- GBeanMBean gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.LoginModuleGBean");
kerberosLM = new
ObjectName("geronimo.security:type=LoginModule,name=TOOLAZYDOGS.COM");
+ GBeanData gbean = new GBeanData(kerberosLM,
LoginModuleGBean.getGBeanInfo());
gbean.setAttribute("loginModuleClass",
"com.sun.security.auth.module.Krb5LoginModule");
gbean.setAttribute("serverSide", new Boolean(true)); // normally not,
but in this case, it's treated as server-side
Properties props = new Properties();
@@ -51,15 +52,15 @@
props.put("useTicketCache", "true");
props.put("doNotPrompt", "true");
gbean.setAttribute("options", props);
- kernel.loadGBean(kerberosLM, gbean);
+ kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.realm.GenericSecurityRealm");
kerberosRealm = new
ObjectName("geronimo.security:type=SecurityRealm,realm=TOOLAZYDOGS.COM");
+ gbean = new GBeanData(kerberosRealm,
GenericSecurityRealm.getGBeanInfo());
gbean.setAttribute("realmName", "TOOLAZYDOGS.COM");
props = new Properties();
props.setProperty("LoginModule.1.REQUIRED",
"geronimo.security:type=LoginModule,name=TOOLAZYDOGS.COM");
gbean.setAttribute("loginModuleConfiguration", props);
- kernel.loadGBean(kerberosRealm, gbean);
+ kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
kernel.startGBean(kerberosLM);
kernel.startGBean(kerberosRealm);
}
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
Tue Feb 22 21:07:36 2005
@@ -17,20 +17,21 @@
package org.apache.geronimo.security.jaas;
-import javax.management.ObjectName;
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginContext;
import java.io.File;
import java.util.Collections;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
+import javax.management.ObjectName;
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginContext;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.security.AbstractTest;
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.IdentificationPrincipal;
import org.apache.geronimo.security.RealmPrincipal;
+import org.apache.geronimo.security.realm.GenericSecurityRealm;
import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -49,24 +50,24 @@
public void setUp() throws Exception {
super.setUp();
- GBeanMBean gbean;
+ GBeanData gbean;
- gbean = new GBeanMBean(ServerInfo.GBEAN_INFO);
serverInfo = new ObjectName("geronimo.system:role=ServerInfo");
+ gbean = new GBeanData(serverInfo, ServerInfo.GBEAN_INFO);
gbean.setAttribute("baseDirectory", ".");
- kernel.loadGBean(serverInfo, gbean);
+ kernel.loadGBean(gbean, ServerInfo.class.getClassLoader());
kernel.startGBean(serverInfo);
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.GeronimoLoginConfiguration");
loginConfiguration = new
ObjectName("geronimo.security:type=LoginConfiguration");
+ gbean = new GBeanData(loginConfiguration,
GeronimoLoginConfiguration.getGBeanInfo());
Set configurations = new HashSet();
configurations.add(new
ObjectName("geronimo.security:type=SecurityRealm,*"));
configurations.add(new
ObjectName("geronimo.security:type=ConfigurationEntry,*"));
gbean.setReferencePatterns("Configurations", configurations);
- kernel.loadGBean(loginConfiguration, gbean);
+ kernel.loadGBean(gbean,
GeronimoLoginConfiguration.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.LoginModuleGBean");
clientLM = new
ObjectName("geronimo.security:type=LoginModule,name=properties-client");
+ gbean = new GBeanData(clientLM, LoginModuleGBean.getGBeanInfo());
gbean.setAttribute("loginModuleClass",
"org.apache.geronimo.security.jaas.JaasLoginCoordinator");
gbean.setAttribute("serverSide", new Boolean(false));
Properties props = new Properties();
@@ -74,17 +75,17 @@
props.put("port", "4242");
props.put("realm", "properties-realm");
gbean.setAttribute("options", props);
- kernel.loadGBean(clientLM, gbean);
+ kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.DirectConfigurationEntry");
clientCE = new
ObjectName("geronimo.security:type=ConfigurationEntry,jaasId=properties-client");
+ gbean = new GBeanData(clientCE,
DirectConfigurationEntry.getGBeanInfo());
gbean.setAttribute("applicationConfigName", "properties-client");
gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
gbean.setReferencePatterns("Module", Collections.singleton(clientLM));
- kernel.loadGBean(clientCE, gbean);
+ kernel.loadGBean(gbean,
DirectConfigurationEntry.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.LoginModuleGBean");
testCE = new
ObjectName("geronimo.security:type=LoginModule,name=properties");
+ gbean = new GBeanData(testCE, LoginModuleGBean.getGBeanInfo());
gbean.setAttribute("loginModuleClass",
"org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
gbean.setAttribute("serverSide", new Boolean(true));
props = new Properties();
@@ -92,16 +93,16 @@
props.put("groupsURI", new File(new File("."),
"src/test-data/data/groups.properties").toURI().toString());
gbean.setAttribute("options", props);
gbean.setAttribute("loginDomainName", "TestProperties");
- kernel.loadGBean(testCE, gbean);
+ kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.realm.GenericSecurityRealm");
testRealm = new
ObjectName("geronimo.security:type=SecurityRealm,realm=properties-realm");
+ gbean = new GBeanData(testRealm, GenericSecurityRealm.getGBeanInfo());
gbean.setAttribute("realmName", "properties-realm");
props = new Properties();
props.setProperty("LoginModule.1.REQUIRED",
"geronimo.security:type=LoginModule,name=properties");
gbean.setAttribute("loginModuleConfiguration", props);
gbean.setReferencePatterns("ServerInfo",
Collections.singleton(serverInfo));
- kernel.loadGBean(testRealm, gbean);
+ kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
kernel.startGBean(loginConfiguration);
kernel.startGBean(clientLM);
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java
Tue Feb 22 21:07:36 2005
@@ -21,18 +21,16 @@
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Properties;
-import java.util.Collections;
-import java.io.File;
import javax.management.ObjectName;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.security.AbstractTest;
+import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.IdentificationPrincipal;
import org.apache.geronimo.security.RealmPrincipal;
-import org.apache.geronimo.security.ContextManager;
-import org.apache.geronimo.kernel.management.State;
+import org.apache.geronimo.security.realm.GenericSecurityRealm;
/**
@@ -81,8 +79,8 @@
conn.close();
- GBeanMBean gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.LoginModuleGBean");
sqlModule = new
ObjectName("geronimo.security:type=LoginModule,name=sql");
+ GBeanData gbean = new GBeanData(sqlModule,
LoginModuleGBean.getGBeanInfo());
gbean.setAttribute("loginModuleClass",
"org.apache.geronimo.security.realm.providers.SQLLoginModule");
gbean.setAttribute("serverSide", new Boolean(true));
Properties props = new Properties();
@@ -94,16 +92,16 @@
props.put("groupSelect", "SELECT GroupName, UserName FROM Groups");
gbean.setAttribute("options", props);
gbean.setAttribute("loginDomainName", "SQLDomain");
- kernel.loadGBean(sqlModule, gbean);
+ kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
kernel.startGBean(sqlModule);
- gbean = new
GBeanMBean("org.apache.geronimo.security.realm.GenericSecurityRealm");
sqlRealm = new
ObjectName("geronimo.security:type=SecurityRealm,realm=sql-realm");
+ gbean = new GBeanData(sqlRealm, GenericSecurityRealm.getGBeanInfo());
gbean.setAttribute("realmName", "sql-realm");
props = new Properties();
props.setProperty("LoginModule.1.REQUIRED","geronimo.security:type=LoginModule,name=sql");
gbean.setAttribute("loginModuleConfiguration", props);
- kernel.loadGBean(sqlRealm, gbean);
+ kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
kernel.startGBean(sqlRealm);
}
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/MultipleLoginDomainTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/MultipleLoginDomainTest.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/MultipleLoginDomainTest.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/MultipleLoginDomainTest.java
Tue Feb 22 21:07:36 2005
@@ -18,13 +18,13 @@
import java.util.HashMap;
import java.util.Map;
-
import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
import junit.framework.TestCase;
+
import org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal;
/**
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
Tue Feb 22 21:07:36 2005
@@ -17,22 +17,24 @@
package org.apache.geronimo.security.jaas;
-import javax.management.ObjectName;
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginContext;
import java.io.File;
import java.net.URI;
import java.util.Collections;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
+import javax.management.ObjectName;
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginContext;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.security.AbstractTest;
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.IdentificationPrincipal;
import org.apache.geronimo.security.RealmPrincipal;
+import org.apache.geronimo.security.realm.GenericSecurityRealm;
+import
org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer;
import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -52,45 +54,45 @@
kernel = new Kernel("test.kernel");
kernel.boot();
- GBeanMBean gbean;
+ GBeanData gbean;
// Create all the parts
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.JaasLoginService");
loginService = new
ObjectName("geronimo.security:type=JaasLoginService");
+ gbean = new GBeanData(loginService, JaasLoginService.getGBeanInfo());
gbean.setReferencePatterns("Realms", Collections.singleton(new
ObjectName("geronimo.security:type=SecurityRealm,*")));
gbean.setAttribute("expiredLoginScanIntervalMillis", new Integer(50));
gbean.setAttribute("maxLoginDurationMillis", new Integer(1000));
gbean.setAttribute("algorithm", "HmacSHA1");
gbean.setAttribute("password", "secret");
- kernel.loadGBean(loginService, gbean);
+ kernel.loadGBean(gbean, JaasLoginService.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer");
+ serverStub = new
ObjectName("geronimo.remoting:target=JaasLoginServiceRemotingServer");
+ gbean = new GBeanData(serverStub,
JaasLoginServiceRemotingServer.getGBeanInfo());
gbean.setAttribute("bindURI", new URI("tcp://0.0.0.0:4242"));
gbean.setReferencePattern("loginService", loginService);
- serverStub = new
ObjectName("geronimo.remoting:target=JaasLoginServiceRemotingServer");
- kernel.loadGBean(serverStub, gbean);
+ kernel.loadGBean(gbean,
JaasLoginServiceRemotingServer.class.getClassLoader());
kernel.startGBean(loginService);
kernel.startGBean(serverStub);
- gbean = new GBeanMBean(ServerInfo.GBEAN_INFO);
serverInfo = new ObjectName("geronimo.system:role=ServerInfo");
+ gbean = new GBeanData(serverInfo, ServerInfo.GBEAN_INFO);
gbean.setAttribute("baseDirectory", ".");
- kernel.loadGBean(serverInfo, gbean);
+ kernel.loadGBean(gbean, ServerInfo.class.getClassLoader());
kernel.startGBean(serverInfo);
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.GeronimoLoginConfiguration");
loginConfiguration = new
ObjectName("geronimo.security:type=LoginConfiguration");
+ gbean = new GBeanData(loginConfiguration,
GeronimoLoginConfiguration.getGBeanInfo());
Set configurations = new HashSet();
configurations.add(new
ObjectName("geronimo.security:type=SecurityRealm,*"));
configurations.add(new
ObjectName("geronimo.security:type=ConfigurationEntry,*"));
gbean.setReferencePatterns("Configurations", configurations);
- kernel.loadGBean(loginConfiguration, gbean);
+ kernel.loadGBean(gbean,
GeronimoLoginConfiguration.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.LoginModuleGBean");
testCE = new
ObjectName("geronimo.security:type=LoginModule,name=properties");
+ gbean = new GBeanData(testCE, LoginModuleGBean.getGBeanInfo());
gbean.setAttribute("loginModuleClass",
"org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
gbean.setAttribute("serverSide", new Boolean(true));
Properties props = new Properties();
@@ -98,19 +100,19 @@
props.put("groupsURI", new File(new File("."),
"src/test-data/data/groups.properties").toURI().toString());
gbean.setAttribute("options", props);
gbean.setAttribute("loginDomainName", "PropertiesDomain");
- kernel.loadGBean(testCE, gbean);
+ kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.realm.GenericSecurityRealm");
testRealm = new
ObjectName("geronimo.security:type=SecurityRealm,realm=properties-realm");
+ gbean = new GBeanData(testRealm, GenericSecurityRealm.getGBeanInfo());
gbean.setAttribute("realmName", "properties-realm");
props = new Properties();
props.setProperty("LoginModule.1.REQUIRED","geronimo.security:type=LoginModule,name=properties");
gbean.setAttribute("loginModuleConfiguration", props);
gbean.setReferencePatterns("ServerInfo",
Collections.singleton(serverInfo));
- kernel.loadGBean(testRealm, gbean);
+ kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.LoginModuleGBean");
clientLM = new
ObjectName("geronimo.security:type=LoginModule,name=properties-client");
+ gbean = new GBeanData(clientLM, LoginModuleGBean.getGBeanInfo());
gbean.setAttribute("loginModuleClass",
"org.apache.geronimo.security.jaas.JaasLoginCoordinator");
gbean.setAttribute("serverSide", new Boolean(false));
props = new Properties();
@@ -118,14 +120,14 @@
props.put("port", "4242");
props.put("realm", "properties-realm");
gbean.setAttribute("options", props);
- kernel.loadGBean(clientLM, gbean);
+ kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.DirectConfigurationEntry");
clientCE = new
ObjectName("geronimo.security:type=ConfigurationEntry,jaasId=properties-client");
+ gbean = new GBeanData(clientCE,
DirectConfigurationEntry.getGBeanInfo());
gbean.setAttribute("applicationConfigName", "properties-client");
gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
gbean.setReferencePatterns("Module", Collections.singleton(clientLM));
- kernel.loadGBean(clientCE, gbean);
+ kernel.loadGBean(gbean,
DirectConfigurationEntry.class.getClassLoader());
kernel.startGBean(loginConfiguration);
kernel.startGBean(clientLM);
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactoryTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactoryTest.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactoryTest.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactoryTest.java
Tue Feb 22 21:07:36 2005
@@ -16,8 +16,6 @@
*/
package org.apache.geronimo.security.jacc;
-import javax.security.jacc.PolicyConfiguration;
-
import junit.framework.TestCase;
/**
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
Tue Feb 22 21:07:36 2005
@@ -24,12 +24,12 @@
import java.security.PrivilegedExceptionAction;
import java.util.Collections;
import java.util.Properties;
-
import javax.management.ObjectName;
import javax.security.auth.Subject;
import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginContext;
+import com.sun.security.auth.login.ConfigFile;
import org.activeio.AcceptListener;
import org.activeio.AsynchChannelServer;
import org.activeio.Channel;
@@ -45,14 +45,15 @@
import org.activeio.filter.PacketAggregatingAsynchChannel;
import org.activeio.net.SocketSynchChannelFactory;
import org.activeio.packet.ByteArrayPacket;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.security.AbstractTest;
+import org.apache.geronimo.security.jaas.LoginModuleGBean;
+import org.apache.geronimo.security.realm.GenericSecurityRealm;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import com.sun.security.auth.login.ConfigFile;
-
/**
* @version $Rev$ $Date$
@@ -112,16 +113,16 @@
public void setUp() throws Exception {
super.setUp();
- GBeanMBean gbean;
+ GBeanData gbean;
- gbean = new GBeanMBean(ServerInfo.GBEAN_INFO);
serverInfo = new ObjectName("geronimo.system:role=ServerInfo");
+ gbean = new GBeanData(serverInfo, ServerInfo.GBEAN_INFO);
gbean.setAttribute("baseDirectory", ".");
- kernel.loadGBean(serverInfo, gbean);
+ kernel.loadGBean(gbean, ServerInfo.class.getClassLoader());
kernel.startGBean(serverInfo);
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.LoginModuleGBean");
testCE = new
ObjectName("geronimo.security:type=LoginModule,name=properties");
+ gbean = new GBeanData(testCE, LoginModuleGBean.getGBeanInfo());
gbean.setAttribute("loginModuleClass",
"org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
gbean.setAttribute("serverSide", new Boolean(true));
Properties props = new Properties();
@@ -129,16 +130,16 @@
props.put("groupsURI", new File(new File("."),
"src/test-data/data/groups.properties").toURI().toString());
gbean.setAttribute("options", props);
gbean.setAttribute("loginDomainName", "PropertiesDomain");
- kernel.loadGBean(testCE, gbean);
+ kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.realm.GenericSecurityRealm");
testRealm = new
ObjectName("geronimo.security:type=SecurityRealm,realm=properties-realm");
+ gbean = new GBeanData(testRealm, GenericSecurityRealm.getGBeanInfo());
gbean.setAttribute("realmName", "properties-realm");
props = new Properties();
props.setProperty("LoginModule.1.REQUIRED","geronimo.security:type=LoginModule,name=properties");
gbean.setAttribute("loginModuleConfiguration", props);
gbean.setReferencePatterns("ServerInfo",
Collections.singleton(serverInfo));
- kernel.loadGBean(testRealm, gbean);
+ kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
kernel.startGBean(testCE);
kernel.startGBean(testRealm);
Modified:
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java?view=diff&r1=154956&r2=154957
==============================================================================
---
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
(original)
+++
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
Tue Feb 22 21:07:36 2005
@@ -32,11 +32,15 @@
import javax.security.auth.login.LoginContext;
import junit.framework.TestCase;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
+
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.security.IdentificationPrincipal;
import org.apache.geronimo.security.RealmPrincipal;
+import org.apache.geronimo.security.jaas.JaasLoginService;
import org.apache.geronimo.security.jaas.JaasLoginServiceMBean;
+import org.apache.geronimo.security.jaas.LoginModuleGBean;
+import org.apache.geronimo.security.realm.GenericSecurityRealm;
import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -83,49 +87,49 @@
kernel = new Kernel("test.kernel");
kernel.boot();
- GBeanMBean gbean;
+ GBeanData gbean;
// Create all the parts
- gbean = new GBeanMBean(ServerInfo.GBEAN_INFO);
serverInfo = new ObjectName("geronimo.system:role=ServerInfo");
+ gbean = new GBeanData(serverInfo, ServerInfo.GBEAN_INFO);
gbean.setAttribute("baseDirectory", ".");
- kernel.loadGBean(serverInfo, gbean);
+ kernel.loadGBean(gbean, ServerInfo.class.getClassLoader());
kernel.startGBean(serverInfo);
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.JaasLoginService");
loginService = new
ObjectName("geronimo.security:type=JaasLoginService");
+ gbean = new GBeanData(loginService, JaasLoginService.getGBeanInfo());
gbean.setReferencePatterns("Realms", Collections.singleton(new
ObjectName("geronimo.security:type=SecurityRealm,*")));
// gbean.setAttribute("reclaimPeriod", new Long(100));
gbean.setAttribute("algorithm", "HmacSHA1");
gbean.setAttribute("password", "secret");
- kernel.loadGBean(loginService, gbean);
+ kernel.loadGBean(gbean, JaasLoginService.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.jaas.LoginModuleGBean");
testCE = new
ObjectName("geronimo.security:type=LoginModule,name=properties");
+ gbean = new GBeanData(testCE, LoginModuleGBean.getGBeanInfo());
gbean.setAttribute("loginModuleClass",
"org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
gbean.setAttribute("serverSide", new Boolean(true));
Properties props = new Properties();
props.put("usersURI", new File(new File("."),
"src/test-data/data/users.properties").toString());
props.put("groupsURI", new File(new File("."),
"src/test-data/data/groups.properties").toString());
gbean.setAttribute("options", props);
- kernel.loadGBean(testCE, gbean);
+ kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.realm.GenericSecurityRealm");
testRealm = new
ObjectName("geronimo.security:type=SecurityRealm,realm=properties-realm");
+ gbean = new GBeanData(testRealm, GenericSecurityRealm.getGBeanInfo());
gbean.setAttribute("realmName", "properties-realm");
props = new Properties();
props.setProperty("LoginModule.1.REQUIRED","geronimo.security:type=LoginModule,name=properties");
gbean.setAttribute("loginModuleConfiguration", props);
gbean.setReferencePatterns("ServerInfo",
Collections.singleton(serverInfo));
- kernel.loadGBean(testRealm, gbean);
+ kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
- gbean = new
GBeanMBean("org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer");
+ serverStub = new
ObjectName("geronimo.remoting:target=JaasLoginServiceRemotingServer");
+ gbean = new GBeanData(serverStub,
JaasLoginServiceRemotingServer.getGBeanInfo());
gbean.setAttribute("bindURI", new URI("tcp://0.0.0.0:4242"));
gbean.setReferencePattern("loginService", loginService);
- serverStub = new
ObjectName("geronimo.remoting:target=JaasLoginServiceRemotingServer");
- kernel.loadGBean(serverStub, gbean);
+ kernel.loadGBean(gbean,
JaasLoginServiceRemotingServer.class.getClassLoader());
kernel.startGBean(loginService);
kernel.startGBean(testCE);
