geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r602089 - in /geronimo/server: branches/2.0/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/realm/ branches/2.0/configs/client-security/src/plan/ branches/2.0/modules/geronimo-j2ee-sc...
Date Fri, 07 Dec 2007 13:03:45 GMT
Author: vamsic007
Date: Fri Dec  7 05:03:43 2007
New Revision: 602089

URL: http://svn.apache.org/viewvc?rev=602089&view=rev
Log:
GERONIMO-3654 Moving o.a.g.s.jaas.NamedUPCredentailLoginModule to o.a.g.s.realm.providers
 o Copied o.a.g.s.jaas.NamedUPCredentailLoginModule to o.a.g.s.realm.providers.NamedUsernamePasswordCredentialLoginModule
 o Marked NamedUPCredentialLoginModule as deprecated
 o Changed all references from o.a.g.s.jaas.NamedUPCredentialLoginModule to o.a.g.s.realm.providers.NamedUsernamePasswordCredentialLoginModule

Added:
    geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/NamedUsernamePasswordCredentialLoginModule.java
      - copied, changed from r602059, geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/NamedUsernamePasswordCredentialLoginModule.java
      - copied, changed from r602073, geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java
Modified:
    geronimo/server/branches/2.0/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
    geronimo/server/branches/2.0/configs/client-security/src/plan/plan.xml
    geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-post.xml
    geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-pre.xml
    geronimo/server/branches/2.0/modules/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java
    geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java
    geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java
    geronimo/server/branches/2.0/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginNamedUPCredentialTest.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginNamedUPCredentialTest.java
    geronimo/server/trunk/plugins/client/client-security/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-post.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-pre.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java

Modified: geronimo/server/branches/2.0/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/branches/2.0/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
(original)
+++ geronimo/server/branches/2.0/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
Fri Dec  7 05:03:43 2007
@@ -93,7 +93,7 @@
 import org.apache.geronimo.security.jaas.LoginModuleControlFlag;
 import org.apache.geronimo.security.jaas.LoginModuleControlFlagEditor;
 import org.apache.geronimo.security.jaas.LoginModuleSettings;
-import org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule;
+import org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule;
 import org.apache.geronimo.security.realm.SecurityRealm;
 import org.apache.geronimo.security.realm.providers.FileAuditLoginModule;
 import org.apache.geronimo.security.realm.providers.GeronimoPasswordCredentialLoginModule;
