User: d_jencks
  Date: 01/11/10 13:38:03

  Modified:    src/main/org/jboss/resource/security
                        ManyToOnePrincipalMapping.java
                        PrincipalMappingSupport.java
  Log:
  Changed mbean dependencies to work directly by mbean-references: eliminated depends 
tag from *service.xml files
  
  Revision  Changes    Path
  1.5       +14 -4     
jbosscx/src/main/org/jboss/resource/security/ManyToOnePrincipalMapping.java
  
  Index: ManyToOnePrincipalMapping.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbosscx/src/main/org/jboss/resource/security/ManyToOnePrincipalMapping.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ManyToOnePrincipalMapping.java    2001/08/21 03:27:20     1.4
  +++ ManyToOnePrincipalMapping.java    2001/11/10 21:38:03     1.5
  @@ -27,7 +27,7 @@
    *
    * @author     Toby Allsopp ([EMAIL PROTECTED])
    * @see        org.jboss.resource.ConnectionManagerImpl
  - * @version    $Revision: 1.4 $
  + * @version    $Revision: 1.5 $
    */
   public class ManyToOnePrincipalMapping
          extends PrincipalMappingSupport
  @@ -86,11 +86,21 @@
   
      protected void afterSetProperties()
      {
  -      userName = (String)properties.get("userName");
  -      password = (String)properties.get("password");
  +      userName = (String)properties.get("UserName");
  +      if (userName == null) 
  +      {
  +         userName = (String)properties.get("userName");      
  +      } // end of if ()
  +      
  +      password = (String)properties.get("UserPassword");
         if (password == null)
         {
  -         password = "";
  +         password = (String)properties.get("password");
  +         if (password == null) 
  +         {
  +            password = "";
  +         } // end of if ()
  +         
         }
   
         String principalName = (String)properties.get("principalName");
  
  
  
  1.5       +2 -1      
jbosscx/src/main/org/jboss/resource/security/PrincipalMappingSupport.java
  
  Index: PrincipalMappingSupport.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbosscx/src/main/org/jboss/resource/security/PrincipalMappingSupport.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PrincipalMappingSupport.java      2001/09/11 18:38:58     1.4
  +++ PrincipalMappingSupport.java      2001/11/10 21:38:03     1.5
  @@ -25,7 +25,7 @@
    *
    * @author     Toby Allsopp ([EMAIL PROTECTED])
    * @author     <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
  - * @version    $Revision: 1.4 $
  + * @version    $Revision: 1.5 $
    */
   public abstract class PrincipalMappingSupport
          implements PrincipalMapping
  @@ -96,6 +96,7 @@
            category.error("Couldn't convert properties string '" + propStr + "' to " +
                  "Properties", ioe);
         }
  +      category.info("PrincipalMapping properties set to: " + properties);
         afterSetProperties();
      }
   
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to