Changeset 6162

Timestamp:

01/17/08 09:21:35 (5 years ago)

Author:

balister

Message:

Convert main.cpp to use ossieResource template class.

Files:

• components/RxDemo/trunk/RxDemo/main.cpp (modified) (3 diffs)

components/RxDemo/trunk/RxDemo/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2006 Virginia Polytechnic Institute and State University
+Copyright 2006, 2008 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE RxDemo.
@@ -24 +24 @@
 
 #include "ossie/ossieSupport.h"
+#include "ossie/ossieResource.h"
 #include "ossie/debug.h"
 
@@ -35 +36 @@
     DEBUG(5, RxDemo, "Starting component.");
 
-    ossieSupport::ORB *orb = new ossieSupport::ORB;
-    omni_mutex component_running_mutex;
-    omni_condition *component_running = new omni_condition(&component_running_mutex);
+    ossieResource<RxDemo_i> RxDemo(argc, argv);
 
-    DEBUG(5, RxDemo, "Creating ossieComponent.");
-    ossieSupport::ossieComponent rxDemo(orb, argc, argv);
-
-    RxDemo_i* rxdemo_servant;
-    CF::Resource_var rxdemo_var;
-
-    // Create the rxdemo component servant and object reference
-
-    rxdemo_servant = new RxDemo_i(rxDemo.getUuid(), component_running);
-    rxdemo_var = rxdemo_servant->_this();
-
-    rxDemo.bind(rxdemo_var);
-
-    // This bit is ORB specific
-    // omniorb is threaded and the servants are running at this point
-    // so we block on the condition
-    // The releaseObject method clear the condition and the component exits
-
-    component_running->wait();
-    rxDemo.unbind();
-    orb->orb->shutdown(0);
+    RxDemo.run();
 
 }