ChangeLogTag:Wed Dec 5 12:37:56 2001 Carlos O'Ryan <coryan@uci.edu>

5 files changed, 5 insertions, 49 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index da3e49ba497..dfa7f447f7e 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -2637,21 +2637,6 @@ not apply.  See the comments at the top of the script itself for usage
 information.
 
 <P><hr align=left width="50%"><P>
-<H4><A NAME="corba">Building CORBA Versions of ACE</A></H4>
-
-Note that if you are compiling with IONA's Orbix implementation of
-CORBA or Visigenix's implementation of CORBA, you'll also need to set
-ORBIX_ROOT to point to the root of the Orbix source tree and
-ORBELINE_ROOT to point to the root of the ORBeline source tree.  Since
-many platforms don't have these CORBA tools the default for ACE does
-*not* incorporate them.  Thus, if you are compiling with Orbix or
-ORBeline, make sure that you set up
-$ACE_ROOT/include/makeinclude/platform_macros.GNU and
-$ACE_ROOT/ace/config.h to use the config* and platform*
-files that have "-orbix" in them!
-
-
-<P><hr align=left width="50%"><P>
 <H4><A NAME="mvs">Additional Build Tips for MVS</A></H4>
 
 For all intents and purpose, MVS OpenEdition (OE) is another flavor of
@@ -2731,7 +2716,6 @@ fast             Enable -fast option, e.g., with Sun C++.
 inline           Enable ACE inlining.  Some platforms enable inlining by
                    default, others do not.
 optimize         Enable optimization; see OCFLAGS and OCCFLAGS.
-orbix            Enable use of Orbix.
 pace             Enable PACE as the underpinnings of ACE_OS.
 probe            Enable ACE_Timeprobes.
 profile          Enable profiling; see PCFLAGS and PCCFLAGS.
diff --git a/FAQ b/FAQ
index 3eb0a5feeed..0fdfc67fb25 100644
--- a/FAQ
+++ b/FAQ
@@ -409,28 +409,12 @@ that, but I don't think it would be all that difficult.
 ----------------------------------------
 13. 
 
-> 	Is the non CORBA version still aroung? I think I still need it from the
-> follow error, or is something else?
+> 	Is the Orbix (aka CORBA) version still around?
 
-Aha, there are two ways to get around this problem:
+Nope, IONA does not support Orbix-2.X nor Orbix-3.0 anymore (the
+versions of Orbix that the ACE code was based upon).  Plus we didn't
+maintain this code for ages, so it probably was broken too.
 
-1. Set your ORBIX_ROOT environment variable to the location of the
-   Orbix release (e.g., /opt/Orbix).  Naturally, this only works
-   if you've got Orbix installed on your machine.
-
-2. If you don't have Orbix, then to get rid of that problem all you
-   need to do is change the symbolic links on the 
-
-./include/config.h
-./include/makeinclude/platform_macros.GNU
-
-files to 
-
-./include/config-sunos5-sunc++-4.x
-./include/makeinclude/platform_sunos5_sunc++.GNU
-
-rather than the *-orbix* versions, which they point to by default.
-And then recompile ACE.
 ----------------------------------------
 14. 
 > We are using your ACE software and ran into a problem which may or may not
diff --git a/README b/README
index ef6034bc58e..d8c63738ab4 100644
--- a/README
+++ b/README
@@ -110,11 +110,6 @@ following class categories:
                 -- Components for managing dynamically allocation
                    of shared and local memory;
 
-        . CORBA integration
-                -- Integrates ACE with CORBA implementations
-                   (such as single-threaded and multi-threaded
-                   Orbix and Visibroker for C++).
-
 ----------------------------------------
 
 Distributed Services and Components
diff --git a/TODO b/TODO
index 9f26c5f08f7..0ed9924d5f0 100644
--- a/TODO
+++ b/TODO
@@ -29,8 +29,7 @@ ACE/TAO Configuration Project
 11.	Write documentation on how to maintain the Autoconf and Automake files.
 	HOWTOs/tutorials on how to use Auto{conf,make} and libtool would be
 	good, too.
-12.	Implement remaining configure script options (e.g. --enable-optimize,
-	--with-orbix).
+12.	Implement remaining configure script options (e.g. --enable-optimize).
 13.	Make sure all of the ACE feature macros are supported by the configure
 	script.
 14.	Modify ace/Makefile.am and tao/Makefile.am so that the template
@@ -172,9 +171,6 @@ ACE/TAO Configuration Project
    emulated condition variable (NT and VxWorks). */
 #undef ACE_HAS_OPTIMIZED_MESSAGE_QUEUE
 
-/* Platform has Orbix CORBA implementation */
-#undef ACE_HAS_ORBIX
-
 /* Purify'ing.  Defined on command line. */
 #undef ACE_HAS_PURIFY
 
diff --git a/acconfig.h b/acconfig.h
index d7871b80523..b4ec9cdc6f2 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -580,9 +580,6 @@
    the emulated condition variable (NT and VxWorks). */
 #undef ACE_HAS_OPTIMIZED_MESSAGE_QUEUE
 
-/* Platform has Orbix CORBA implementation */
-#undef ACE_HAS_ORBIX
-
 /* Platform supports the OSF TLI timod STREAMS module */
 #undef ACE_HAS_OSF_TIMOD_H