ChangeLogTag: Tue Feb 15 13:29:35 2005 Chad Elliott <elliott_c@ociweb.com>

7 files changed, 100 insertions, 42 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 217b83403e1..b450019d90f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,22 +1,48 @@
+Tue Feb 15 13:29:35 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/AV/AVStreams_i.h:
+
+          Removed an unused #include of Trader.h.
+
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp:
+
+          Changed messages to not use the word Error to avoid potential
+          problems with the Scoreboard.
+
+        * orbsvcs/orbsvcs/Notify/XML_Saver.cpp:
+
+          Fixed a bug in the output code to include a missing space.
+
+        * orbsvcs/tests/Notify/XML_Persistence/main.cpp:
+        * orbsvcs/tests/Notify/XML_Persistence/run_test.pl:
+
+          Added a persistent POA to help with IOR comparisons.  It's not
+          100% perfect, but it's better than it was.
+
+        * orbsvcs/tests/Notify/XML_Persistence/svc.conf:
+
+          Changed the case of persistence to match the
+          TAO_CosNotification_Persistence library.
+
 Tue Feb 15 07:09:41 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-        
+
           Added generation of forward declaration of the associated
           event consumer interface, if the valuetype node being
           processed happens to be an eventtype. Also added the _ptr
           typedef, so it can be seen by a component declaration
           that occurs later in the same scope.
-          
+
         * TAO_IDL/be/be_visitor_component/component_cs.cpp:
         * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-        
+
           Changed return values of some generated methods that
           return CORBA::Boolean to return 'true' or 'false'
           instead of '1' or '0'.
-          
+
         * TAO_IDL/be/be_visitor_exception/exception_cs.cpp (_tao_duplicate):
-        
+
           Added code generation to initialize the declaration of the
           return value pointer to 0. Thanks to Johnny Willemsen
           <jwillemsen@remedy.nl> for making the suggestion.
@@ -102,28 +128,28 @@ Mon Feb 14 23:05:55 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
         * TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h:
         * TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h:
 
-	  - Removed all eventtype visitors, they all just delegate to
-	    the corresponding valuetype visitor. Added visit_eventtype()
-	    methods to valuetype visitors where necessary so the delegation
-	    can be done within the valuetype visitor itself and still
-	    keep the polymorphism in be_eventtype::visit_eventtype(),
-	    since the arg traits and ccm-preproc visitors still need
-	    it.
+          - Removed all eventtype visitors, they all just delegate to
+            the corresponding valuetype visitor. Added visit_eventtype()
+            methods to valuetype visitors where necessary so the delegation
+            can be done within the valuetype visitor itself and still
+            keep the polymorphism in be_eventtype::visit_eventtype(),
+            since the arg traits and ccm-preproc visitors still need
+            it.
 
-	  - Changed error checking to allow a struct/union/sequence/array
-	    defined inside an interface to contain that interface
-	    as a member or element type, that is, this is no longer
-	    regarded by the IDL compiler as illegal recursion. Thanks to
-	    Don Sharp <dws@prismtech.com> for bringing this up.
+          - Changed error checking to allow a struct/union/sequence/array
+            defined inside an interface to contain that interface
+            as a member or element type, that is, this is no longer
+            regarded by the IDL compiler as illegal recursion. Thanks to
+            Don Sharp <dws@prismtech.com> for bringing this up.
 
-	  - Fixed bug that aborted the IDL compiler when an eventtype
-	    contained a constant declaration. Thanks to Steven Baker
-	    <Steven_D_Baker@raytheon.com> for reporting the bug.
+          - Fixed bug that aborted the IDL compiler when an eventtype
+            contained a constant declaration. Thanks to Steven Baker
+            <Steven_D_Baker@raytheon.com> for reporting the bug.
 
-	* tests/IDL_Test/interface.idl:
+        * tests/IDL_Test/interface.idl:
 
