*** empty log message ***

19 files changed, 605 insertions, 3080 deletions

diff --git a/TAO/IIOP/test/Orbeline/base_server/Makefile b/TAO/IIOP/test/Orbeline/base_server/Makefile
index 36df56d2887..9fdad280ffc 100644
--- a/TAO/IIOP/test/Orbeline/base_server/Makefile
+++ b/TAO/IIOP/test/Orbeline/base_server/Makefile
@@ -1,89 +1,19 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
+include stdmk
 
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
+EXE = server 	
 
-SRC = cubitS.cpp cubit_impl.cpp server.cpp
+all: $(EXE)
 
-SVR_OBJS = cubitS.o cubit_impl.o server.o
+clean:
+	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
+	-rm -rf Templates.DB
 
-LDLIBS	 = 
+cubitS.cpp: cubit.idl
+	$(ORBCC) cubit.idl
 
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
+cubitC.cpp: cubit.idl
+	$(ORBCC) cubit.idl
 
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/macros.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(WRAPPER_ROOT)/ace/stdcpp.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(WRAPPER_ROOT)/ace/stdcpp.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+server: cubitS.o cubitC.o server.o Profile_Timer.o cubit_impl.o
+	$(CC) -o server cubitS.o cubitC.o cubit_impl.o server.o Profile_Timer.o \
+	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp
new file mode 100644
index 00000000000..526a3dc4efc
--- /dev/null
+++ b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp
@@ -0,0 +1,127 @@
+#include "Profile_Timer.h"
+
+/* Initialize interval timer. */
+
+Profile_Timer::Profile_Timer (void)
+{
+  char buf[20];
+  ::sprintf(buf, "/proc/%d", ::getpid ());
+
+  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
+  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
+  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
+  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
+    ::perror (buf);
+}
+
+/* Terminate the interval timer. */
+Profile_Timer::~Profile_Timer (void)
+{
+  if (::close (this->proc_fd_) == -1)
+    ::perror ("Profile_Timer::~Profile_Timer");
+}
+
+/* Return the resource utilization. */
+
+void
+Profile_Timer::get_rusage (prusage_t &rusage)
+{
+  rusage = this->end_usage_;
+}
+
+/* Compute the amount of resource utilization since the start time. */
+
+void
+Profile_Timer::elapsed_rusage (prusage_t &rusage)
+{
+  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
+  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
+  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
+  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
+  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
+  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
+  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
+  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
+  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
+  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
+  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
+  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
+  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
+  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
+  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
+  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
+}
+
+/* Compute the elapsed time. */
+
+void
+Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
+{
+  timestruc_t td;
+
+  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
+  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
+  this->subtract (td, end.pr_utime, begin.pr_utime);
+  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
+  this->subtract (td, end.pr_stime,  begin.pr_stime);
+  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
+}
+
+/* Compute the amount of time that has elapsed between start and stop. */
+
+int
+Profile_Timer::elapsed_time (Elapsed_Time &et)
+{
+  this->compute_times (et, this->end_usage_, this->begin_usage_);
+  return 0;
+}
+
+/* Determine the difference between T1 and T2. */
+
+void
+Profile_Timer::subtract (timestruc_t &tdiff, timestruc_t &t1, timestruc_t &t0)
+{
+  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
+  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
+
+  /* Normalize the time. */
+
+  while (tdiff.tv_nsec < 0)
+    {
+      tdiff.tv_sec--;
+      tdiff.tv_nsec += (1000 * 1000 * 1000);
+    }
+}
+
+#if defined (DEBUG)
+#include <stdlib.h>
+extern "C" int gettimeofday (timeval *tp);
+
+const int DEFAULT_ITERATIONS = 1000000;
+
+int
+main (int argc, char *argv[])
+{
+  Profile_Timer timer;
+  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
+  timeval	tv;
+
+  timer.start ();
+
+  for (int i = 0; i < iterations; i++)
+    gettimeofday (&tv);
+
+  timer.stop ();
+
+  Profile_Timer::Elapsed_Time et;
+
+  timer.elapsed_time (et);
+
+  printf ("iterations = %d\n", iterations);
+  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
+	  et.real_time, et.user_time, et.system_time);
+
+  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
+  return 0;
+}
+#endif /* DEBUG */
diff --git a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h
new file mode 100644
index 00000000000..b3aed157232
--- /dev/null
+++ b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h
@@ -0,0 +1,60 @@
+/* -*- C++ -*- */
+/* An interval timer class using C++. */
+
+#if !defined (ACE_PROFILE_TIMER_H)
+#define ACE_PROFILE_TIMER_H
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/procfs.h>
+#include <stdio.h>
+#include <memory.h>
+
+class Profile_Timer
+{
+public:
+  struct Elapsed_Time
+    {
+      double real_time;
+      double user_time;
+      double system_time;
+    };
+
+  Profile_Timer (void);
+  ~Profile_Timer (void);
+  int  start (void);
+  int  stop (void);
+  int  elapsed_time (Elapsed_Time &et);
+  void elapsed_rusage (prusage_t &rusage);
+  void get_rusage (prusage_t &rusage);
+
+private:
+  void subtract (timestruc_t &tdiff, timestruc_t &t0, timestruc_t &t1);
+  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
+
+  prusage_t begin_usage_;
+  prusage_t end_usage_;
+  prusage_t last_usage_;
+  int	    proc_fd_;
+};
+
+/* Start timing */
+
+inline int 
+Profile_Timer::start (void) 
+{
+  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
+}
+
+/* Stop timing */
+
+inline int 
+Profile_Timer::stop (void) 
+{
+  this->last_usage_ = this->end_usage_;
+  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
+}
+
+#endif /* ACE_PROFILE_TIMER_H */
+
diff --git a/TAO/IIOP/test/Orbeline/base_server/cubit.h b/TAO/IIOP/test/Orbeline/base_server/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbeline/base_server/cubit.idl b/TAO/IIOP/test/Orbeline/base_server/cubit.idl
index d9b38c34a2a..3e2ea392619 100644
--- a/TAO/IIOP/test/Orbeline/base_server/cubit.idl
+++ b/TAO/IIOP/test/Orbeline/base_server/cubit.idl
@@ -1,8 +1,8 @@
 // @(#)cubit.idl	1.1 95/09/10
 // Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
