Changeset 4476

Timestamp:

07/19/07 14:47:18 (6 years ago)

Author:

jgaeddert

Message:

updating main.cpp, .spd.xml in FileInput?

Location:

components/FileInput/trunk/FileInput

Files:

• FileInput.spd.xml (modified) (1 diff)
• main.cpp (modified) (4 diffs)

components/FileInput/trunk/FileInput/FileInput.spd.xml

@@ -12 +12 @@
     </author>
     <propertyfile type="PRF">
-        <localfile name="xml/FileInput/FileInput.prf.xml"/>
+        <localfile name="FileInput.prf.xml"/>
     </propertyfile>
     <descriptor>
-        <localfile name="xml/FileInput/FileInput.scd.xml"/>
+        <localfile name="FileInput.scd.xml"/>
     </descriptor>
     <implementation id="DCE:3855c5c0-6db5-11db-b780-00123f63025f" aepcompliance="aep_compliant">
-        <description>Default Description</description> 
+        <description>Default implementation description</description> 
         <code type="Executable">
-            <localfile name="bin/FileInput"/>
+            <localfile name="/bin/FileInput"/>
         </code>
         <processor name="x86"/>

components/FileInput/trunk/FileInput/main.cpp

@@ -22 +22 @@
 
 #include <iostream>
+
 #include "ossie/ossieSupport.h"
 #include "ossie/debug.h"
@@ -27 +28 @@
 #include "FileInput.h"
 
+
 int main(int argc, char* argv[])
 
 {
+    ossieDebugLevel = 3;
+
     ossieSupport::ORB *orb = new ossieSupport::ORB;
     omni_mutex component_running_mutex;
     omni_condition *component_running = new omni_condition(&component_running_mutex);
 
-    ossieDebugLevel = 5;
-
-    if (argc != 3) {
-        std::cout << argv[0] << " <id> <usage name> " << std::endl;
-        exit (-1);
-    }
-
-    char *uuid = argv[1];
-    char *label = argv[2];
-
-    DEBUG(1, FileInput, "Identifier - " << uuid << "  Label - " << label)
+    ossieSupport::ossieComponent fileinput(orb, argc, argv);
 
     FileInput_i* fileinput_servant;
@@ -51 +45 @@
     // Create the fileinput component servant and object reference
 
-    fileinput_servant = new FileInput_i(uuid, component_running);
+    fileinput_servant = new FileInput_i(fileinput.getUuid(), component_running);
     fileinput_var = fileinput_servant->_this();
-    fileinput_servant->post_constructor(fileinput_var);
 
-    orb->bind_object_to_name((CORBA::Object_ptr) fileinput_var, label);
+    PortableServer::ObjectId_var servantId = orb->poa->reference_to_id(fileinput_var);
+
+    fileinput.bind(fileinput_var);
 
     // This bit is ORB specific
@@ -63 +58 @@
 
     component_running->wait();
-    orb->unbind_name(label);
+
+    fileinput.unbind();
+
+    DEBUG(4, FileInput, "Deactivate object.");
+    orb->poa->deactivate_object(servantId);
+
+    DEBUG(4, FileInput, "Destroy POA.");
+    orb->poa->destroy(false, false);
+
+    DEBUG(4, FileInput, "Shutdown orb.");
     orb->orb->shutdown(0);