[openejb-scm] openejb/modules/core/src/java/org/openejb EJBContainer.java GenericEJBContainer.java

[dblevins]

dblevins    2005/02/19 04:46:38

  Modified:    modules/core/src/java/org/openejb EJBContainer.java
                        GenericEJBContainer.java
  Log:

  Removed getProxyFactory from EJBContainer interface and all references to it.
  Fixed the WSContainer so it doesn't put instances of InvocationResult in the 
soap message.
  Fixed the invocation test in WSContainerTest.
  Slightly improved the ulgy EJBInvocationStream code.
  
  Revision  Changes    Path
  1.8       +2 -2      
openejb/modules/core/src/java/org/openejb/EJBContainer.java
  
  Index: EJBContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/EJBContainer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EJBContainer.java 30 Jul 2004 19:03:43 -0000      1.7
  +++ EJBContainer.java 19 Feb 2005 09:46:37 -0000      1.8
  @@ -128,7 +128,7 @@
   
       String[] getLocalJndiNames();
   
  -    EJBProxyFactory getProxyFactory();
  +    int getMethodIndex(Method method);
   
       ClassLoader getClassLoader();
   
  
  
  
  1.39      +4 -6      
openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java
  
  Index: GenericEJBContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- GenericEJBContainer.java  16 Feb 2005 22:03:17 -0000      1.38
  +++ GenericEJBContainer.java  19 Feb 2005 09:46:38 -0000      1.39
  @@ -315,8 +315,8 @@
           return defaultSubject;
       }
   
  -    public EJBProxyFactory getProxyFactory() {
  -        return proxyFactory;
  +    public int getMethodIndex(Method method) {
  +        return proxyFactory.getMethodIndex(method);
       }
   
       public InterfaceMethodSignature[] getSignatures() {
  @@ -473,7 +473,6 @@
           infoFactory.addAttribute("kernel", Kernel.class, false);
   
   
  -        infoFactory.addAttribute("proxyFactory", EJBProxyFactory.class, 
false);
           infoFactory.addAttribute("ejbHome", EJBHome.class, false);
           infoFactory.addAttribute("ejbLocalHome", EJBLocalHome.class, false);
           infoFactory.addAttribute("unmanagedReference", EJBContainer.class, 
false);
  @@ -483,6 +482,7 @@
   
           infoFactory.addAttribute("classLoader", ClassLoader.class, false);
   
  +        infoFactory.addOperation("getMethodIndex", new Class[] 
{Method.class});
           infoFactory.addOperation("getEJBObject", new Class[] {Object.class});
           infoFactory.addOperation("getEJBLocalObject", new Class[] 
{Object.class});
   
  @@ -490,8 +490,6 @@
           infoFactory.addOperation("invoke", new Class[]{Method.class, 
Object[].class, Object.class});
   
           infoFactory.addOperation("getTimerById", new Class[]{Long.class});
  -        //TODO this should be unnecessary, when WS stack gets included in 
the EJBContainer, remove this:
  -        infoFactory.addOperation("getProxyFactory");
   
           infoFactory.setConstructor(new String[]{
               "ContainerID",