Changeset 4402

Timestamp:

07/17/07 16:21:22 (6 years ago)

Author:

hvolos

Message:

main.cpp update

Files:

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

experimental/components/DataGenerator/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2006 Virginia Polytechnic Institute and State University
+Copyright 2006, 2007 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE DataGenerator.
@@ -22 +22 @@
 
 #include <iostream>
+
 #include "ossie/ossieSupport.h"
 
 #include "DataGenerator.h"
-
-using namespace standardInterfaces;  // For standard OSSIE interface classes
 
 
@@ -38 +37 @@
     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 DataGenerator(orb, argc, argv);
 
     DataGenerator_i* datagenerator_servant;
@@ -53 +44 @@
     // Create the datagenerator component servant and object reference
 
-    datagenerator_servant = new DataGenerator_i(uuid, component_running);
+    datagenerator_servant = new DataGenerator_i(DataGenerator.getUuid(), component_running);
     datagenerator_var = datagenerator_servant->_this();
-
-    // For Resource port
     datagenerator_servant->post_constructor(datagenerator_var);
 
-    orb->bind_object_to_name((CORBA::Object_ptr) datagenerator_var, label);
+    PortableServer::ObjectId_var servantId = orb->poa->reference_to_id(datagenerator_var);
+
+    DataGenerator.bind(datagenerator_var);
 
     // This bit is ORB specific
@@ -67 +58 @@
 
     component_running->wait();
-    orb->unbind_name(label);
+
+    DataGenerator.unbind();
+
+    DEBUG(4, DataGenerator, "Deactivate object.");
+    orb->poa->deactivate_object(servantId);
+
+    DEBUG(4, DataGenerator, "Destroy POA.");
+    orb->poa->destroy(false, false);
+
+    DEBUG(4, DataGenerator, "Shutdown orb.");
     orb->orb->shutdown(0);
-
 }