Changeset 3798

Timestamp:

05/16/07 15:58:22 (6 years ago)

Author:

ttsou

Message:

updated to work with CF 3979

Location:

components/GenericAssControl/trunk/GenericAssControl

Files:

• Makefile.am (modified) (2 diffs)
• cf.idl (deleted)
• configure.ac (modified) (2 diffs)
• main.cpp (modified) (3 diffs)
• port_impl.h (modified) (1 diff)

components/GenericAssControl/trunk/GenericAssControl/Makefile.am

@@ -1 @@
-%SK.cpp %.h : %.idl
-        @IDL@ @IDL_FLAGS@ -I@oldincludedir@ -bcxx -Wbh=.h -Wbs=SK.cpp -Wbkeep_inc_path $<
-
-%.idl :
-        cp @SI_PATH@/standardinterfaces/$@ .
-
 AM_CXXFLAGS = -Wall 
-
-BUILT_SOURCES = cfSK.cpp cf.idl 
-CLEANFILES = cfSK.cpp cf.idl cf.h 
 
 ossieName = GenericAssControl
@@ -18 +9 @@
 
 GenericAssControl_SOURCES = GenericAssControl.cpp GenericAssControl.h main.cpp port_impl.cpp port_impl.h
-nodist_GenericAssControl_SOURCES = cfSK.cpp 
 

components/GenericAssControl/trunk/GenericAssControl/configure.ac

@@ -14 +14 @@
 AC_LANG_PUSH([C++])
 
-AC_CHECK_LIB([omniORB4], [main], [], [AC_MSG_ERROR([cannot find omniORBi4 library])])
-AC_CHECK_LIB([omniDynamic4], [main], [], [AC_MSG_ERROR([cannot find omniDynamic4 library])])
+AC_CHECK_LIB([omniORB4], [main], [], [AC_MSG_ERROR([cannot find omniORB library])])
+AC_CHECK_LIB([omnithread], [main], [], [AC_MSG_ERROR([cannot find omnithread library])])
+AC_CHECK_LIB([omniDynamic4], [main], [], [AC_MSG_ERROR([cannot find omniDynamic library])])
 AC_CHECK_HEADERS([omniORB4/CORBA.h], [], [AC_MSG_ERROR([cannot find omniORB4 header files])])
+AC_CHECK_PROG([IDL], [omniidl], [omniidl], [AC_MSG_ERROR([cannot find omniidl prgram])])
 
 AC_LANG_POP
 
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"
-PKG_CHECK_MODULES(OSSIE, ossie >= 0.0.1,,exit)
+PKG_CHECK_MODULES(OSSIE, ossie >= 0.6.0,,exit)
 CXXFLAGS="$CXXFLAGS $OSSIE_CFLAGS"
 LIBS="$LIBS $OSSIE_LIBS"
@@ -27 +29 @@
 AC_SUBST(IDL_FLAGS)
 
-PKG_CHECK_MODULES(SI, standardInterfaces >= 0.0.1,,exit)
+PKG_CHECK_MODULES(SI, standardInterfaces >= 0.6.0,,exit)
 SI_PATH=`pkg-config --variable=includedir standardInterfaces`
 AC_SUBST(SI_PATH)

components/GenericAssControl/trunk/GenericAssControl/main.cpp

@@ -23 +23 @@
 #include <iostream>
 #include "ossie/ossieSupport.h"
+#include "ossie/debug.h"
 
 #include "GenericAssControl.h"
@@ -28 +29 @@
 using namespace std;
 
-
 int main(int argc, char* argv[])
 
 {
+    ossieDebugLevel = 5;
+
+    DEBUG(5, GenericAssControl, "Starting component");
+
     ossieSupport::ORB *orb = new ossieSupport::ORB;
     omni_mutex component_running_mutex;
     omni_condition *component_running = new omni_condition(&component_running_mutex);
 
-    if (argc != 3) {
-        cout << argv[0] << " <id> <usage name> " << endl;
-        exit (-1);
-    }
+    DEBUG(5, GenericAssControl, "Creating ossieComponent");
+    ossieSupport::ossieComponent genericAssControl(orb, argc, argv);
 
-    char *uuid = argv[1];
-    char *label = argv[2];
-
-    cout << "Identifier - " << uuid << "  Label - " << label << endl;
-
+    // Create the genericasscontrol component servant and object reference
     GenericAssControl_i* genericasscontrol_servant;
     CF::Resource_var genericasscontrol_var;
+    genericasscontrol_servant = new GenericAssControl_i(
+        genericAssControl.getUuid(), component_running);
 
-    // Create the genericasscontrol component servant and object reference
-
-    genericasscontrol_servant = new GenericAssControl_i(uuid, component_running);
     genericasscontrol_var = genericasscontrol_servant->_this();
 
-    orb->bind_object_to_name((CORBA::Object_var) genericasscontrol_var, label);
-
+    genericAssControl.bind(genericasscontrol_var);
+    
     // This bit is ORB specific
     // omniorb is threaded and the servants are running at this point
@@ -62 +59 @@
 
     component_running->wait();
-    orb->unbind_name(label);
+    genericAssControl.unbind(); 
     orb->orb->shutdown(0);
 

components/GenericAssControl/trunk/GenericAssControl/port_impl.h

@@ -27 +27 @@
 #include "ossie/Resource_impl.h"
 #include "GenericAssControl.h"
-
-#include "cf.h"
 
 // Declaration for provides ports