Merged revisions 81119-81120,81123-81125,81133 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/ACE

........
  r81119 | jtc | 2008-03-27 09:09:33 -0500 (Thu, 27 Mar 2008) | 1 line
  
  ChangeLogTag: Thu Mar 27 14:07:27 UTC 2008  J.T. Conklin  <jtc@acorntoolworks.com>
........
  r81120 | jtc | 2008-03-27 09:12:37 -0500 (Thu, 27 Mar 2008) | 1 line
  
  ChangeLogTag: Thu Mar 27 14:07:27 UTC 2008  J.T. Conklin  <jtc@acorntoolworks.com>
........
  r81123 | johnnyw | 2008-03-27 10:53:47 -0500 (Thu, 27 Mar 2008) | 1 line
  
  Thu Mar 27 15:52:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r81124 | johnnyw | 2008-03-27 11:18:25 -0500 (Thu, 27 Mar 2008) | 1 line
  
  Thu Mar 27 16:17:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r81125 | mitza | 2008-03-27 11:29:59 -0500 (Thu, 27 Mar 2008) | 1 line
  
  ChangeLogTag: Thu Mar 27 16:27:44 UTC 2008  Adam Mitz  <mitza@ociweb.com>
........
  r81133 | johnnyw | 2008-03-27 14:09:50 -0500 (Thu, 27 Mar 2008) | 1 line
  
  Thu Mar 27 19:09:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........

12 files changed, 132 insertions, 11 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 33a4ec95f0f..c0543828ee7 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,39 @@
+Thu Mar 27 19:09:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+        * bin/tao_other_tests.lst:
+          Diabled 3251/3252 in a static build
+
+Thu Mar 27 16:27:44 UTC 2008  Adam Mitz  <mitza@ociweb.com>
+
+        * ace/Object_Manager.cpp:
+
+          In Win32 debug builds with ACE_DISABLE_WIN32_ERROR_WINDOWS, also
+          redirect assert messages to stderr instead of GUI message boxes.
+
+Thu Mar 27 16:17:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/ACE-bug-process.html:
+        * docs/ACE-development-process.html:
+        * docs/ACE-guidelines.html:
+        * docs/usage-bugzilla.html:
+          Updated bugzilla location
+
+Thu Mar 27 15:52:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/modules/VXTestProjectCreator.pm:
+        * bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm:
+        * bin/MakeProjectCreator/templates/vxtest.mpd:
+          New MPC generator called vxtest. This will generate the loading
+          of the downloadable kernel modules for an application.
+
+Thu Mar 27 14:07:27 UTC 2008  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          #include <byteswap.h> in HAS_BSWAP_{16,32,64} feature tests.
+          Resolves bugzilla issue #3134.
+
 Thu Mar 27 12:54:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * include/makeinclude/platform_vxworks6.3.GNU:
diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp
index 313eb6a116a..aa46d5191e3 100644
--- a/ACE/ace/Object_Manager.cpp
+++ b/ACE/ace/Object_Manager.cpp
@@ -249,6 +249,8 @@ ACE_Object_Manager::init (void)
           // This will keep the ACE_Assert window
           _CrtSetReportMode( _CRT_ERROR, _CRTDBG_MODE_FILE );
           _CrtSetReportFile( _CRT_ERROR, _CRTDBG_FILE_STDERR );
+          _CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_FILE );
+          _CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDERR );
 #endif /* _DEBUG && _MSC_VER || __INTEL_COMPILER */
 
           // The system does not display the critical-error-handler message box