@@ -780,11 +780,11 @@
             }
             if (data.getCredentialName() != null) {
                 module = new LoginModuleDetails();
-                module.setClassName(NamedUPCredentialLoginModule.class.getName());
+                module.setClassName(NamedUsernamePasswordCredentialLoginModule.class.getName());
                 module.setControlFlag(LoginModuleControlFlag.OPTIONAL);
                 module.setLoginDomainName(data.getName() + "-NamedUPC");
                 props = module.getOptions();
-                props.put(NamedUPCredentialLoginModule.CREDENTIAL_NAME, data.getCredentialName());
+                props.put(NamedUsernamePasswordCredentialLoginModule.CREDENTIAL_NAME, data.getCredentialName());
                 list.add(module);
             }
         } else {

Modified: geronimo/server/branches/2.0/configs/client-security/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/client-security/src/plan/plan.xml?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/branches/2.0/configs/client-security/src/plan/plan.xml (original)
+++ geronimo/server/branches/2.0/configs/client-security/src/plan/plan.xml Fri Dec  7 05:03:43
2007
@@ -59,8 +59,8 @@
                 </lc:login-module>
                 <lc:login-module control-flag="REQUIRED" server-side="true" wrap-principals="true">
                     <lc:login-domain-name>default</lc:login-domain-name>
-                    <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>
-                    <lc:option name="org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name">default</lc:option>
+                    <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>
+                    <lc:option name="org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name">default</lc:option>
                 </lc:login-module>
             </lc:login-config>
         </xml-reference>

Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-post.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-post.xml?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-post.xml
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-post.xml
Fri Dec  7 05:03:43 2007
@@ -16,6 +16,8 @@
    limitations under the License.
 -->
 
+<!-- $Rev$ $Date$ -->
+
 <gbean name="client-properties-realm"
     class="org.apache.geronimo.security.realm.GenericSecurityRealm" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <attribute name="realmName">client-properties-realm</attribute>
@@ -29,8 +31,8 @@
             </lc:login-module>
             <lc:login-module control-flag="REQUIRED" server-side="true">
                 <lc:login-domain-name>default</lc:login-domain-name>
-                <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>
-                <lc:option name="org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name">default</lc:option>
+                <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>
+                <lc:option name="org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name">default</lc:option>
             </lc:login-module>
         </lc:login-config>
     </xml-reference>

Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-pre.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-pre.xml?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-pre.xml
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-pre.xml
Fri Dec  7 05:03:43 2007
@@ -16,6 +16,8 @@
    limitations under the License.
 -->
 
+<!-- $Rev$ $Date$ -->
+
 <gbean name="client-properties-realm"
     class="org.apache.geronimo.security.realm.GenericSecurityRealm">
     <attribute name="realmName">client-properties-realm</attribute>
@@ -29,8 +31,8 @@
             </lc:login-module>
             <lc:login-module control-flag="REQUIRED" server-side="true">
                 <lc:login-domain-name>default</lc:login-domain-name>
-                <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>
-                <lc:option name="org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name">default</lc:option>
+                <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>
+                <lc:option name="org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name">default</lc:option>
             </lc:login-module>
         </lc:login-config>
     </xml-reference>

Modified: geronimo/server/branches/2.0/modules/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java
Fri Dec  7 05:03:43 2007
@@ -54,7 +54,7 @@
 import org.apache.xmlbeans.XmlException;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class LoginConfigBuilderTest extends TestCase {
     //2.0 namespace, with server-side
@@ -67,8 +67,8 @@
             "                </lc:login-module>\n" +
             "                <lc:login-module control-flag=\"REQUIRED\" server-side=\"true\"
wrap-principals=\"true\">\n" +
             "                    <lc:login-domain-name>default</lc:login-domain-name>\n"
+
-            "                    <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>\n"
+
-            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name\">default</lc:option>\n"
+
+            "                    <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>\n"
+
+            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name\">default</lc:option>\n"
+
             "                </lc:login-module>\n" +
             "            </lc:login-config>";
     //1.2 namespace, with server-side
@@ -81,8 +81,8 @@
             "                </lc:login-module>\n" +
             "                <lc:login-module control-flag=\"REQUIRED\" server-side=\"true\"
wrap-principals=\"true\">\n" +
             "                    <lc:login-domain-name>default</lc:login-domain-name>\n"
+
-            "                    <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>\n"
+
-            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name\">default</lc:option>\n"
+
+            "                    <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>\n"
+
+            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name\">default</lc:option>\n"
+
             "                </lc:login-module>\n" +
             "            </lc:login-config>";
     //2.0 namespace, without server-side
@@ -95,8 +95,8 @@
             "                </lc:login-module>\n" +
             "                <lc:login-module control-flag=\"REQUIRED\" wrap-principals=\"true\">\n"
+
             "                    <lc:login-domain-name>default</lc:login-domain-name>\n"
+
-            "                    <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>\n"
+
-            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name\">default</lc:option>\n"
+
+            "                    <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>\n"
+
+            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name\">default</lc:option>\n"
+
             "                </lc:login-module>\n" +
             "            </lc:login-config>";
     //2.0 namespace, without server-side, with login-module-ref
@@ -106,8 +106,8 @@
             "                </lc:login-module-ref>\n" +
             "                <lc:login-module control-flag=\"REQUIRED\" wrap-principals=\"true\">\n"
+
             "                    <lc:login-domain-name>default</lc:login-domain-name>\n"
+
-            "                    <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>\n"
+
-            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name\">default</lc:option>\n"
+
+            "                    <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>\n"
+
+            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name\">default</lc:option>\n"
+
             "                </lc:login-module>\n" +
             "            </lc:login-config>";
 

Modified: geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java
Fri Dec  7 05:03:43 2007
@@ -37,7 +37,7 @@
  *
  * Note that this places passwords to external services in configuration information.  It
may be more appropriate
  * to use the GeronimoPropertiesFileMappedPasswordCredentialLoginModule or a run-as subject
with a
- * NamedUPCredentialLoginModule although the latter solution may put a credential in a
+ * NamedUsernamePasswordCredentialLoginModule although the latter solution may put a credential
in a
  * credential store configuration.
  *
  * This login module does not check credentials so it should never be able to cause a login
to succeed.

Modified: geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java
Fri Dec  7 05:03:43 2007
@@ -44,9 +44,13 @@
  *
  * This login module does not check credentials so it should never be able to cause a login
to succeed.
  * Therefore the lifecycle methods must return false to indicate success or throw a LoginException
to indicate failure.
+ * 
+ * @deprecated As of release 2.0.3
+ * @see org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule
  *
  * @version $Revision$ $Date$
  */
+@Deprecated
 public class NamedUPCredentialLoginModule implements LoginModule {
     private static Log log = LogFactory.getLog(NamedUPCredentialLoginModule.class);
 

Copied: geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/NamedUsernamePasswordCredentialLoginModule.java
(from r602059, geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/NamedUsernamePasswordCredentialLoginModule.java?p2=geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/NamedUsernamePasswordCredentialLoginModule.java&p1=geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java&r1=602059&r2=602089&rev=602089&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/NamedUsernamePasswordCredentialLoginModule.java
Fri Dec  7 05:03:43 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.security.jaas;
+package org.apache.geronimo.security.realm.providers;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -34,6 +34,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
+import org.apache.geronimo.security.jaas.NamedUsernamePasswordCredential;
+import org.apache.geronimo.security.jaas.WrappingLoginModule;
 
 
 /**
@@ -47,10 +50,10 @@
  *
  * @version $Revision$ $Date$
  */
-public class NamedUPCredentialLoginModule implements LoginModule {
-    private static Log log = LogFactory.getLog(NamedUPCredentialLoginModule.class);
+public class NamedUsernamePasswordCredentialLoginModule implements LoginModule {
+    private static Log log = LogFactory.getLog(NamedUsernamePasswordCredentialLoginModule.class);
 
-    public static final String CREDENTIAL_NAME = "org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name";
+    public static final String CREDENTIAL_NAME = "org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name";
     public final static List<String> supportedOptions = Collections.unmodifiableList(Arrays.asList(CREDENTIAL_NAME));
 
     private String name;

Modified: geronimo/server/branches/2.0/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginNamedUPCredentialTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginNamedUPCredentialTest.java?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginNamedUPCredentialTest.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginNamedUPCredentialTest.java
Fri Dec  7 05:03:43 2007
@@ -26,6 +26,7 @@
 
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.security.ContextManager;
+import org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule;
 
 /**
  * @version $Rev$ $Date$
@@ -37,12 +38,12 @@
 
     protected GBeanData setupTestLoginModule() throws MalformedObjectNameException {
         GBeanData gbean;
-        gbean = buildGBeanData("name", "NamedUPCredentialLoginModule", LoginModuleGBean.getGBeanInfo());
-        gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule");
+        gbean = buildGBeanData("name", "NamedUsernamePasswordCredentialLoginModule", LoginModuleGBean.getGBeanInfo());
+        gbean.setAttribute("loginModuleClass", NamedUsernamePasswordCredentialLoginModule.class.getName());
         Map<String, Object> props = new HashMap<String, Object>();
-        props.put(NamedUPCredentialLoginModule.CREDENTIAL_NAME, credname);
+        props.put(NamedUsernamePasswordCredentialLoginModule.CREDENTIAL_NAME, credname);
         gbean.setAttribute("options", props);
-        gbean.setAttribute("loginDomainName", "NamedUPCredentialLoginModule");
+        gbean.setAttribute("loginDomainName", "NamedUsernamePasswordCredentialLoginModule");
         gbean.setAttribute("wrapPrincipals", Boolean.FALSE);
         return gbean;
     }

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java
Fri Dec  7 05:03:43 2007
@@ -37,7 +37,7 @@
  *
  * Note that this places passwords to external services in configuration information.  It
may be more appropriate
  * to use the GeronimoPropertiesFileMappedPasswordCredentialLoginModule or a run-as subject
with a
- * NamedUPCredentialLoginModule although the latter solution may put a credential in a
+ * NamedUsernamePasswordCredentialLoginModule although the latter solution may put a credential
in a
  * credential store configuration.
  *
  * This login module does not check credentials so it should never be able to cause a login
to succeed.

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java
Fri Dec  7 05:03:43 2007
@@ -44,9 +44,13 @@
  *
  * This login module does not check credentials so it should never be able to cause a login
to succeed.
  * Therefore the lifecycle methods must return false to indicate success or throw a LoginException
to indicate failure.
+ * 
+ * @deprecated As of release 2.0.3
+ * @see org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule
  *
  * @version $Revision$ $Date$
  */
+@Deprecated
 public class NamedUPCredentialLoginModule implements LoginModule {
     private static Log log = LogFactory.getLog(NamedUPCredentialLoginModule.class);
 

Copied: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/NamedUsernamePasswordCredentialLoginModule.java
(from r602073, geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/NamedUsernamePasswordCredentialLoginModule.java?p2=geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/NamedUsernamePasswordCredentialLoginModule.java&p1=geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java&r1=602073&r2=602089&rev=602089&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/NamedUsernamePasswordCredentialLoginModule.java
Fri Dec  7 05:03:43 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.security.jaas;
+package org.apache.geronimo.security.realm.providers;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -34,6 +34,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
+import org.apache.geronimo.security.jaas.NamedUsernamePasswordCredential;
+import org.apache.geronimo.security.jaas.WrappingLoginModule;
 
 
 /**
@@ -47,10 +50,10 @@
  *
  * @version $Revision$ $Date$
  */
-public class NamedUPCredentialLoginModule implements LoginModule {
-    private static Log log = LogFactory.getLog(NamedUPCredentialLoginModule.class);
+public class NamedUsernamePasswordCredentialLoginModule implements LoginModule {
+    private static Log log = LogFactory.getLog(NamedUsernamePasswordCredentialLoginModule.class);
 
-    public static final String CREDENTIAL_NAME = "org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name";
+    public static final String CREDENTIAL_NAME = "org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name";
     public final static List<String> supportedOptions = Collections.unmodifiableList(Arrays.asList(CREDENTIAL_NAME));
 
     private String name;

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginNamedUPCredentialTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginNamedUPCredentialTest.java?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginNamedUPCredentialTest.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginNamedUPCredentialTest.java
Fri Dec  7 05:03:43 2007
@@ -26,6 +26,7 @@
 
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.security.ContextManager;
+import org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule;
 
 /**
  * @version $Rev$ $Date$
@@ -37,12 +38,12 @@
 
     protected GBeanData setupTestLoginModule() throws MalformedObjectNameException {
         GBeanData gbean;
-        gbean = buildGBeanData("name", "NamedUPCredentialLoginModule", LoginModuleGBean.getGBeanInfo());
-        gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule");
+        gbean = buildGBeanData("name", "NamedUsernamePasswordCredentialLoginModule", LoginModuleGBean.getGBeanInfo());
+        gbean.setAttribute("loginModuleClass", NamedUsernamePasswordCredentialLoginModule.class.getName());
         Map<String, Object> props = new HashMap<String, Object>();
-        props.put(NamedUPCredentialLoginModule.CREDENTIAL_NAME, credname);
+        props.put(NamedUsernamePasswordCredentialLoginModule.CREDENTIAL_NAME, credname);
         gbean.setAttribute("options", props);
-        gbean.setAttribute("loginDomainName", "NamedUPCredentialLoginModule");
+        gbean.setAttribute("loginDomainName", "NamedUsernamePasswordCredentialLoginModule");
         gbean.setAttribute("wrapPrincipals", Boolean.FALSE);
         return gbean;
     }

Modified: geronimo/server/trunk/plugins/client/client-security/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-security/src/main/plan/plan.xml?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-security/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/client/client-security/src/main/plan/plan.xml Fri Dec  7
05:03:43 2007
@@ -59,8 +59,8 @@
                 </lc:login-module>
                 <lc:login-module control-flag="REQUIRED" server-side="true" wrap-principals="true">
                     <lc:login-domain-name>default</lc:login-domain-name>
-                    <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>
-                    <lc:option name="org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name">default</lc:option>
+                    <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>
+                    <lc:option name="org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name">default</lc:option>
                 </lc:login-module>
             </lc:login-config>
         </xml-reference>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
Fri Dec  7 05:03:43 2007
@@ -92,12 +92,12 @@
 import org.apache.geronimo.security.jaas.JaasLoginModuleChain;
 import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
 import org.apache.geronimo.security.jaas.LoginModuleSettings;
-import org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule;
 import org.apache.geronimo.security.jaas.LoginModuleControlFlag;
 import org.apache.geronimo.security.jaas.LoginModuleControlFlagEditor;
 import org.apache.geronimo.security.realm.SecurityRealm;
 import org.apache.geronimo.security.realm.providers.FileAuditLoginModule;
 import org.apache.geronimo.security.realm.providers.GeronimoPasswordCredentialLoginModule;
+import org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule;
 import org.apache.geronimo.security.realm.providers.RepeatedFailureLockoutLoginModule;
 import org.apache.geronimo.xbeans.geronimo.loginconfig.GerControlFlagType;
 import org.apache.geronimo.xbeans.geronimo.loginconfig.GerLoginConfigDocument;
@@ -778,11 +778,11 @@
             }
             if (data.getCredentialName() != null) {
                 module = new LoginModuleDetails();
-                module.setClassName(NamedUPCredentialLoginModule.class.getName());
+                module.setClassName(NamedUsernamePasswordCredentialLoginModule.class.getName());
                 module.setControlFlag(LoginModuleControlFlag.OPTIONAL);
                 module.setLoginDomainName(data.getName() + "-NamedUPC");
                 props = module.getOptions();
-                props.put(NamedUPCredentialLoginModule.CREDENTIAL_NAME, data.getCredentialName());
+                props.put(NamedUsernamePasswordCredentialLoginModule.CREDENTIAL_NAME, data.getCredentialName());
                 list.add(module);
             }
         } else {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-post.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-post.xml?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-post.xml
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-post.xml
Fri Dec  7 05:03:43 2007
@@ -16,6 +16,8 @@
    limitations under the License.
 -->
 
+<!-- $Rev$ $Date$ -->
+
 <gbean name="client-properties-realm"
     class="org.apache.geronimo.security.realm.GenericSecurityRealm" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <attribute name="realmName">client-properties-realm</attribute>
@@ -29,8 +31,8 @@
             </lc:login-module>
             <lc:login-module control-flag="REQUIRED" server-side="true">
                 <lc:login-domain-name>default</lc:login-domain-name>
-                <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>
-                <lc:option name="org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name">default</lc:option>
+                <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>
+                <lc:option name="org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name">default</lc:option>
             </lc:login-module>
         </lc:login-config>
     </xml-reference>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-pre.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-pre.xml?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-pre.xml
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/gbean-pre.xml
Fri Dec  7 05:03:43 2007
@@ -16,6 +16,8 @@
    limitations under the License.
 -->
 
+<!-- $Rev$ $Date$ -->
+
 <gbean name="client-properties-realm"
     class="org.apache.geronimo.security.realm.GenericSecurityRealm">
     <attribute name="realmName">client-properties-realm</attribute>
@@ -29,8 +31,8 @@
             </lc:login-module>
             <lc:login-module control-flag="REQUIRED" server-side="true">
                 <lc:login-domain-name>default</lc:login-domain-name>
-                <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>
-                <lc:option name="org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name">default</lc:option>
+                <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>
+                <lc:option name="org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name">default</lc:option>
             </lc:login-module>
         </lc:login-config>
     </xml-reference>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java?rev=602089&r1=602088&r2=602089&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java
Fri Dec  7 05:03:43 2007
@@ -69,8 +69,8 @@
             "                </lc:login-module>\n" +
             "                <lc:login-module control-flag=\"REQUIRED\" server-side=\"true\"
wrap-principals=\"true\">\n" +
             "                    <lc:login-domain-name>default</lc:login-domain-name>\n"
+
-            "                    <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>\n"
+
-            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name\">default</lc:option>\n"
+
+            "                    <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>\n"
+
+            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name\">default</lc:option>\n"
+
             "                </lc:login-module>\n" +
             "            </lc:login-config>";
     //1.2 namespace, with server-side
@@ -83,8 +83,8 @@
             "                </lc:login-module>\n" +
             "                <lc:login-module control-flag=\"REQUIRED\" server-side=\"true\"
wrap-principals=\"true\">\n" +
             "                    <lc:login-domain-name>default</lc:login-domain-name>\n"
+
-            "                    <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>\n"
+
-            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name\">default</lc:option>\n"
+
+            "                    <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>\n"
+
+            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name\">default</lc:option>\n"
+
             "                </lc:login-module>\n" +
             "            </lc:login-config>";
     //2.0 namespace, without server-side
@@ -97,8 +97,8 @@
             "                </lc:login-module>\n" +
             "                <lc:login-module control-flag=\"REQUIRED\" wrap-principals=\"true\">\n"
+
             "                    <lc:login-domain-name>default</lc:login-domain-name>\n"
+
-            "                    <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>\n"
+
-            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name\">default</lc:option>\n"
+
+            "                    <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>\n"
+
+            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name\">default</lc:option>\n"
+
             "                </lc:login-module>\n" +
             "            </lc:login-config>";
     //2.0 namespace, without server-side, with login-module-ref
@@ -108,8 +108,8 @@
             "                </lc:login-module-ref>\n" +
             "                <lc:login-module control-flag=\"REQUIRED\" wrap-principals=\"true\">\n"
+
             "                    <lc:login-domain-name>default</lc:login-domain-name>\n"
+
-            "                    <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>\n"
+
-            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name\">default</lc:option>\n"
+
+            "                    <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>\n"
+
+            "                    <lc:option name=\"org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name\">default</lc:option>\n"
+
             "                </lc:login-module>\n" +
             "            </lc:login-config>";
 



Mime
View raw message