+//
+//#pragma prefix	"Eng.SUN.COM"
+//#pragma version Cubit 1.1
 
 interface Cubit {
     octet	cube_octet (in octet o);
diff --git a/TAO/IIOP/test/Orbeline/base_server/cubitC.cpp b/TAO/IIOP/test/Orbeline/base_server/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbeline/base_server/cubitS.cpp b/TAO/IIOP/test/Orbeline/base_server/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.cpp b/TAO/IIOP/test/Orbeline/base_server/cubit_impl.cpp
index e35f1084118..63c0bb3105f 100644
--- a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.cpp
+++ b/TAO/IIOP/test/Orbeline/base_server/cubit_impl.cpp
@@ -1,18 +1,18 @@
 #include "cubit_impl.h"
 
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
+CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o) {
   return (CORBA::Octet) (o * o * o); 
 }
 
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
+CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s) {
   return (CORBA::Short) (s * s * s);
 }
 
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
+CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l) {
    return (CORBA::Long) (l * l * l);
 }
 
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
+Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values) {
   Cubit::Many out_values;
   out_values.o = values.o * values.o * values.o;
   out_values.s = values.s * values.s * values.s;
@@ -20,7 +20,7 @@ Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environm
   return out_values; 
 }
 
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
+Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values) {
   Cubit::oneof out_values;
    switch (values._d ()) {
    case Cubit::e_0th:
@@ -42,5 +42,5 @@ Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environ
    return out_values;  
 }
 
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
+void Cubit_Impl:: please_exit () 
+  {}
diff --git a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.h b/TAO/IIOP/test/Orbeline/base_server/cubit_impl.h
index 1e710bb15d1..0f6fd7dd6db 100644
--- a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.h
+++ b/TAO/IIOP/test/Orbeline/base_server/cubit_impl.h
@@ -2,26 +2,32 @@
 #ifndef cubit_ih
 #define cubit_ih
 
-#include "cubit.h"
+#include "cubitS.h"
 
 
 #ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
+class Cubit_Impl : public virtual _sk_Cubit {
 #else
 class Cubit_Impl {
 #endif /* Cubit_USE_BOA */
 
 public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
 
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
+#ifdef Cubit_USE_BOA
+  Cubit_Impl (const char *obj_name = NULL) :
+             _sk_Cubit(obj_name)
+    {}
+#else
+  Cubit_Impl (const char *obj_name = NULL)
+    {}
 #endif /* Cubit_USE_BOA */
 
+   virtual CORBA::Octet cube_octet(CORBA::Octet o);
+   virtual CORBA::Short cube_short(CORBA::Short s);
+   virtual CORBA::Long cube_long(CORBA::Long l);
+   virtual Cubit::Many cube_struct(const Cubit::Many& values);
+   virtual Cubit::oneof cube_union(const Cubit::oneof& values);
+   virtual void please_exit();
+};
+
 #endif
diff --git a/TAO/IIOP/test/Orbeline/base_server/server.cpp b/TAO/IIOP/test/Orbeline/base_server/server.cpp
index 96117fe3e0d..a4a1c85ed47 100644
--- a/TAO/IIOP/test/Orbeline/base_server/server.cpp
+++ b/TAO/IIOP/test/Orbeline/base_server/server.cpp
@@ -6,32 +6,41 @@
 // Server mainline
 //
 //****************************************************************************
-#define IT_EX_MACROS
-
 #include "cubit_impl.h"		// server header file
 
 int 
-main (int , char**)
+main (int argc, char** argv)
 {
 
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
+  CORBA::BOA_var boa = orb->BOA_init(argc, argv);
+
 #ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
+  Cubit_Impl cb("Cubit");
   cout << "Using BOA approach" << endl;
 #else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
+  Cubit_Impl tied("Cubit");
+  _tie_Cubit<Cubit_Impl> cb(tied, "Cubit");
+
   cout << "Using TIE approach" << endl;
 #endif /* Cubit_USE_BOA */
   
   //
   // Go get some work to do....
   //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
+  try {
+
+    boa->obj_is_ready(&cb);
+
+    boa->impl_is_ready();
+
+  } catch (const CORBA::Exception &excep) {
+    cerr << "Server error: " << excep << endl;
+    return -1;
+  } catch (...) {
+    cerr << "Unknown exception" << endl;
+    return -1;
   }
-  IT_ENDTRY;
 
   cout << "Cubit server is exiting." << endl;
 
diff --git a/TAO/IIOP/test/Orbeline/base_server/stdmk b/TAO/IIOP/test/Orbeline/base_server/stdmk
new file mode 100644
index 00000000000..df4125a38d8
--- /dev/null
+++ b/TAO/IIOP/test/Orbeline/base_server/stdmk
@@ -0,0 +1,36 @@
+CC = CC
+DEBUG = 
+
+ORBELINEDIR = /project/waltz/Orbeline2.0
+
+ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
+
+CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
+
+CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
+
+LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
+
+STDCC_LIBS = -lsocket -lnsl -ldl -mt 
+
+LIBORB = -lorb
+
+LIBACE = -lACE
+
+.SUFFIXES: .C .o .h .hh .cc .cpp
+
+.C.o:
+	$(CC) $(CCFLAGS) -c -o $@ $<
+ 
+.cc.o:
+	$(CC) $(CCFLAGS) -c -o $@ $<
+.cpp.o:
+	$(CC) $(CCFLAGS) -c -o $@ $<
+ 
+.C.cpp:
+	$(CC) -E $(CCFLAGS) $< > $@
+ 
+.cc.cpp:
+	$(CC) -E $(CCFLAGS) $< > $@
+
+
diff --git a/TAO/IIOP/test/Orbeline/client/Makefile b/TAO/IIOP/test/Orbeline/client/Makefile
index 9173749ba6d..d9c26fe56f0 100644
--- a/TAO/IIOP/test/Orbeline/client/Makefile
+++ b/TAO/IIOP/test/Orbeline/client/Makefile
@@ -1,89 +1,19 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
+include stdmk
 
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
+EXE = client 	
 
-SRC = cubitC.cpp client.cpp
+all: $(EXE)
 
-CLT_OBJS = cubitC.o client.o
+clean:
+	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
+	-rm -rf Templates.DB
 
-LDLIBS	 = 
+cubitS.cpp: cubit.idl
+	$(ORBCC) cubit.idl
 
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
+cubitC.cpp: cubit.idl
+	$(ORBCC) cubit.idl
 
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/macros.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: client 
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(WRAPPER_ROOT)/ace/stdcpp.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i
-.obj/client.o .shobj/client.so: client.cpp $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(WRAPPER_ROOT)/ace/stdcpp.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i cubit.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+client: cubitC.o Profile_Timer.o client.o
+	$(CC) -o client cubitC.o Profile_Timer.o client.o \
+	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp b/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp
new file mode 100644
index 00000000000..526a3dc4efc
--- /dev/null
+++ b/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp
@@ -0,0 +1,127 @@
+#include "Profile_Timer.h"
+
+/* Initialize interval timer. */
+
+Profile_Timer::Profile_Timer (void)
+{
+  char buf[20];
+  ::sprintf(buf, "/proc/%d", ::getpid ());
+
+  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
+  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
+  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
+  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
+    ::perror (buf);
+}
+
+/* Terminate the interval timer. */
+Profile_Timer::~Profile_Timer (void)
+{
+  if (::close (this->proc_fd_) == -1)
+    ::perror ("Profile_Timer::~Profile_Timer");
+}
+
+/* Return the resource utilization. */
+
+void
+Profile_Timer::get_rusage (prusage_t &rusage)
+{
+  rusage = this->end_usage_;
+}
+
+/* Compute the amount of resource utilization since the start time. */
+
+void
+Profile_Timer::elapsed_rusage (prusage_t &rusage)
+{
+  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
+  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
+  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
+  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
+  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
+  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
+  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
+  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
+  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
+  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
+  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
+  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
+  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
+  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
+  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
+  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
+}
+
+/* Compute the elapsed time. */
+
+void
+Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
+{
+  timestruc_t td;
+
+  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
+  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
+  this->subtract (td, end.pr_utime, begin.pr_utime);
+  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
+  this->subtract (td, end.pr_stime,  begin.pr_stime);
+  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
+}
+
+/* Compute the amount of time that has elapsed between start and stop. */
+
+int
+Profile_Timer::elapsed_time (Elapsed_Time &et)
+{
+  this->compute_times (et, this->end_usage_, this->begin_usage_);
+  return 0;
+}
+
+/* Determine the difference between T1 and T2. */
+
+void
+Profile_Timer::subtract (timestruc_t &tdiff, timestruc_t &t1, timestruc_t &t0)
+{
+  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
+  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
+
+  /* Normalize the time. */
+
+  while (tdiff.tv_nsec < 0)
+    {
+      tdiff.tv_sec--;
+      tdiff.tv_nsec += (1000 * 1000 * 1000);
+    }
+}
+
+#if defined (DEBUG)
+#include <stdlib.h>
+extern "C" int gettimeofday (timeval *tp);
+
+const int DEFAULT_ITERATIONS = 1000000;
+
+int
+main (int argc, char *argv[])
+{
+  Profile_Timer timer;
+  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
+  timeval	tv;
+
+  timer.start ();
+
+  for (int i = 0; i < iterations; i++)
+    gettimeofday (&tv);
+
+  timer.stop ();
+
+  Profile_Timer::Elapsed_Time et;
+
+  timer.elapsed_time (et);
+
+  printf ("iterations = %d\n", iterations);
+  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
+	  et.real_time, et.user_time, et.system_time);
+
+  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
+  return 0;
+}
+#endif /* DEBUG */
diff --git a/TAO/IIOP/test/Orbeline/client/Profile_Timer.h b/TAO/IIOP/test/Orbeline/client/Profile_Timer.h
new file mode 100644
index 00000000000..b3aed157232
--- /dev/null
+++ b/TAO/IIOP/test/Orbeline/client/Profile_Timer.h
@@ -0,0 +1,60 @@
+/* -*- C++ -*- */
+/* An interval timer class using C++. */
+
+#if !defined (ACE_PROFILE_TIMER_H)
+#define ACE_PROFILE_TIMER_H
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/procfs.h>
+#include <stdio.h>
+#include <memory.h>
+
+class Profile_Timer
+{
+public:
+  struct Elapsed_Time
+    {
+      double real_time;
+      double user_time;
+      double system_time;
+    };
+
+  Profile_Timer (void);
+  ~Profile_Timer (void);
+  int  start (void);
+  int  stop (void);
+  int  elapsed_time (Elapsed_Time &et);
+  void elapsed_rusage (prusage_t &rusage);
+  void get_rusage (prusage_t &rusage);
+
+private:
+  void subtract (timestruc_t &tdiff, timestruc_t &t0, timestruc_t &t1);
+  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
+
+  prusage_t begin_usage_;
+  prusage_t end_usage_;
+  prusage_t last_usage_;
+  int	    proc_fd_;
+};
+
+/* Start timing */
+
+inline int 
+Profile_Timer::start (void) 
+{
+  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
+}
+
+/* Stop timing */
+
+inline int 
+Profile_Timer::stop (void) 
+{
+  this->last_usage_ = this->end_usage_;
+  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
+}
+
+#endif /* ACE_PROFILE_TIMER_H */
+
diff --git a/TAO/IIOP/test/Orbeline/client/client.cpp b/TAO/IIOP/test/Orbeline/client/client.cpp
index fcf45bdf706..c2b1d4070ae 100644
--- a/TAO/IIOP/test/Orbeline/client/client.cpp
+++ b/TAO/IIOP/test/Orbeline/client/client.cpp
@@ -7,9 +7,13 @@
 //
 //****************************************************************************
 
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
+#include <iostream.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <stdlib.h>
+#include "cubitC.h"
+#include "Profile_Timer.h"
 
 int LOOP_COUNT;
 char SERVER_HOST [1024];
@@ -24,39 +28,14 @@ void run_tests (Cubit_var, int);
 //     This method parses the command line arguments
 int parse_args(int argc, char *argv[])
 {
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "dh:n:O:x");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'd':  // debug flag
-      continue;
-      
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-      
-    case 'O':			// stringified objref
-      continue;
-      
-    case 'x':
-      continue;
-      
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
+  if (argc != 3) {
+    cerr << "Format: client <machine name> <loop count>" << endl;
+    return -1;
+  }
+
+  strcpy(SERVER_HOST, argv[1]);
+
+  LOOP_COUNT = atoi(argv[2]);
   
   return 0;  // Indicates successful parsing of command line
 }
@@ -78,13 +57,15 @@ main (int argc, char *argv[])
   // Initialise client's binding to an
   // arbitrary cubit server (at some host)
   // 
-  TRY {
-    cb = Cubit::_bind ("", SERVER_HOST, IT_X);
-  }
-  CATCHANY {
-    cerr << "Binding failed: " << IT_X;
-  }
-  ENDTRY;
+  try {
+    cb = Cubit::_bind ("Cubit", SERVER_HOST);
+
+  } catch (const CORBA::Exception & sysEx) {
+    cerr << "Binding failed: " << endl;
+    cerr << sysEx;
+  } catch (...) {
+    cerr << "Unexpected exception" << endl;
+  }       
   
   run_tests (cb, LOOP_COUNT);
   return 0;
@@ -103,10 +84,9 @@ run_tests (Cubit_var cb, int loop_count)
   call_count = 0;
   error_count = 0;
 
-  ACE_Time_Value before, after;
+  Profile_Timer pt;
 
-  before = ACE_OS::gettimeofday();
-  
+  pt.start();
   //
   // Cube an octet.
   //
@@ -118,17 +98,21 @@ run_tests (Cubit_var cb, int loop_count)
 
       CORBA::Octet arg_octet = func (i), ret_octet;
 
-      TRY {
-      ret_octet = cb->cube_octet (arg_octet);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
+      try {
+	ret_octet = cb->cube_octet (arg_octet);
+      
+      } catch (const CORBA::Exception &sysEx) {
+	cerr << "Call failed: " << endl;
+	cerr << sysEx;
+	error_count++;
+      } catch (...) {
+	cerr << "Unexpected exception" << endl;
+	error_count++;
+      }       
+
       arg_octet = arg_octet * arg_octet * arg_octet;
       if (arg_octet != ret_octet) {
-        ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
+        printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
         error_count++;
       }
     
@@ -140,17 +124,21 @@ run_tests (Cubit_var cb, int loop_count)
 
       CORBA::Short arg_short = func (i), ret_short;
 
-      TRY {
-      ret_short = cb->cube_short (arg_short);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
+      try {
+	ret_short = cb->cube_short (arg_short);
+       
+      } catch (const CORBA::Exception &sysEx) {
+	cerr << "Call failed: " << endl;
+	cerr << sysEx;
+	error_count++;
+      } catch (...) {
+	cerr << "Unexpected exception" << endl;
+	error_count++;
+      }       
+
       arg_short = arg_short * arg_short * arg_short;
       if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
+        printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
         error_count++;
       }
 
@@ -162,16 +150,20 @@ run_tests (Cubit_var cb, int loop_count)
 
       CORBA::Long arg_long = func (i), ret_long;
 
-      TRY {
-      ret_long = cb->cube_long (arg_long);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-      } 
-      ENDTRY;
+      try {
+	ret_long = cb->cube_long (arg_long);
+      } catch (const CORBA::Exception &sysEx) {
+	cerr << "Call failed: " << endl;
+	cerr << sysEx;
+	error_count++;
+      } catch (...) {
+	cerr << "Unexpected exception" << endl;
+	error_count++;
+      }       
+
       arg_long = arg_long * arg_long * arg_long;
       if (arg_long != ret_long) {
-        ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
+        printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
         error_count++;
       }
 
@@ -187,14 +179,19 @@ run_tests (Cubit_var cb, int loop_count)
        arg_struct.s = func (i);
        arg_struct.o = func (i);
        
-       TRY {
+       try {
          ret_struct = cb->cube_struct (arg_struct);
-       }
-       CATCHANY {
-         cerr << "Call failed: " << IT_X;
-         error_count++;
-       } 
-       ENDTRY;
+
+       } catch (const CORBA::Exception &sysEx) {
+	 cerr << "Call failed: " << endl;
+	 cerr << sysEx;
+	 error_count++;
+       } catch (...) {
+	 cerr << "Unexpected exception" << endl;
+	 error_count++;
+       }       
+
+
        arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
        arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
        arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
@@ -208,25 +205,26 @@ run_tests (Cubit_var cb, int loop_count)
          }
     }
     
