*** empty log message ***

6 files changed, 10 insertions, 10 deletions

diff --git a/TAO/examples/POA/Explicit_Activation/Makefile b/TAO/examples/POA/Explicit_Activation/Makefile
index cea9dfe7335..d506e1d42c2 100644
--- a/TAO/examples/POA/Explicit_Activation/Makefile
+++ b/TAO/examples/POA/Explicit_Activation/Makefile
@@ -8,7 +8,7 @@ LSRC = 	$(addsuffix .cpp,$(BIN))
 
 CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant
 
-LDLIBS     =   -lMyFoo -lTAO
+LDLIBS     =   -lGeneric_Servant -lTAO
 LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/TAO/examples/POA/Generic_Servant/Makefile b/TAO/examples/POA/Generic_Servant/Makefile
index 72244b4598f..2d6a9e26bf0 100644
--- a/TAO/examples/POA/Generic_Servant/Makefile
+++ b/TAO/examples/POA/Generic_Servant/Makefile
@@ -19,7 +19,7 @@ override TAO_IDLFLAGS += -Wb,export_macro=GENERIC_SERVANT_Export \
 
 LDLIBS = -lTAO
 
-SHLIB = libMyFoo.$(SOEXT)
+SHLIB = libGeneric_Servant.$(SOEXT)
 
 IDL_SRC = FooC FooS
 
diff --git a/TAO/examples/POA/Generic_Servant/server.dsp b/TAO/examples/POA/Generic_Servant/server.dsp
index cec24bda5ea..5c4afbec0bb 100644
--- a/TAO/examples/POA/Generic_Servant/server.dsp
+++ b/TAO/examples/POA/Generic_Servant/server.dsp
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOd.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\bin\MyFood.dll" /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 TAOd.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\bin\Generic_Servantd.dll" /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 # SUBTRACT LINK32 /profile /pdb:none

 

 !ENDIF 

@@ -144,7 +144,7 @@ InputName=Foo
 

 BuildCmds= \

 	tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\

-         -Wb,export_include=generic_servant_export.h $(InputName).idl

+          -Wb,export_include=generic_servant_export.h $(InputName).idl

 

 "$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -175,7 +175,7 @@ InputName=Foo
 

 BuildCmds= \

 	tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\

-         -Wb,export_include=generic_servant_export.h $(InputName).idl

+          -Wb,export_include=generic_servant_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp
index adb3f9fafd1..16bf3ee6fee 100644
--- a/TAO/examples/POA/Loader/Server_Manager.cpp
+++ b/TAO/examples/POA/Loader/Server_Manager.cpp
@@ -239,7 +239,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
       // the servant on demand.
       ACE_NEW_RETURN (servant_activator_impl_,
                       ServantActivator_i (orb_.in (),
-                                          "MyFoo",
+                                          "Generic_Servant",
                                           "supply_servant",
                                           "destroy_servant"),
                       0);
@@ -287,7 +287,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       // the servant on demand.
       ACE_NEW_RETURN (servant_locator_impl_,
                       ServantLocator_i (orb_.in (),
-                                        "MyFoo",
+                                        "Generic_Servant",
                                         "supply_servant",
                                         "destroy_servant"),
                       0);
diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile b/TAO/examples/POA/On_Demand_Activation/Makefile
index 90f63edacdb..57418f3700c 100644
--- a/TAO/examples/POA/On_Demand_Activation/Makefile
+++ b/TAO/examples/POA/On_Demand_Activation/Makefile
@@ -11,7 +11,7 @@ OBJ = $(addsuffix .o,$(MYFILES))
 
 CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant
 
-LDLIBS     =   -lMyFoo -lTAO
+LDLIBS     =   -lGeneric_Servant -lTAO
 LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
index 4ab447bb10f..b801317c2ad 100644
--- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
@@ -257,7 +257,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
       // objectId.
 
       PortableServer::ObjectId_var first_foo_oid =
-        servant_activator_impl_->create_dll_object_id ("MyFoo",
+        servant_activator_impl_->create_dll_object_id ("Generic_Servant",
                                                        "create_MyFoo");
 
       first_foo_ = first_poa->create_reference_with_id (first_foo_oid.in (),
@@ -307,7 +307,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       // objectId.
       PortableServer::ObjectId_var second_foo_oid =
         servant_locator_impl_->create_dll_object_id 
-        ("MyFoo",
+        ("Generic_Servant",
          "create_MyFoo");
       second_foo_ = second_poa->create_reference_with_id 
         (second_foo_oid.in (),