Changeset 4430

Timestamp:

07/19/07 10:54:26 (6 years ago)

Author:

jgaeddert

Message:

updating main.cpp in FrameAssembler

Files:

• experimental/components/FrameAssembler/src/main.cpp (modified) (5 diffs)

experimental/components/FrameAssembler/src/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2007 Virginia Polytechnic Institute and State University
+Copyright 2006 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE FrameAssembler.
@@ -22 +22 @@
 
 #include <iostream>
+
 #include "ossie/ossieSupport.h"
+#include "ossie/debug.h"
 
 #include "FrameAssembler.h"
@@ -36 +38 @@
     omni_condition *component_running = new omni_condition(&component_running_mutex);
 
-    if (argc != 3) {
-        std::cout << argv[0] << " <id> <usage name> " << std::endl;
-        exit (-1);
-    }
-
-    char *uuid = argv[1];
-    char *label = argv[2];
-
-    std::cout << "Identifier - " << uuid << "  Label - " << label << std::endl;
+    ossieSupport::ossieComponent frameassembler(orb, argc, argv);
 
     FrameAssembler_i* frameassembler_servant;
@@ -51 +45 @@
     // Create the frameassembler component servant and object reference
 
-    frameassembler_servant = new FrameAssembler_i(uuid, component_running);
+    frameassembler_servant = new FrameAssembler_i(frameassembler.getUuid(), component_running);
     frameassembler_var = frameassembler_servant->_this();
 
-    orb->bind_object_to_name((CORBA::Object_ptr) frameassembler_var, label);
+    PortableServer::ObjectId_var servantId = orb->poa->reference_to_id(frameassembler_var);
+
+    frameassembler.bind(frameassembler_var);
 
     // This bit is ORB specific
@@ -62 +58 @@
 
     component_running->wait();
-    orb->unbind_name(label);
+
+    frameassembler.unbind();
+
+    DEBUG(4, FrameAssembler, "Deactivate object.");
+    orb->poa->deactivate_object(servantId);
+
+    DEBUG(4, FrameAssembler, "Destroy POA.");
+    orb->poa->destroy(false, false);
+
+    DEBUG(4, FrameAssembler, "Shutdown orb.");
     orb->orb->shutdown(0);