-	  Expanded sample IDL file sent in by Don Sharp in the
-	  second list item above and added it to the test suite.
+          Expanded sample IDL file sent in by Don Sharp in the
+          second list item above and added it to the test suite.
 
         * TAO_IDL/be/be_visitor_eventtype.cpp:
         * TAO_IDL/be/be_visitor_eventtype_fwd.cpp:
@@ -164,8 +190,8 @@ Mon Feb 14 23:05:55 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
         * TAO_IDL/be_include/be_visitor_eventtype_fwd/cdr_op_ch.h:
         * TAO_IDL/be_include/be_visitor_eventtype_fwd/eventtype_fwd_ch.h:
 
-	  Files removed as part of the fix in the first listed item
-	  above.
+          Files removed as part of the fix in the first listed item
+          above.
 
 Mon Feb 14 09:25:27 2005  Ciju John  <john_c@ociweb.com>
 
@@ -185,10 +211,10 @@ Sun Feb 13 13:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Fri Feb 11 11:12:56 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* tao/Valuetype/ValueBase.inl (is_end_tag):
+        * tao/Valuetype/ValueBase.inl (is_end_tag):
 
-	  Removed comparison that is always true.  Addresses warning
-	  exhibited by g++ 3.3.4.
+          Removed comparison that is always true.  Addresses warning
+          exhibited by g++ 3.3.4.
 
 Fri Feb 11 08:42:25 2005  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index f53b3ddba1d..fc1dacd3ec2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -37,11 +37,6 @@
 #include "orbsvcs/AV/AV_Core.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/Null_MediaCtrlS.h"
-
-#if defined (TAO_ORBSVCS_HAS_Trader)
-#include "orbsvcs/Trader/Trader.h"
-#endif /* TAO_ORBSVCS_HAS_Trader */
-
 #include "orbsvcs/AV/FlowSpec_Entry.h"
 
 #define FLOWSPEC_MAX 5
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index a5ab16f1b72..a2fa5a1dadb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -89,7 +89,7 @@ namespace TAO_Notify
         ACEXML_CATCH (ACEXML_Exception, ex)
         {
           // The only way to find out what it is, it to let it print itself, so...
-          ACE_ERROR ((LM_ERROR, "Error during load of \"%s\".\n Will try backup file.\n", this->file_name_.c_str ()));
+          ACE_ERROR ((LM_ERROR, "Unable to load \"%s\".\n Will try backup file.\n", this->file_name_.c_str ()));
           ex.print ();
           result = false;
         }
@@ -144,7 +144,7 @@ namespace TAO_Notify
       ACEXML_CATCH (ACEXML_Exception, ex)
       {
         // The only way to find out what it is, it to let it print itself, so...
-        ACE_ERROR ((LM_ERROR, "Error during load of \"%s\".\n", this->file_name_.c_str ()));
+        ACE_ERROR ((LM_ERROR, "Unable to load \"%s\".\n", this->file_name_.c_str ()));
         ex.print ();
         ACE_THROW(CORBA::INTERNAL());
       }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
index 84fa7ce30ca..5ad5cf3818a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -163,7 +163,7 @@ namespace TAO_Notify
     {
       // not all ostreams know what to do with a CORBA::Long
       long lid = id;
-      ACE_OS::fprintf (out, "%s%s%ld%s", TOPOLOGY_ID_NAME, "=\"", lid, "\"");
+      ACE_OS::fprintf (out, " %s%s%ld%s", TOPOLOGY_ID_NAME, "=\"", lid, "\"");
     }
 
     char * buffer = 0;
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index 8874e42e7b8..45513848ede 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -110,10 +110,28 @@ int main(int ac, char **av)
     PortableServer::POAManager_var mgr = poa->the_POAManager();
     mgr->activate();
 
