ChangeLogTag: Sun Jan 23 01:54:59 2005 Marek Brudka <mbrudka@aster.pl>

8 files changed, 9 insertions, 38 deletions

diff --git a/TAO/examples/AMI/FL_Callback/.cvsignore b/TAO/examples/AMI/FL_Callback/.cvsignore
new file mode 100644
index 00000000000..3a6a218885f
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/.cvsignore
@@ -0,0 +1,2 @@
+peer
+progress
diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
index c7e9ff8910b..3830cb052d3 100644
--- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
+++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*progress): taoexe, strategies, messaging, ami, portableserver {
-  requires += fl_reactor
+project(*progress): taoexe, messaging, ami, portableserver, tao_flresource {
   Source_Files {
     Progress_i.cpp
     progress.cpp
@@ -10,7 +9,6 @@ project(*progress): taoexe, strategies, messaging, ami, portableserver {
 }
 
 project(*peer): taoexe, strategies, messaging, ami, portableserver {
-  requires += fl_reactor
   Source_Files {
     Peer_i.cpp
     peer.cpp
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
index 8232c22e756..2712dc47ff5 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
@@ -2,8 +2,6 @@
 
 #include "Progress_i.h"
 
-#if defined(ACE_HAS_FL)
-
 #include <FL/Fl_Slider.h>
 #include <FL/Fl_Button.h>
 
@@ -170,6 +168,3 @@ Progress_Window::start ()
       ACE_ENDTRY;
     }
 }
-
-
-#endif /* ACE_HAS_FL */
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h
index 32692219f10..efb915e3b52 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.h
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.h
@@ -18,8 +18,6 @@
 
 #include "testS.h"
 
-#if defined(ACE_HAS_FL)
-
 #include <FL/Fl_Box.h>
 
 class Progress_Window : public Fl_Box
@@ -91,6 +89,4 @@ private:
   // Display the graphics...
 };
 
-#endif /* ACE_HAS_FL */
-
 #endif /* PROGRESS_I_H */
diff --git a/TAO/examples/AMI/FL_Callback/README b/TAO/examples/AMI/FL_Callback/README
index 134cce782e1..59c3cd0ba9a 100644
--- a/TAO/examples/AMI/FL_Callback/README
+++ b/TAO/examples/AMI/FL_Callback/README
@@ -5,7 +5,7 @@ GUI components.
 
 	Run as:
 
-$ ./progress -p 4 -i 10000 -ORBSvcConf svc.conf
+$ ./progress -p 4 -i 10000
 $ ./peer -n 1 -t 10000 -ORBSvcConf peer.conf
 $ ./peer -n 2 -t 10000 -ORBSvcConf peer.conf
 $ ./peer -n 4 -t 10000 -ORBSvcConf peer.conf
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index 4e16631d0d7..d5d9556a839 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -2,22 +2,13 @@
 
 #include "Progress_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+#include "tao/FlResource_Loader.h"
 
-ACE_RCSID (FL_Callback, 
-           progress, 
+ACE_RCSID (FL_Callback,
+           progress,
            "$Id$")
 
-#if !defined (ACE_HAS_FL)
-
-int main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "This example requires FL support\n"));
-  return 0;
-}
-
-#else
-
 #include <FL/Fl.h>
 #include <FL/Fl_Window.h>
 
@@ -64,6 +55,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
+  TAO::FlResource_Loader fl_loader;
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -150,5 +142,3 @@ main (int argc, char *argv[])
   ACE_ENDTRY;
   return 0;
 }
-
-#endif /* ACE_HAS_FL */
diff --git a/TAO/examples/AMI/FL_Callback/svc.conf b/TAO/examples/AMI/FL_Callback/svc.conf
deleted file mode 100644
index f7d75c036eb..00000000000
--- a/TAO/examples/AMI/FL_Callback/svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Advanced_Resource_Factory "-ORBReactorType fl"
diff --git a/TAO/examples/AMI/FL_Callback/svc.conf.xml b/TAO/examples/AMI/FL_Callback/svc.conf.xml
deleted file mode 100644
index 6520d125ad8..00000000000
--- a/TAO/examples/AMI/FL_Callback/svc.conf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./examples/AMI/FL_Callback/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBReactorType fl"/>
-</ACE_Svc_Conf>