Changeset 4935

Timestamp:

08/31/07 14:54:58 (6 years ago)

Author:

jgaeddert

Message:

reverting to sdrf2007 framework

Location:

components/Interpolator/branches/Interpolator-metadata

Files:

• Interpolator.spd.xml (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• main.cpp (modified) (5 diffs)

components/Interpolator/branches/Interpolator-metadata/Interpolator.spd.xml

@@ -11 +11 @@
     </author>
     <propertyfile type="PRF">
-        <localfile name="Interpolator.prf.xml"/>
+        <localfile name="xml/Interpolator/Interpolator.prf.xml"/>
     </propertyfile>
     <descriptor>
-        <localfile name="Interpolator.scd.xml"/>
+        <localfile name="xml/Interpolator/Interpolator.scd.xml"/>
     </descriptor>
     <implementation id="DCE:e1a41b54-21c5-11db-9618-000f1fd5acd7" aepcompliance="aep_compliant">
         <description>Default Description</description> 
         <code type="Executable">
-            <localfile name="/bin/Interpolator"/>
+            <localfile name="bin/Interpolator"/>
         </code>
         <processor name="x86"/>

components/Interpolator/branches/Interpolator-metadata/Makefile.am

@@ -3 +3 @@
 
 ossieName = Interpolator
-dombindir = $(prefix)/dom/bin
+dombindir = $(prefix)/bin
 dombin_PROGRAMS = Interpolator
 
-xmldir = $(prefix)/dom/xml/$(ossieName)
+xmldir = $(prefix)/xml/$(ossieName)
 dist_xml_DATA = Interpolator.prf.xml Interpolator.scd.xml \
 Interpolator.spd.xml 

components/Interpolator/branches/Interpolator-metadata/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2006, 2007 Virginia Polytechnic Institute and State University
+Copyright 2006 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE Interpolator.
@@ -22 +22 @@
 
 #include <iostream>
-
-#include <sched.h>
-
 #include "ossie/ossieSupport.h"
-#include "ossie/debug.h"
 
 #include "Interpolator.h"
+
+using namespace std;
+using namespace standardInterfaces;  // For standard OSSIE interface classes
 
 
@@ -34 +33 @@
 
 {
-    ossieDebugLevel = 3;
-
     ossieSupport::ORB *orb = new ossieSupport::ORB;
     omni_mutex component_running_mutex;
     omni_condition *component_running = new omni_condition(&component_running_mutex);
 
-    ossieSupport::ossieComponent interpolator(orb, argc, argv);
+    if (argc != 3) {
+        cout << argv[0] << " <id> <usage name> " << endl;
+        exit (-1);
+    }
+
+    char *uuid = argv[1];
+    char *label = argv[2];
+
+    cout << "Identifier - " << uuid << "  Label - " << label << endl;
 
     Interpolator_i* interpolator_servant;
@@ -47 +52 @@
     // Create the interpolator component servant and object reference
 
-    interpolator_servant = new Interpolator_i(interpolator.getUuid(), component_running);
+    interpolator_servant = new Interpolator_i(uuid, component_running);
     interpolator_var = interpolator_servant->_this();
 
-    PortableServer::ObjectId_var servantId = orb->poa->reference_to_id(interpolator_var);
-    interpolator.bind(interpolator_var);
+    orb->bind_object_to_name((CORBA::Object_ptr) interpolator_var, label);
 
     // This bit is ORB specific
@@ -59 +63 @@
 
     component_running->wait();
-
-    DEBUG(4, Interpolator, "About to unbind.");
-    interpolator.unbind();
-
-    DEBUG(4, Interpolator, "Deactivate object.");
-    orb->poa->deactivate_object(servantId);
-
-    DEBUG(4, Interpolator, "Destroy POA.");
-    orb->poa->destroy(false, false);
-
-    DEBUG(4, Interpolator, "About to shutdown orb.");
+    orb->unbind_name(label);
     orb->orb->shutdown(0);