User: reverbel
  Date: 02/02/18 14:20:42

  Modified:    iiop/src/main/org/jboss/iiop AbstractTestBase.java
                        CorbaORBService.java Test.java TestBase.java
  Log:
  System.err calls replaced by logger calls, tabs removed, indentation
  changes.
  
  Revision  Changes    Path
  1.3       +4 -4      contrib/iiop/src/main/org/jboss/iiop/AbstractTestBase.java
  
  Index: AbstractTestBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/iiop/src/main/org/jboss/iiop/AbstractTestBase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractTestBase.java     8 Aug 2001 20:19:39 -0000       1.2
  +++ AbstractTestBase.java     18 Feb 2002 22:20:41 -0000      1.3
  @@ -13,8 +13,8 @@
   /**
    */
   public interface AbstractTestBase {
  -     /**
  -      * Accessor of type java.rmi.Remote
  -      */
  -     public java.rmi.Remote getSomethingRemote() throws RemoteException;
  +   /**
  +    * Accessor of type java.rmi.Remote
  +    */
  +   public java.rmi.Remote getSomethingRemote() throws RemoteException;
   }
  
  
  
  1.8       +84 -116   contrib/iiop/src/main/org/jboss/iiop/CorbaORBService.java
  
  Index: CorbaORBService.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/iiop/src/main/org/jboss/iiop/CorbaORBService.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CorbaORBService.java      16 Feb 2002 22:15:58 -0000      1.7
  +++ CorbaORBService.java      18 Feb 2002 22:20:41 -0000      1.8
  @@ -10,30 +10,21 @@
   import java.util.Properties;
   import java.util.Hashtable;
   
  -import org.omg.CORBA.ORB;
  -import org.omg.PortableServer.POA;
  -import org.omg.PortableServer.POAHelper;
  -
  -import org.omg.CosNaming.NamingContext;
  -import org.omg.CosNaming.NamingContextExt;
  -import org.omg.CosNaming.NamingContextExtHelper;
  -
   import javax.naming.InitialContext;
   import javax.naming.Context;
   import javax.naming.Reference;
   import javax.naming.Name;
   import javax.naming.spi.ObjectFactory;
  -
   import javax.management.MBeanServer;
   import javax.management.ObjectName;
   
  -import org.jboss.system.ServiceMBeanSupport;
  -import org.jboss.iiop.rmi.ir.InterfaceRepository;
  -
  -// Testing
  +import org.omg.CORBA.ORB;
   import org.omg.CORBA.Policy;
  -import org.omg.PortableServer.ThreadPolicy;
  -import org.omg.PortableServer.ThreadPolicyValue;
  +import org.omg.CosNaming.NamingContext;
  +import org.omg.CosNaming.NamingContextExt;
  +import org.omg.CosNaming.NamingContextExtHelper;
  +import org.omg.PortableServer.POA;
  +import org.omg.PortableServer.POAHelper;
   import org.omg.PortableServer.LifespanPolicy;
   import org.omg.PortableServer.LifespanPolicyValue;
   import org.omg.PortableServer.IdUniquenessPolicy;
  @@ -45,12 +36,16 @@
   import org.omg.PortableServer.RequestProcessingPolicy;
   import org.omg.PortableServer.RequestProcessingPolicyValue;
   
  +import org.jboss.system.ServiceMBeanSupport;
  +import org.jboss.iiop.rmi.ir.InterfaceRepository;
  +import org.jboss.logging.Logger;
  +
   /**
    *  This is a JMX service that provides the default CORBA ORB
    *  for JBoss to use.
    *      
    *  @author <a href="mailto:[EMAIL PROTECTED]";>Ole Husgaard</a>
  - *  @version $Revision: 1.7 $
  + *  @version $Revision: 1.8 $
    */
   public class CorbaORBService
      extends ServiceMBeanSupport
  @@ -72,13 +67,14 @@
   
      // Static --------------------------------------------------------
   
  -   static ORB orb;
  -   static POA poa;
  -   static POA homePOA;
  -   static POA namingPOA;
  -   static NamingContextExt namingService;
  -   static InterfaceRepository iri;
  -
  +   private static ORB orb;
  +   private static POA poa;
  +   private static POA homePOA;
  +   private static POA namingPOA;
  +   private static NamingContextExt namingService;
  +   private static InterfaceRepository iri;
  +   private static final Logger logger = 
  +                           Logger.getLogger(CorbaORBService.class);
   
      // ServiceMBeanSupport overrides ---------------------------------
   
  @@ -104,8 +100,8 @@
         // TODO: Fill in the port number below from MBean properties.
         props.put("OAPort", "5000" ); // port to be used by jacorb
         props.put("org.omg.PortableInterceptor.ORBInitializerClass"
  -             + ".org.jboss.ejb.plugins.iiop.server" 
  -             + ".CodebaseInterceptorInitializer", "");
  +                + ".org.jboss.ejb.plugins.iiop.server" 
  +                + ".CodebaseInterceptorInitializer", "");
   
         orb = ORB.init(new String[0], props);
         bind(ORB_NAME, "org.omg.CORBA.ORB");
  @@ -135,15 +131,9 @@
         namingPOA.activate_object_with_id(rootContextId, ns);
         namingService = NamingContextExtHelper.narrow(
                     namingPOA.create_reference_with_id(rootContextId, 
  -                             "IDL:omg.org/CosNaming/NamingContextExt:1.0"));
  +                                "IDL:omg.org/CosNaming/NamingContextExt:1.0"));
         bind(NAMING_NAME, "org.omg.CosNaming.NamingContextExt");
  -
  -// Temporary output of naming service.
  -      System.err.println("*******************************************");
  -      System.err.println("*******************************************");
  -      System.err.println("Naming: ["+orb.object_to_string(namingService)+"]");
  -      System.err.println("*******************************************");
  -      System.err.println("*******************************************");
  +      logger.info("Naming: ["+orb.object_to_string(namingService)+"]");
   
         // Make the ORB work
         new Thread(
  @@ -154,61 +144,59 @@
            }, "ORB thread"
         ).start(); 
   
  -      // Testing
  -try {
  -//      ThreadPolicy threadPolicy = 
poa.create_thread_policy(ThreadPolicyValue.ORB_CTRL_MODEL);
  -      LifespanPolicy lifespanPolicy = 
poa.create_lifespan_policy(LifespanPolicyValue.PERSISTENT);
  -      IdUniquenessPolicy idUniquenessPolicy = 
poa.create_id_uniqueness_policy(IdUniquenessPolicyValue.MULTIPLE_ID);
  -      IdAssignmentPolicy idAssignmentPolicy = 
poa.create_id_assignment_policy(IdAssignmentPolicyValue.USER_ID);
  -      ServantRetentionPolicy servantRetentionPolicy = 
poa.create_servant_retention_policy(ServantRetentionPolicyValue.RETAIN);
  -      RequestProcessingPolicy requestProcessingPolicy = 
poa.create_request_processing_policy(RequestProcessingPolicyValue.USE_DEFAULT_SERVANT);
  -//      POA testPoa = poa.create_POA("Test", null, new Policy[]{});
  -      POA testPoa = poa.create_POA("Test", null,
  -                                   new Policy[]{lifespanPolicy, idUniquenessPolicy,
  -                                                idAssignmentPolicy, 
servantRetentionPolicy,
  -                                                requestProcessingPolicy});
  -
  -      iri = new org.jboss.iiop.rmi.ir.InterfaceRepository(orb, testPoa);
  -      bind(IRI_NAME, "org.jboss.iiop.rmi.ir.InterfaceRepository");
  -
  -      iri.mapClass(org.jboss.iiop.TestBase.class);
  -      iri.mapClass(org.jboss.iiop.Test.class);
  -      iri.mapClass(org.jboss.iiop.TestValue.class);
  -      iri.mapClass(org.jboss.iiop.TestException.class);
  -
  -//      iri.mapClass(test.iiop.StatelessSession.class);
  -//      iri.mapClass(test.iiop.StatelessSessionHome.class);
  -      iri.finishBuild();
  -
  -      // Activate the poa
  -      testPoa.the_POAManager().activate();
  -
  -      org.omg.CORBA.Repository ir = iri.getReference();
  -      String s = orb.object_to_string(ir);
  -      System.err.println("*******************************************");
  -      System.err.println("*******************************************");
  -      System.err.println("*******************************************");
  -      System.err.println("IR: [" + s + "]");
  -      System.err.println("*******************************************");
  -      System.err.println("*******************************************");
  -      System.err.println("*******************************************");
  -
  -      java.io.FileOutputStream fos
  -       = new java.io.FileOutputStream("t.ior");
  -      java.io.OutputStreamWriter osw = new java.io.OutputStreamWriter(fos);
  -osw.write(s);
  -      osw.flush();
  -      fos.flush();
  -      osw.close();
  -      fos.close();
  -} catch (Exception ex) {
  -   ex.printStackTrace();
  -   if (ex instanceof org.jboss.iiop.rmi.RMIIIOPViolationException) {
  -      org.jboss.iiop.rmi.RMIIIOPViolationException ex2;
  -      ex2 = (org.jboss.iiop.rmi.RMIIIOPViolationException)ex;
  -      System.err.println("Section: " + ex2.getSection());
  -   }
  -}
  +      // Create the interface repository
  +      try {
  +         LifespanPolicy lifespanPolicy = 
  +            poa.create_lifespan_policy(LifespanPolicyValue.PERSISTENT);
  +         IdUniquenessPolicy idUniquenessPolicy = 
  +            poa.create_id_uniqueness_policy(
  +                        IdUniquenessPolicyValue.MULTIPLE_ID);
  +         IdAssignmentPolicy idAssignmentPolicy = 
  +            poa.create_id_assignment_policy(IdAssignmentPolicyValue.USER_ID);
  +         ServantRetentionPolicy servantRetentionPolicy = 
  +            poa.create_servant_retention_policy(
  +                        ServantRetentionPolicyValue.RETAIN);
  +         RequestProcessingPolicy requestProcessingPolicy = 
  +            poa.create_request_processing_policy(
  +                        RequestProcessingPolicyValue.USE_DEFAULT_SERVANT);
  +         POA irPoa = poa.create_POA("Test", null,
  +                                    new Policy[]{lifespanPolicy, 
  +                                                 idUniquenessPolicy,
  +                                                 idAssignmentPolicy, 
  +                                                 servantRetentionPolicy,
  +                                                 requestProcessingPolicy});
  +         
  +         iri = new org.jboss.iiop.rmi.ir.InterfaceRepository(orb, irPoa);
  +         bind(IRI_NAME, "org.jboss.iiop.rmi.ir.InterfaceRepository");
  +
  +         // Test the interface repository
  +         //iri.mapClass(org.jboss.iiop.TestBase.class);
  +         //iri.mapClass(org.jboss.iiop.Test.class);
  +         //iri.mapClass(org.jboss.iiop.TestValue.class);
  +         //iri.mapClass(org.jboss.iiop.TestException.class);
  +         //iri.finishBuild();
  +         
  +         // Activate the poa
  +         irPoa.the_POAManager().activate();
  +         
  +         org.omg.CORBA.Repository ir = iri.getReference();
  +         String s = orb.object_to_string(ir);
  +         logger.info("IR: [" + s + "]");
  +         
  +         //java.io.FileOutputStream fos
  +         //   = new java.io.FileOutputStream("t.ior");
  +         //java.io.OutputStreamWriter osw = new java.io.OutputStreamWriter(fos);
  +         //osw.write(s);
  +         //osw.flush();
  +         //fos.flush();
  +         //osw.close();
  +         //fos.close();
  +      } catch (org.jboss.iiop.rmi.RMIIIOPViolationException violation) {
  +            logger.error("RMI/IIOP violation, section: " 
  +                         + violation.getSection(), violation);
  +      } catch (Exception ex) {
  +            logger.error("Error in interface repository initialization", ex);
  +      }
      }
       
      protected void stopService()
  @@ -264,20 +252,11 @@
                                      Context nameCtx, Hashtable environment)
         throws Exception
      {
  -      System.err.println("*******************************************");
  -      System.err.println("*******************************************");
  -      System.err.println("*******************************************");
  -      System.err.println("getObjectInstance: obj.getClass().getName=\"" +
  -                         obj.getClass().getName());
  -      System.err.println("*******************************************");
  -      System.err.println("*******************************************");
  -      System.err.println("*******************************************");
  -
         String s = name.toString();
  -      System.err.println("*******************************************");
  -      System.err.println("Name: " + s);
  -      System.err.println("*******************************************");
  -
  +      if (logger.isTraceEnabled())
  +         logger.trace("getObjectInstance: obj.getClass().getName=\"" +
  +                      obj.getClass().getName() +
  +                      "\n                   name=" + s);
         if (ORB_NAME.equals(s))
            return orb;
         if (POA_NAME.equals(s))
  @@ -287,18 +266,7 @@
         if (NAMING_NAME.equals(s))
            return namingService;
         if (IRI_NAME.equals(s))
  -      return iri;
  -/*
  -      if (obj instanceof Reference) {
  -         String s = ((Reference)obj).getClassName();
  - System.err.println("getObjectInstance: class=" + s);
  -
  -         if ("org.omg.CORBA.ORB".equals(s))
  -            return orb;
  -         if ("org.omg.PortableServer.POA".equals(s))
  -            return poa;
  -      }
  -*/
  +         return iri;
         return null;
      }
   
  @@ -349,11 +317,11 @@
               poa.activate_object_with_id(oid, newContextImpl);
               return NamingContextExtHelper.narrow(
                           poa.create_reference_with_id(oid, 
  -                             "IDL:omg.org/CosNaming/NamingContextExt:1.0"));
  +                                "IDL:omg.org/CosNaming/NamingContextExt:1.0"));
            }
            catch (Exception e) {
  -            e.printStackTrace(System.err);
  -         return null;
  +            logger.error("Cannot create CORBA naming context", e);
  +            return null;
            }
         }
      }
  
  
  
  1.4       +33 -33    contrib/iiop/src/main/org/jboss/iiop/Test.java
  
  Index: Test.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/iiop/src/main/org/jboss/iiop/Test.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Test.java 10 Aug 2001 16:14:30 -0000      1.3
  +++ Test.java 18 Feb 2002 22:20:41 -0000      1.4
  @@ -16,37 +16,37 @@
   public interface Test extends TestBase {
           public final String const2 = "abc";
   
  -public Test aa1() throws RemoteException;
  -public TestValue aa2() throws RemoteException;
  -public Object aa3() throws RemoteException;
  -public java.io.Serializable aa4() throws RemoteException;
  -public java.io.Externalizable aa5() throws RemoteException;
  -public java.rmi.Remote aa6() throws RemoteException;
  -
  -public String jack(String arg) throws RemoteException;
  -public String Jack(String arg) throws RemoteException;
  -public String jAcK(String arg) throws RemoteException;
  -
  -     /**
  -      * Gets the current value of the autonumber.
  -      */
  -     public int getValue() throws RemoteException;
  -     
  -     /**
  -      * Sets the current value of the autonumber.
  -      */
  -     public void setValue(int value) throws RemoteException;
  -     
  -     /**
  -      * A test operation.
  -      */
  -     public TestValue[][] addNumbers(int[] numbers,
  -                                        boolean b, char c, byte by, short s,
  -                                        int i, long l, float f, double d,
  -java.rmi.Remote rem,
  -TestValue val, Test intf,
  -                                        String str, Object obj, Class cls,
  -                                        java.io.Serializable ser,
  -                                        java.io.Externalizable ext)
  -           throws TestException, RemoteException;
  +   public Test aa1() throws RemoteException;
  +   public TestValue aa2() throws RemoteException;
  +   public Object aa3() throws RemoteException;
  +   public java.io.Serializable aa4() throws RemoteException;
  +   public java.io.Externalizable aa5() throws RemoteException;
  +   public java.rmi.Remote aa6() throws RemoteException;
  +   
  +   public String jack(String arg) throws RemoteException;
  +   public String Jack(String arg) throws RemoteException;
  +   public String jAcK(String arg) throws RemoteException;
  +   
  +   /**
  +    * Gets the current value of the autonumber.
  +    */
  +   public int getValue() throws RemoteException;
  +   
  +   /**
  +    * Sets the current value of the autonumber.
  +    */
  +   public void setValue(int value) throws RemoteException;
  +   
  +   /**
  +    * A test operation.
  +    */
  +   public TestValue[][] addNumbers(int[] numbers,
  +                                   boolean b, char c, byte by, short s,
  +                                   int i, long l, float f, double d,
  +                                   java.rmi.Remote rem,
  +                                   TestValue val, Test intf,
  +                                   String str, Object obj, Class cls,
  +                                   java.io.Serializable ser,
  +                                   java.io.Externalizable ext)
  +      throws TestException, RemoteException;
   }
  
  
  
  1.3       +6 -8      contrib/iiop/src/main/org/jboss/iiop/TestBase.java
  
  Index: TestBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/iiop/src/main/org/jboss/iiop/TestBase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestBase.java     8 Aug 2001 20:19:39 -0000       1.2
  +++ TestBase.java     18 Feb 2002 22:20:42 -0000      1.3
  @@ -10,13 +10,11 @@
   import javax.ejb.EJBObject;
   import java.rmi.RemoteException;
   
  -/**
  - */
   public interface TestBase extends java.rmi.Remote {
  -        public final int const1 = 123;
  -
  -     /**
  -      * Accessor of type Object
  -      */
  -     public Object getObjectValue() throws RemoteException;
  +   public final int const1 = 123;
  +   
  +   /**
  +    * Accessor of type Object
  +    */
  +   public Object getObjectValue() throws RemoteException;
   }
  
  
  

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

Reply via email to