diff --git a/ACE/bin/MakeProjectCreator/modules/VXTestProjectCreator.pm b/ACE/bin/MakeProjectCreator/modules/VXTestProjectCreator.pm
new file mode 100644
index 00000000000..43e9fccfcbb
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/modules/VXTestProjectCreator.pm
@@ -0,0 +1,40 @@
+package VXTestProjectCreator;
+
+# ************************************************************
+# Description   : A Project Creator for VxWorks testing
+# Author        : Johnny Willemsen
+# Create Date   : 3/27/2008
+# ************************************************************
+
+# ************************************************************
+# Pragmas
+# ************************************************************
+
+use strict;
+
+use ProjectCreator;
+
+use vars qw(@ISA);
+@ISA = qw(ProjectCreator);
+
+# ************************************************************
+# Subroutine Section
+# ************************************************************
+
+sub project_file_name {
+  my($self) = shift;
+  my($name) = shift;
+
+  if (!defined $name) {
+    $name = $self->project_name();
+  }
+
+  return $self->get_modified_project_file_name($name, '.vxtest');
+}
+
+sub get_template {
+  #my($self) = shift;
+  return 'vxtest';
+}
+
+1;
diff --git a/ACE/bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm b/ACE/bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm
new file mode 100644
index 00000000000..cc250e56558
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm
@@ -0,0 +1,29 @@
+package VXTestWorkspaceCreator;
+
+# ************************************************************
+# Description   : VxTest Workspace create
+# Author        : Johnny Willemsen
+# Create Date   : 28/03/2008
+# ************************************************************
+
+# ************************************************************
+# Pragmas
+# ************************************************************
+
+use strict;
+
+use VXTestProjectCreator;
+use WorkspaceCreator;
+
+use vars qw(@ISA);
+@ISA = qw(WorkspaceBase WorkspaceCreator);
+
+# ************************************************************
+# Subroutine Section
+# ************************************************************
+
+sub write_workspace {
+  return 1;
+}
+
+1;
diff --git a/ACE/bin/MakeProjectCreator/templates/vxtest.mpd b/ACE/bin/MakeProjectCreator/templates/vxtest.mpd
new file mode 100644
index 00000000000..45fea162567
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/templates/vxtest.mpd
@@ -0,0 +1,5 @@
+# VxWorks test file
+
+<%foreach(reverse(libs))%>
+ld < lib<%lib%>.so
+<%endfor%>
diff --git a/ACE/bin/tao_orb_tests.lst b/ACE/bin/tao_orb_tests.lst
index c30f63a3094..473aed5f17f 100644
--- a/ACE/bin/tao_orb_tests.lst
+++ b/ACE/bin/tao_orb_tests.lst
@@ -119,7 +119,7 @@ TAO/tests/Bug_3154_Regression/run_test.pl: !NO_IFR !LabVIEW_RT
 TAO/tests/Bug_3163_Regression/run_test.pl: !LabVIEW_RT
 TAO/tests/Bug_3171_Regression/run_test.pl: !ST !MINIMUM !NO_MESSAGING !LabVIEW_RT
 TAO/tests/Bug_3198_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !LabVIEW_RT
-TAO/tests/Bug_3251_Regression/run_test.pl: !ST !LabVIEW_RT !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/Bug_3251_Regression/run_test.pl: !ST !LabVIEW_RT !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC
 TAO/tests/DIOP/run_test.pl: !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO !LabVIEW_RT
 TAO/tests/DIOP/run_test_ipv6.pl: IPV6 !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO !LabVIEW_RT
 TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !LabVIEW_RT
diff --git a/ACE/bin/tao_other_tests.lst b/ACE/bin/tao_other_tests.lst
index a72048fa7b0..f53da2dac45 100644
--- a/ACE/bin/tao_other_tests.lst
+++ b/ACE/bin/tao_other_tests.lst
@@ -124,7 +124,7 @@ TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.rt.conf: IPV6 !ST !STATIC
 TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
 TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
 TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
-TAO/orbsvcs/tests/Notify/Bug_3252_Regression/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/Notify/Bug_3252_Regression/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 !STATIC
 TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
 TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
diff --git a/ACE/configure.ac b/ACE/configure.ac
index 2ea6f6481c8..eb1a92cb230 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -3445,15 +3445,24 @@ ACE_CHECK_LACKS_FUNCS(bsearch)
 
 ACE_CHECK_HAS_DEFINES([bswap16])
 if test "$ace_cv_defined_bswap16" = no; then