+    CORBA::PolicyList policies (1);
+    policies.length (1);
+
+    policies[0] =
+      poa->create_lifespan_policy (PortableServer::PERSISTENT
+                                   ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    PortableServer::POA_var persistentPOA = poa->create_POA (
+                                                    "PersistentPOA",
+                                                    mgr.in (),
+                                                    policies
+                                                    ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
     if (pass1)
     {
       CosNotifyChannelAdmin::EventChannelFactory_var cosecf =
-        TAO_Notify_EventChannelFactory_i::create(poa.in () ACE_ENV_ARG_PARAMETER);
+        TAO_Notify_EventChannelFactory_i::create(persistentPOA.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       NotifyExt::EventChannelFactory_var ecf =
@@ -294,9 +312,26 @@ int main(int ac, char **av)
 
       // Connect a PushConsumer and PushSupplier
       TestSupplier test_supplier_svt;
-      CosNotifyComm::StructuredPushSupplier_var push_sup = test_supplier_svt._this();
+      PortableServer::ObjectId_var oid1 = persistentPOA->activate_object (&test_supplier_svt
+                                                                          ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      CORBA::Object_var obj1 = persistentPOA->id_to_reference (oid1.in ()
+                                                               ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      CosNotifyComm::StructuredPushSupplier_var push_sup = CosNotifyComm::StructuredPushSupplier::_narrow (obj1.in ()
+                                                                                                           ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
       TestConsumer test_consumer_svt;
-      CosNotifyComm::StructuredPushConsumer_var push_cons = test_consumer_svt._this();
+      PortableServer::ObjectId_var oid2 = persistentPOA->activate_object (&test_consumer_svt
+                                                                          ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      CORBA::Object_var obj2 = persistentPOA->id_to_reference (oid2.in ()
+                                                               ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      CosNotifyComm::StructuredPushConsumer_var push_cons = CosNotifyComm::StructuredPushConsumer::_narrow (obj2.in ()
+                                                                                                           ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
       strpc->connect_structured_push_supplier(push_sup.in());
       strps->connect_structured_push_consumer(push_cons.in());
 
@@ -315,7 +350,7 @@ int main(int ac, char **av)
 
       // Create a new ecf, which should load itself from loadtest.xml
       CosNotifyChannelAdmin::EventChannelFactory_var
-        cosecf = TAO_Notify_EventChannelFactory_i::create(poa.in () ACE_ENV_ARG_PARAMETER);
+        cosecf = TAO_Notify_EventChannelFactory_i::create(persistentPOA.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl b/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl
index 6b73d986e0f..0b18e00ceb0 100755
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl
@@ -14,6 +14,8 @@ use File::Compare;
 $ACE_ROOT = $ENV{ACE_ROOT};
 $TAO_ROOT = "$ACE_ROOT/TAO";
 
+$port = 12000 + PerlACE::uniqueid ();
+
 sub cleanup() {
   unlink "loadtest.xml";
   unlink "abc.xml";
@@ -29,7 +31,7 @@ cleanup();
 
 $ret = 0;
 
-$UTEST = new PerlACE::Process("main");
+$UTEST = new PerlACE::Process("main", "-ORBEndpoint iiop://:$port");
 $ret = $UTEST->SpawnWaitKill(10);
 if ($ret != 0) {
   print "ERROR : main returned $ret\n";
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/svc.conf b/TAO/orbsvcs/tests/Notify/XML_Persistence/svc.conf
index 10b21998a5b..b6b6d00ec48 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/svc.conf
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/svc.conf
@@ -1,2 +1,2 @@
 static Notify_Default_Event_Manager_Objects_Factory "-MTDispatching -DispatchingThreads 1"
-dynamic Topology_Factory Service_Object* TAO_CosNotification_persist:_make_XML_Topology_Factory() "-save_base_path ./abc -load_base_path ./loadtest -backup_count 2 -no_timestamp"
+dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_XML_Topology_Factory() "-save_base_path ./abc -load_base_path ./loadtest -backup_count 2 -no_timestamp"