axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdani...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/providers/java EJBProvider.java
Date Thu, 01 Aug 2002 20:14:33 GMT
gdaniels    2002/08/01 13:14:33

  Modified:    java/src/org/apache/axis/providers/java EJBProvider.java
  Log:
  Someone (hi Tom!) forgot to rebuild clean....
  
  Revision  Changes    Path
  1.28      +47 -44    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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- EJBProvider.java	29 Jul 2002 15:38:09 -0000	1.27
  +++ EJBProvider.java	1 Aug 2002 20:14:33 -0000	1.28
  @@ -58,7 +58,6 @@
   import org.apache.commons.logging.Log;
   
   import org.apache.axis.AxisFault;
  -import org.apache.axis.AxisProperties;
   import org.apache.axis.Constants;
   import org.apache.axis.Handler;
   import org.apache.axis.MessageContext;
  @@ -189,7 +188,7 @@
        * @return the class info of the EJB remote interface
        */ 
       protected Class getServiceClass(MessageContext msgContext, String beanJndiName)
  -        throws Exception 
  +        throws AxisFault
       {
           Handler serviceHandler = msgContext.getService();
           Class interfaceClass = null;
  @@ -197,49 +196,53 @@
           // First try to get the interface class from the configuation
           String remoteName = 
                   (String) getStrOption(OPTION_REMOTEINTERFACENAME, serviceHandler);
  -        if(remoteName != null){
  -            interfaceClass = ClassUtils.forName(remoteName, true, msgContext.getClassLoader());
  +        try {
  +            if(remoteName != null){
  +                interfaceClass = ClassUtils.forName(remoteName, true, msgContext.getClassLoader());
  +            }
  +            else
  +            {
  +                // Get the EJB Home object from JNDI
  +                Object ejbHome = getEJBHome(msgContext, beanJndiName);
  +
  +                String homeName = (String) getStrOption(OPTION_HOMEINTERFACENAME,
  +                                                        serviceHandler);
  +                if (homeName == null)
  +                    throw new AxisFault(
  +                            JavaUtils.getMessage("noOption00",
  +                                                 OPTION_HOMEINTERFACENAME,
  +                                                 msgContext.getTargetService()));
  +
  +                // Load the Home class name given in the config file
  +                Class homeClass = ClassUtils.forName(homeName, true, msgContext.getClassLoader());
  +
  +                // Make sure the object we got back from JNDI is the same type
  +                // as the what is specified in the config file
  +                Object ehome = javax.rmi.PortableRemoteObject.narrow(ejbHome, homeClass);
  +
  +                // This code requires the use of ejb.jar, so we do the stuff below
  +                //   EJBHome ejbHome = (EJBHome) ehome;
  +                //   EJBMetaData meta = ejbHome.getEJBMetaData();
  +                //   Class interfaceClass = meta.getRemoteInterfaceClass();
  +
  +                // Invoke the getEJBMetaData method of the ejbHome class without
  +                // actually touching any EJB classes (i.e. no cast to EJBHome)
  +                Method getEJBMetaData =
  +                        homeClass.getMethod("getEJBMetaData", empty_class_array);
  +                Object metaData =
  +                        getEJBMetaData.invoke(ehome, empty_object_array);
  +                Method getRemoteInterfaceClass =
  +                        metaData.getClass().getMethod("getRemoteInterfaceClass",
  +                                                      empty_class_array);
  +                interfaceClass =
  +                        (Class) getRemoteInterfaceClass.invoke(metaData,
  +                                                               empty_object_array);
  +            }
  +        } catch (Exception e) {
  +            throw AxisFault.makeFault(e);
           }
  -        else
  -        {
  -            // Get the EJB Home object from JNDI
  -            Object ejbHome = getEJBHome(msgContext, beanJndiName);
  -            
  -            String homeName = (String) getStrOption(OPTION_HOMEINTERFACENAME, 
  -                                                    serviceHandler);
  -            if (homeName == null) 
  -                throw new AxisFault(
  -                        JavaUtils.getMessage("noOption00", 
  -                                             OPTION_HOMEINTERFACENAME, 
  -                                             msgContext.getTargetService()));
  -            
  -            // Load the Home class name given in the config file
  -            Class homeClass = ClassUtils.forName(homeName, true, msgContext.getClassLoader());
  -            
  -            // Make sure the object we got back from JNDI is the same type
  -            // as the what is specified in the config file
  -            Object ehome = javax.rmi.PortableRemoteObject.narrow(ejbHome, homeClass);
  -            
  -            // This code requires the use of ejb.jar, so we do the stuff below
  -            //   EJBHome ejbHome = (EJBHome) ehome;
  -            //   EJBMetaData meta = ejbHome.getEJBMetaData();
  -            //   Class interfaceClass = meta.getRemoteInterfaceClass();
  -            
  -            // Invoke the getEJBMetaData method of the ejbHome class without 
  -            // actually touching any EJB classes (i.e. no cast to EJBHome)
  -            Method getEJBMetaData = 
  -                    homeClass.getMethod("getEJBMetaData", empty_class_array);
  -            Object metaData = 
  -                    getEJBMetaData.invoke(ehome, empty_object_array);
  -            Method getRemoteInterfaceClass = 
  -                    metaData.getClass().getMethod("getRemoteInterfaceClass", 
  -                                                  empty_class_array);
  -            interfaceClass = 
  -                    (Class) getRemoteInterfaceClass.invoke(metaData, 
  -                                                           empty_object_array);
  -        }
  -            
  -       // got it, return it
  +
  +        // got it, return it
          return interfaceClass;
           
       }
  
  
  

Mime
View raw message