-  
-  after = ACE_OS::gettimeofday();
+  pt.stop();
+
+  Elapsed_Time et;
+  pt.elapsed_time(et);
   
   if (call_count > 0) 
     {
       if (error_count == 0)
         {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
+          unsigned long	us = et.real_time * 1000 * 1000;
           
           us /= call_count;
           
           if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
+            printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
                             "%ld calls/second\n",
                             us / 1000, us % 1000,
                             1000000L / us);
         }
       
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
+      printf ("%d calls, %d errors\n", call_count, error_count);
     }
 }
diff --git a/TAO/IIOP/test/Orbeline/client/cubit.h b/TAO/IIOP/test/Orbeline/client/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/test/Orbeline/client/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbeline/client/cubit.idl b/TAO/IIOP/test/Orbeline/client/cubit.idl
index d9b38c34a2a..3e2ea392619 100644
--- a/TAO/IIOP/test/Orbeline/client/cubit.idl
+++ b/TAO/IIOP/test/Orbeline/client/cubit.idl
@@ -1,8 +1,8 @@
 // @(#)cubit.idl	1.1 95/09/10
 // Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
+//
+//#pragma prefix	"Eng.SUN.COM"
+//#pragma version Cubit 1.1
 
 interface Cubit {
     octet	cube_octet (in octet o);
diff --git a/TAO/IIOP/test/Orbeline/client/cubitC.cpp b/TAO/IIOP/test/Orbeline/client/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/test/Orbeline/client/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbeline/client/stdmk b/TAO/IIOP/test/Orbeline/client/stdmk
new file mode 100644
index 00000000000..df4125a38d8
--- /dev/null
+++ b/TAO/IIOP/test/Orbeline/client/stdmk
@@ -0,0 +1,36 @@
+CC = CC
+DEBUG = 
+
+ORBELINEDIR = /project/waltz/Orbeline2.0
+
+ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
+
+CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
+
+CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
+
+LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
+
+STDCC_LIBS = -lsocket -lnsl -ldl -mt 
+
+LIBORB = -lorb
+
+LIBACE = -lACE
+
+.SUFFIXES: .C .o .h .hh .cc .cpp
+
+.C.o:
+	$(CC) $(CCFLAGS) -c -o $@ $<
+ 
+.cc.o:
+	$(CC) $(CCFLAGS) -c -o $@ $<
+.cpp.o:
+	$(CC) $(CCFLAGS) -c -o $@ $<
+ 
+.C.cpp:
+	$(CC) -E $(CCFLAGS) $< > $@
+ 
+.cc.cpp:
+	$(CC) -E $(CCFLAGS) $< > $@
+
+