[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb/plugins/jrmp/server JRMPContainerInvoker.java

[Chris K. <ki...@us...>]

  User: kimptoc 
  Date: 01/09/01 12:50:31

  Modified:    src/main/org/jboss/ejb/plugins/jrmp/server
                        JRMPContainerInvoker.java
  Log:
  remove deprecated logging import, where possible, otherwise comment as needing replacement with log4j.... must find out how it is use.... would be good if the deprecation message pointed to an example to use...
  
  Revision  Changes    Path
  1.42      +13 -12    jboss/src/main/org/jboss/ejb/plugins/jrmp/server/JRMPContainerInvoker.java
  
  Index: JRMPContainerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jrmp/server/JRMPContainerInvoker.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- JRMPContainerInvoker.java	2001/08/03 17:15:50	1.41
  +++ JRMPContainerInvoker.java	2001/09/01 19:50:31	1.42
  @@ -48,6 +48,7 @@
   
   import org.jboss.security.SecurityAssociation;
   
  +// TODO this needs to be replaced with the log4j logging
   import org.jboss.logging.Logger;
   
   import org.jboss.ejb.DeploymentException;
  @@ -68,7 +69,7 @@
    *  @author <a href="mailto:jpl...@cc...">Juha Lindfors</a>
    *  @author <a href="mailto:os...@sp...">Ole Husgaard</a>
    *  @author <a href="mailto:Sco...@jb...">Scott Stark</a>
  - *  @version $Revision: 1.41 $
  + *  @version $Revision: 1.42 $
    */
   public class JRMPContainerInvoker
      extends RemoteServer
  @@ -102,7 +103,7 @@
   
      protected Map beanMethodInvokerMap;
      protected Map homeMethodInvokerMap;
  -   
  +
      protected ContainerInvoker ciDelegate; // Delegate depending on JDK version
   
      // Static --------------------------------------------------------
  @@ -116,7 +117,7 @@
      public void setOptimized(boolean optimize)
      {
         this.optimize = optimize;
  -      //DEBUG		Logger.debug("Container Invoker optimize set to '"+optimize+"'");
  +      //DEBUG       Logger.debug("Container Invoker optimize set to '"+optimize+"'");
      }
   
      public boolean isOptimized()
  @@ -124,7 +125,7 @@
         //DEBUG  Logger.debug("Optimize in action: '"+optimize+"'");
         return optimize;
      }
  -   
  +
      public String getJndiName()
      {
         return jndiName;
  @@ -147,7 +148,7 @@
         // Get the transaction propagation context factory
         // and the transaction propagation context importer
         tpcFactory = (TransactionPropagationContextFactory)ctx.lookup("java:/TransactionPropagationContextExporter");
  -      tpcImporter = (TransactionPropagationContextImporter)ctx.lookup("java:/TransactionPropagationContextImporter");        
  +      tpcImporter = (TransactionPropagationContextImporter)ctx.lookup("java:/TransactionPropagationContextImporter");
   
         // Set the transaction manager and transaction propagation
         // context factory of the GenericProxy class
  @@ -159,12 +160,12 @@
         beanMethodInvokerMap = new HashMap();
         for (int i = 0; i < methods.length; i++)
            beanMethodInvokerMap.put(new Long(RemoteMethodInvocation.calculateHash(methods[i])), methods[i]);
  -      
  +
         methods = ((ContainerInvokerContainer)container).getHomeClass().getMethods();
         homeMethodInvokerMap = new HashMap();
         for (int i = 0; i < methods.length; i++)
            homeMethodInvokerMap.put(new Long(RemoteMethodInvocation.calculateHash(methods[i])), methods[i]);
  -         
  +
         try {
            // Get the getEJBObjectMethod
            Method getEJBObjectMethod = Class.forName("javax.ejb.Handle").getMethod("getEJBObject", new Class[0]);
  @@ -231,7 +232,7 @@
                  new HomeHandleImpl(jndiName));
            }
         }
  -      
  +
         ciDelegate.init();
      }
   
  @@ -289,7 +290,7 @@
      public void destroy()
      {
      }
  -   
  +
      // ContainerInvoker implementation -------------------------------
      public EJBMetaData getEJBMetaData()
      {
  @@ -341,7 +342,7 @@
            rmi.setMethodMap(homeMethodInvokerMap);
   
            return new MarshalledObject(container.invokeHome(new MethodInvocation(null, rmi.getMethod(), rmi.getArguments(),
  -            importTPC(rmi.getTransactionPropagationContext()), 
  +            importTPC(rmi.getTransactionPropagationContext()),
               rmi.getPrincipal(), rmi.getCredential() )));
         } finally {
            Thread.currentThread().setContextClassLoader(oldCl);
  @@ -362,7 +363,7 @@
            rmi.setMethodMap(beanMethodInvokerMap);
   
            return new MarshalledObject(container.invoke(new MethodInvocation(rmi.getId(), rmi.getMethod(), rmi.getArguments(),
  -            importTPC(rmi.getTransactionPropagationContext()), 
  +            importTPC(rmi.getTransactionPropagationContext()),
               rmi.getPrincipal(), rmi.getCredential() )));
         } finally {
            Thread.currentThread().setContextClassLoader(oldCl);
  @@ -418,7 +419,7 @@
      {
         // Check if this call really can be optimized
         // If parent of callers classloader is != parent of our classloader -> not optimizable!
  -      //	   if (Thread.currentThread().getContextClassLoader().getParent() != container.getClassLoader().getParent())
  +      //       if (Thread.currentThread().getContextClassLoader().getParent() != container.getClassLoader().getParent())
         if (!m.getDeclaringClass().isAssignableFrom(((ContainerInvokerContainer)container).getRemoteClass())) {
            RemoteMethodInvocation rmi = new RemoteMethodInvocation(id, m, args);