*** empty log message ***

3 files changed, 6 insertions, 99 deletions

diff --git a/TAO/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile
index b7a1710bea0..19e4737c97c 100644
--- a/TAO/examples/Callback_Quoter/Makefile
+++ b/TAO/examples/Callback_Quoter/Makefile
@@ -19,7 +19,7 @@ IDL_SRC	= NotifierC.cpp NotifierS.cpp ConsumerC.cpp ConsumerS.cpp
 PROG_SRCS = \
 	consumer.cpp \
         supplier.cpp \
-	Supplier.cpp \
+	Supplier_i.cpp \
 	notifier.cpp \
 	Notifier_Input_Handler.cpp \
 	Notifier_i.cpp \
@@ -39,7 +39,7 @@ CONSUMER_CLT_OBJS = \
 MARKET_CLT_OBJS = \
 		NotifierC.o \
 		NotifierS.o \
-		Supplier.o \
+		Supplier_i.o \
 		supplier.o \
 		ConsumerC.o\
 		ConsumerS.o \
@@ -1310,7 +1310,7 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
-.obj/supplier.o .obj/supplier.so .shobj/supplier.o .shobj/supplier.so: supplier.cpp Supplier.h \
+.obj/supplier.o .obj/supplier.so .shobj/supplier.o .shobj/supplier.so: supplier.cpp Supplier_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -1562,7 +1562,7 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  NotifierC.h ConsumerC.h ConsumerC.i NotifierC.i
-.obj/Supplier.o .obj/Supplier.so .shobj/Supplier.o .shobj/Supplier.so: Supplier.cpp \
+.obj/Supplier_i.o .obj/Supplier_i.so .shobj/Supplier_i.o .shobj/Supplier_i.so: Supplier_i.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1622,7 +1622,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Read_Buffer.i \
- Supplier.h \
+ Supplier_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/orbconf.h \
diff --git a/TAO/examples/Callback_Quoter/Supplier.h b/TAO/examples/Callback_Quoter/Supplier.h
deleted file mode 100644
index bf614646cbf..00000000000
--- a/TAO/examples/Callback_Quoter/Supplier.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    MarketFeed.h
-//
-// = DESCRIPTION
-//    This class implements a simple CORBA server that keeps
-//     on sending stock values to the Notifier.
-//
-// = AUTHORS
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/CosNamingC.h"
-#include "NotifierC.h"
-
-class Supplier
-{
-  // = TITLE
-  //     Market feed  daemon implementation.
-  //
-  // = DESCRIPTION
-  //     Class wrapper for a daemon which keeps sending
-  //     current stock values to the Callback Quoter server.
-public:
-  // = Initialization and termination methods.
-  Supplier (void);
-  // Constructor.
-
-  ~Supplier (void);
-  // Destructor.
-
-  int run (void);
-  // Execute  the daemon.
-
-  int init (int argc, char *argv[]);
-  // Initialize the client communication endpoint with Notifier.
-
-private:
-  int read_ior (char *filename);
-  // Function to read the Notifier IOR from a file.
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  int via_naming_service(void);
-  // This method initialises the naming service and registers the
-  // object with the POA.
-
-  int send_market_status (const char *stock_name,
-			  long value);
-  // Sends the stock name and its value.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  char *ior_;
-  // IOR of the obj ref of the Notifier.
-
-  u_int feed_time;
-  // Time period between two succesive market feeds to the Notifier.
-
-  CORBA::Environment env_;
-  // Environment variable.
-
-  TAO_Naming_Client naming_services_client_;
-  // An instance of the name client used for resolving the factory
-  // objects.
-
-  int use_naming_service_;
-  // This variable denotes whether the naming service
-  // is used or not.
-
-  Notifier_var notifier_;
-  // Notifier object reference.
-
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
-  int loop_count_;
-  // Iteration count.
-};
diff --git a/TAO/examples/Callback_Quoter/supplier.cpp b/TAO/examples/Callback_Quoter/supplier.cpp
index 78317dd6744..1299879dc15 100644
--- a/TAO/examples/Callback_Quoter/supplier.cpp
+++ b/TAO/examples/Callback_Quoter/supplier.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Supplier.h"
+#include "Supplier_i.h"
 
 // This function runs the Callback Quoter Supplier  daemon.