-  ACE_CHECK_HAS_DEFINES([bswap_16])
+  ACE_CHECK_HAS_DEFINES([bswap_16],[],[],[
+#if ACE_HAS_BYTESEX_H
+#include <byteswap.h>
+#endif])
 fi
 ACE_CHECK_HAS_DEFINES([bswap32])
 if test "$ace_cv_defined_bswap32" = no; then
-  ACE_CHECK_HAS_DEFINES([bswap_32])
+  ACE_CHECK_HAS_DEFINES([bswap_32],[],[],[
+#if ACE_HAS_BYTESEX_H
+#include <byteswap.h>
+#endif])
 fi
 ACE_CHECK_HAS_DEFINES([bswap64])
 if test "$ace_cv_defined_bswap64" = no; then
-  ACE_CHECK_HAS_DEFINES([bswap_64])
+  ACE_CHECK_HAS_DEFINES([bswap_64],[],[],[
+#if ACE_HAS_BYTESEX_H
+#include <byteswap.h>
+#endif])
 fi
 
 ACE_CHECK_LACKS_FUNCS(chdir)
diff --git a/ACE/docs/ACE-bug-process.html b/ACE/docs/ACE-bug-process.html
index e4677356275..7258761bae7 100644
--- a/ACE/docs/ACE-bug-process.html
+++ b/ACE/docs/ACE-bug-process.html
@@ -73,7 +73,7 @@ by ourselves or our sponsors we'll try to fix it as time permits. <P>
 </OL>
 
 <LI> You should also consider entering your bug report into our <A
-HREF="http://deuce.doc.wustl.edu/bugzilla/index.cgi">bug tracking
+HREF="http://bugzilla.dre.vanderbilt.edu/">bug tracking
 database</A> so that it's archived for future processing.  As usual,
 we try to address these bugs as time permits, but may not get to them
 for a while unless it affects our work or the work of our
@@ -156,7 +156,7 @@ with our software here's the process for submitting it:
 
 <LI> Create a ``unified diff'' and put this into Bugzilla at <P>
 
-  <A HREF="http://deuce.doc.wustl.edu/bugzilla/index.cgi">http://deuce.doc.wustl.edu/bugzilla/index.cgi</A> <P>
+  <A HREF="http://bugzilla.dre.vanderbilt.edu/">http://bugzilla.dre.vanderbilt.edu/</A> <P>
 
   and send an email to the appropriate <A
 HREF="http://www.cs.wustl.edu/~schmidt/ACE-mail.html">mailing
diff --git a/ACE/docs/ACE-development-process.html b/ACE/docs/ACE-development-process.html
index 5c4717c199c..07f90f9f317 100644
--- a/ACE/docs/ACE-development-process.html
+++ b/ACE/docs/ACE-development-process.html
@@ -41,7 +41,7 @@ The ACE+TAO+CIAO development process looks like:<p>
 <ol>
   <li>Every change to ACE+TAO must have a bug report.  <em>Change</em>
     includes fixes, enhancements, updates, and so on.
-  <li><a href="http://deuce.doc.wustl.edu/bugzilla/index.cgi">Create a
+  <li><a href="http://bugzilla.dre.vanderbilt.edu/">Create a
 bug report</a>.
   <li>Accept the bug report if you are going to implement the change.
   <li>Implement the change in your workspace(s).
diff --git a/ACE/docs/ACE-guidelines.html b/ACE/docs/ACE-guidelines.html
index b224d2f841f..d53b0042f63 100644
--- a/ACE/docs/ACE-guidelines.html
+++ b/ACE/docs/ACE-guidelines.html
@@ -1069,7 +1069,7 @@ public:
           visibility)  singleton templates prior to typedefs that
           reference them.  This prevents g++ 4.0 from silently making
           their visibility hidden (see <a
-            href="http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2260">Bug 2260</a> for details).
+            href="http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2260">Bug 2260</a> for details).
         </p>
       </li>
       <li>
diff --git a/ACE/docs/usage-bugzilla.html b/ACE/docs/usage-bugzilla.html
index 8d0e1a0d342..272e3419c63 100644
--- a/ACE/docs/usage-bugzilla.html
+++ b/ACE/docs/usage-bugzilla.html
@@ -33,8 +33,8 @@
     <p>
       The bug tracking system is located at the following web site:
       <samp>
-	<a href="http://deuce.doc.wustl.edu/bugzilla/index.cgi">
-	  http://deuce.doc.wustl.edu/bugzilla/index.cgi
+	<a href="http://bugzilla.dre.vanderbilt.edu/">
+	  http://bugzilla.dre.vanderbilt.edu/
 	</a>
       </samp>