You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2001/09/27 16:57:10 UTC

cvs commit: xml-axis/java/src/org/apache/axis/providers/java EJBProvider.java

gdaniels    01/09/27 07:57:10

  Modified:    java/src/org/apache/axis/providers/java EJBProvider.java
  Log:
  Use username + password from the MessageContext if not found in
  our deployment configuration.
  
  Revision  Changes    Path
  1.3       +20 -4     xml-axis/java/src/org/apache/axis/providers/java/EJBProvider.java
  
  Index: EJBProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/providers/java/EJBProvider.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EJBProvider.java	2001/08/29 14:17:17	1.2
  +++ EJBProvider.java	2001/09/27 14:57:10	1.3
  @@ -73,7 +73,7 @@
    *
    * @author Carl Woolf (cwoolf@macromedia.com)
    */
  -public class EJBProvider extends RPCProvider 
  +public class EJBProvider extends RPCProvider
   {
       private static final String beanNameOption = "beanJndiName";
       private static final String allowedMethodsOption = "allowedMethods";
  @@ -105,6 +105,22 @@
                                                      serviceHandler);
               String password = (String)getStrOption(jndiPassword,
                                                      serviceHandler);
  +
  +            if (null == username)
  +            {
  +                username =
  +                    msgContext.getStrProp( MessageContext.USERID );
  +                password =
  +                    msgContext.getStrProp( MessageContext.PASSWORD );
  +            }
  +            if (null == username)
  +            {
  +                throw new IllegalArgumentException("Null user in EJBProvider");
  +            }
  +
  +            if (password == null)
  +                password = "";
  +
               String factoryClass = (String)getStrOption(jndiContextClass,
                                                          serviceHandler);
               String contextUrl = (String)getStrOption(jndiURL,
  @@ -142,10 +158,10 @@
           Class homeClass = home.getClass();
           Class params[] = new Class[0];
           Method createMethod = homeClass.getMethod("create", params);
  -        
  +
           Object args[] = new Object[0];
           Object result = createMethod.invoke(home, args);
  -        
  +
           return result;
       }
   
  @@ -177,7 +193,7 @@
       {
           return allowedMethodsOption;
       }
  -    
  +
       /**
        * Get a String option by looking first in the service options,
        * and then at the Handler's options.  This allows defaults to be