diff options
101 files changed, 401 insertions, 604 deletions
diff --git a/ACE/ACEXML/apps/svcconf/svcconf.dtd b/ACE/ACEXML/apps/svcconf/svcconf.dtd index b9e6cc41c8e..bf5f399b499 100644 --- a/ACE/ACEXML/apps/svcconf/svcconf.dtd +++ b/ACE/ACEXML/apps/svcconf/svcconf.dtd @@ -1,4 +1,3 @@ -<!-- $Id$ --> <!-- Document Type Definition for XML ACE Service Config files --> <!-- An ACE_Svc_Conf document contains zero or more entries --> diff --git a/ACE/ace/ETCL/ETCL.yy b/ACE/ace/ETCL/ETCL.yy index 507b8b97408..27dd570f501 100644 --- a/ACE/ace/ETCL/ETCL.yy +++ b/ACE/ace/ETCL/ETCL.yy @@ -1,10 +1,9 @@ %{ -// $Id$ // ======================================================================== // // = LIBRARY // orbsvcs / Extended Trader Constraint Language parser. -// +// // = FILENAME // ETCL.yy // @@ -38,48 +37,48 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL %} -%token ETCL_GT -%token ETCL_GE -%token ETCL_LT +%token ETCL_GT +%token ETCL_GE +%token ETCL_LT %token ETCL_LE -%token ETCL_EQ +%token ETCL_EQ %token ETCL_NE -%token ETCL_EXIST +%token ETCL_EXIST %token ETCL_DEFAULT -%token ETCL_AND -%token ETCL_OR +%token ETCL_AND +%token ETCL_OR %token ETCL_NOT -%token ETCL_IN +%token ETCL_IN %token ETCL_TWIDDLE %token ETCL_BOOLEAN -%token ETCL_PLUS -%token ETCL_MINUS -%token ETCL_MULT +%token ETCL_PLUS +%token ETCL_MINUS +%token ETCL_MULT %token ETCL_DIV %token ETCL_UMINUS -%token ETCL_INTEGER -%token ETCL_FLOAT +%token ETCL_INTEGER +%token ETCL_FLOAT %token ETCL_STRING -%token ETCL_RPAREN +%token ETCL_RPAREN %token ETCL_LPAREN -%token ETCL_RBRA +%token ETCL_RBRA %token ETCL_LBRA %token ETCL_IDENT -%token ETCL_UNSIGNED -%token ETCL_SIGNED +%token ETCL_UNSIGNED +%token ETCL_SIGNED %token ETCL_DOUBLE -%token ETCL_CONSTRAINT -%token ETCL_COMPONENT -%token ETCL_WITH -%token ETCL_MAX +%token ETCL_CONSTRAINT +%token ETCL_COMPONENT +%token ETCL_WITH +%token ETCL_MAX %token ETCL_MIN -%token ETCL_FIRST +%token ETCL_FIRST %token ETCL_RANDOM -%token ETCL_DOLLAR +%token ETCL_DOLLAR %token ETCL_DOT -%token ETCL_DISCRIMINANT +%token ETCL_DISCRIMINANT %token ETCL_LENGTH -%token ETCL_TYPE_ID +%token ETCL_TYPE_ID %token ETCL_REPOS_ID @@ -89,7 +88,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL %type <constraint> ETCL_FLOAT %type <constraint> ETCL_INTEGER %type <constraint> expr_in -%type <constraint> constraint preference bool_or bool_and bool_compare +%type <constraint> constraint preference bool_or bool_and bool_compare %type <constraint> expr_in expr_twiddle expr term factor_not factor %type <constraint> union_pos union_val component_array %type <constraint> component_array component_assoc component_pos diff --git a/ACE/ace/ETCL/ETCL_l.cpp.diff b/ACE/ace/ETCL/ETCL_l.cpp.diff index aba0a063754..277bc317568 100644 --- a/ACE/ace/ETCL/ETCL_l.cpp.diff +++ b/ACE/ace/ETCL/ETCL_l.cpp.diff @@ -6,7 +6,6 @@ /* Scanner skeleton version: - * $Header$ -+ * $Id$ */ #define FLEX_SCANNER @@ -49,7 +48,6 @@ #define INITIAL 0 -#line 4 "ETCL.ll" +//#line 4 "ETCL/ETCL.ll" - // $Id$ // ======================================================================== // // = LIBRARY diff --git a/ACE/ace/ETCL/ETCL_y.cpp.diff b/ACE/ace/ETCL/ETCL_y.cpp.diff index ef90ad78ef4..6d6dcc055c4 100644 --- a/ACE/ace/ETCL/ETCL_y.cpp.diff +++ b/ACE/ace/ETCL/ETCL_y.cpp.diff @@ -1,42 +1,40 @@ --- bison_gen\ETCL_y.cpp 2005-07-19 09:56:06.368807400 -0700 +++ ETCL_y.cpp 2005-07-19 09:45:00.160274900 -0700 @@ -1,5 +1,6 @@ -+// $Id$ - + -/* A Bison parser, made from ETCL.yy +/* A Bison parser, made from ETCL/ETCL.yy by GNU Bison version 1.28 */ - + #define YYBISON 1 /* Identify Bison output. */ @@ -48,9 +49,9 @@ #define TAO_ETCL_TYPE_ID 298 #define TAO_ETCL_REPOS_ID 299 - + -#line 1 "ETCL.yy" +//#line 1 "ETCL/ETCL.yy" - + -// ETCL.yy,v 1.3 2002/01/14 19:52:28 parsons Exp -+// $Id$ // ======================================================================== // // = LIBRARY @@ -70,6 +71,7 @@ #include "ETCL_Interpreter.h" - + extern int yylex (void); +extern void yyflush_current_buffer (void); - + static void yyerror (const char *) { @@ -77,9 +79,6 @@ // Ignore error messages } - + -#ifndef YYSTYPE -#define YYSTYPE int -#endif #include <stdio.h> - + #ifndef __cplusplus @@ -293,8 +292,9 @@ -1, -1, 29, 3, 4, 5, 6, 7, 8, -1, @@ -47,22 +45,22 @@ +/* -*-C-*- Note some compilers choke on comments on `//#line' lines. */ +//#line 3 "/pkg/gnu/share/bison.simple" +/* This file comes from bison-1.28. */ - + /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -311,46 +311,66 @@ - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ - + /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. This special exception was added by the Free Software Foundation in version 1.24 of Bison. */ - + -#ifndef alloca +/* This is the parser code that is written into each bison parser + when the %semantic_parser declaration is not specified in the grammar. @@ -125,7 +123,7 @@ +#endif /* not GNU C */ +#endif /* alloca not defined */ +#endif /* YYSTACK_USE_ALLOCA not defined */ - + -/* This is the parser code that is written into each bison parser - when the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser @@ -135,7 +133,7 @@ +#else +#define YYSTACK_ALLOC malloc +#endif - + /* Note: there must be only one dollar sign in this file. It is replaced by the list of actions, each action @@ -360,8 +380,8 @@ @@ -157,18 +155,18 @@ + /* semantic values from the action */ + /* routines */ + - + #ifdef YYLSP_NEEDED YYLTYPE yylloc; /* location data for the lookahead */ @@ -443,11 +467,11 @@ #define YYMAXDEPTH 10000 #endif - + -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -int yyparse (void); -#endif -- +- +/* Define __yy_memcpy. Note that the size argument + should be passed with type unsigned int, because that is what the non-GCC + definitions require. With GCC, __builtin_memcpy takes an arg @@ -197,23 +195,23 @@ ACE_REGISTER char *t = to; + ACE_REGISTER char *f = from; ACE_REGISTER int i = count; - + while (i-- > 0) @@ -486,8 +510,8 @@ - + #endif #endif -- +- -#line 196 "/usr/local/share/bison.simple" + +//#line 217 "/pkg/gnu/share/bison.simple" - + /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -508,6 +532,15 @@ #define YYPARSE_PARAM_DECL #endif /* not YYPARSE_PARAM */ - + +/* Prevent warning if -Wstrict-prototypes. */ +#ifdef __GNUC__ +#ifdef YYPARSE_PARAM @@ -228,22 +226,22 @@ YYPARSE_PARAM_DECL @@ -536,6 +569,7 @@ #endif - + int yystacksize = YYINITDEPTH; + int yyfree_stacks = 0; - + #ifdef YYPURE int yychar; @@ -546,10 +580,6 @@ #endif #endif - + - YYSTYPE yyval; /* the variable used to return */ - /* semantic values from the action */ - /* routines */ - int yylen; - + #if YYDEBUG != 0 @@ -620,18 +650,32 @@ if (yystacksize >= YYMAXDEPTH) @@ -283,10 +281,10 @@ + size * (unsigned int) sizeof (*yylsp)); #endif #endif /* no yyoverflow */ - + @@ -792,225 +836,225 @@ switch (yyn) { - + case 3: -#line 97 "ETCL.yy" +//#line 97 "ETCL/ETCL.yy" @@ -560,14 +558,14 @@ } /* the action file gets copied in in place of this dollarsign */ -#line 498 "/usr/local/share/bison.simple" -- +- +//#line 543 "/pkg/gnu/share/bison.simple" + yyvsp -= yylen; yyssp -= yylen; #ifdef YYLSP_NEEDED @@ -1204,7 +1248,37 @@ - + yystate = yyn; goto yynewstate; + @@ -603,5 +601,5 @@ } -#line 257 "ETCL.yy" +//#line 257 "ETCL/ETCL.yy" - - + + diff --git a/ACE/ace/ETCL/ETCL_y.h.diff b/ACE/ace/ETCL/ETCL_y.h.diff index 85acf912763..a4d10074ff0 100644 --- a/ACE/ace/ETCL/ETCL_y.h.diff +++ b/ACE/ace/ETCL/ETCL_y.h.diff @@ -1,7 +1,6 @@ --- ETCL_y.h Mon Nov 12 16:07:25 2001 +++ ETCL_y.h.safe Thu Oct 11 20:53:13 2001 @@ -1,7 +1,4 @@ - // $Id$ -#ifndef YYSTYPE -#define YYSTYPE int -#endif @@ -20,6 +19,6 @@ @@ -46,5 +43,3 @@ #define TAO_ETCL_TYPE_ID 298 #define TAO_ETCL_REPOS_ID 299 - + - -extern YYSTYPE yylval; diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/checkfilelist b/ACE/apps/JAWS/clients/WebSTONE/bin/checkfilelist index b057b86962d..e75af4f9f8d 100755 --- a/ACE/apps/JAWS/clients/WebSTONE/bin/checkfilelist +++ b/ACE/apps/JAWS/clients/WebSTONE/bin/checkfilelist @@ -4,7 +4,6 @@ # # checkfilelist servername portno filelist # -# $Id$ if test "$#" -lt 3 ; then echo "usage: $0 servername portno filelist" diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/genfiles b/ACE/apps/JAWS/clients/WebSTONE/bin/genfiles index 90f8e4a4696..077e641180e 100755 --- a/ACE/apps/JAWS/clients/WebSTONE/bin/genfiles +++ b/ACE/apps/JAWS/clients/WebSTONE/bin/genfiles @@ -1,5 +1,4 @@ #! /bin/sh -# $Id$ # get configuration . $WEBSTONEROOT/conf/testbed diff --git a/ACE/apps/JAWS3/contrib/jmills_at_tga_dot_com/jaws3-msvc.pat b/ACE/apps/JAWS3/contrib/jmills_at_tga_dot_com/jaws3-msvc.pat index fed99428956..dcd8baa0f5b 100644 --- a/ACE/apps/JAWS3/contrib/jmills_at_tga_dot_com/jaws3-msvc.pat +++ b/ACE/apps/JAWS3/contrib/jmills_at_tga_dot_com/jaws3-msvc.pat @@ -2,14 +2,11 @@ diff -u -r -N ./JAWS3/jaws3/Timer.cpp /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 --- ./JAWS3/jaws3/Timer.cpp Tue Apr 25 16:24:21 2000 +++ /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3/Timer.cpp Wed May 03 10:13:27 2000 @@ -1,11 +1,11 @@ --// $Id$ -+// $Id$ - #define JAWS_BUILD_DLL - + #include "jaws3/Timer.h" #include "jaws3/Task_Timer.h" - + -JAWS_Timer::JAWS_Timer (JAWS_Timer_Impl *impl = 0) +JAWS_Timer::JAWS_Timer (JAWS_Timer_Impl *impl ) : impl_ (impl) @@ -105,7 +102,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Export.h"\ + ".\IO.h"\ + ".\Reactive_IO.h"\ -+ ++ + +.\Concurrency.cpp : \ + "..\..\..\ace\ace.h"\ @@ -251,7 +248,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Protocol_Handler.h"\ + ".\TPOOL_Concurrency.h"\ + ".\TPR_Concurrency.h"\ -+ ++ + +.\Config_File.cpp : \ + "..\..\..\ace\ace.h"\ @@ -371,7 +368,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Config_File.h"\ + ".\Export.h"\ + ".\Symbol_Table.h"\ -+ ++ + +.\Event_Completer.cpp : \ + "..\..\..\ace\basic_types.h"\ @@ -403,7 +400,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Event_Completer.h"\ + ".\Event_Result.h"\ + ".\Export.h"\ -+ ++ + +.\Event_Dispatcher.cpp : \ + "..\..\..\ace\ace.h"\ @@ -532,7 +529,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + "..\..\..\ace\ws2tcpip.h"\ + ".\Event_Dispatcher.h"\ + ".\Export.h"\ -+ ++ + +.\FILE.cpp : \ + "..\..\..\ace\ace.h"\ @@ -594,7 +591,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + "..\..\..\ace\ws2tcpip.h"\ + ".\Export.h"\ + ".\FILE.h"\ -+ ++ + +.\IO.cpp : \ + "..\..\..\ace\ace.h"\ @@ -681,7 +678,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Options.h"\ + ".\Reactive_IO.h"\ + ".\Synch_IO.h"\ -+ ++ + +.\main.cpp : \ + "..\..\..\ace\ace.h"\ @@ -794,7 +791,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + "..\..\..\ace\ws2tcpip.h"\ + ".\Event_Dispatcher.h"\ + ".\Export.h"\ -+ ++ + +.\Options.cpp : \ + "..\..\..\ace\ace.h"\ @@ -845,7 +842,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Config_File.h"\ + ".\Export.h"\ + ".\Options.h"\ -+ ++ + +.\Protocol_Handler.cpp : \ + "..\..\..\ace\ace.h"\ @@ -987,7 +984,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Event_Result.h"\ + ".\Export.h"\ + ".\Protocol_Handler.h"\ -+ ++ + +.\Reactive_IO.cpp : \ + "..\..\..\ace\ace.h"\ @@ -1079,7 +1076,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\IO.h"\ + ".\Reactive_IO.h"\ + ".\Reactive_IO_Helpers.h"\ -+ ++ + +.\Symbol_Table.cpp : \ + "..\..\..\ace\ace.h"\ @@ -1181,7 +1178,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + "..\..\..\ace\ws2tcpip.h"\ + ".\Export.h"\ + ".\Symbol_Table.h"\ -+ ++ + +.\Synch_IO.cpp : \ + "..\..\..\ace\ace.h"\ @@ -1263,7 +1260,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Export.h"\ + ".\IO.h"\ + ".\Synch_IO.h"\ -+ ++ + +.\Task_Timer.cpp : \ + "..\..\..\ace\ace.h"\ @@ -1414,7 +1411,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Task_Timer.h"\ + ".\Timer.h"\ + ".\Timer_Helpers.h"\ -+ ++ + +.\Templates.cpp : \ + "..\..\..\ace\ace.h"\ @@ -1621,7 +1618,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Timer.h"\ + ".\TPOOL_Concurrency.h"\ + ".\TPR_Concurrency.h"\ -+ ++ + +.\Timer.cpp : \ + "..\..\..\ace\ace.h"\ @@ -1771,7 +1768,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Export.h"\ + ".\Task_Timer.h"\ + ".\Timer.h"\ -+ ++ + +.\Timer_Helpers.cpp : \ + "..\..\..\ace\ace.h"\ @@ -1921,7 +1918,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Export.h"\ + ".\Timer.h"\ + ".\Timer_Helpers.h"\ -+ ++ + +.\TPOOL_Concurrency.cpp : \ + "..\..\..\ace\ace.h"\ @@ -2066,7 +2063,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Options.h"\ + ".\Protocol_Handler.h"\ + ".\TPOOL_Concurrency.h"\ -+ ++ + +.\TPR_Concurrency.cpp : \ + "..\..\..\ace\ace.h"\ @@ -2211,7 +2208,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dep /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + ".\Options.h"\ + ".\Protocol_Handler.h"\ + ".\TPR_Concurrency.h"\ -+ ++ diff -u -r -N ./JAWS3/jaws3/jaws3.dsp /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3/jaws3.dsp --- ./JAWS3/jaws3/jaws3.dsp Wed Dec 31 19:00:00 1969 +++ /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3/jaws3.dsp Wed May 03 14:22:09 2000 @@ -2225,19 +2222,19 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dsp /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 +CFG=jaws3 - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run -+!MESSAGE ++!MESSAGE +!MESSAGE NMAKE /f "jaws3.mak". -+!MESSAGE ++!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: -+!MESSAGE ++!MESSAGE +!MESSAGE NMAKE /f "jaws3.mak" CFG="jaws3 - Win32 Debug" -+!MESSAGE ++!MESSAGE +!MESSAGE Possible choices for configuration are: -+!MESSAGE ++!MESSAGE +!MESSAGE "jaws3 - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "jaws3 - Win32 Debug" (based on "Win32 (x86) Console Application") -+!MESSAGE ++!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 @@ -2294,7 +2291,7 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.dsp /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" + -+!ENDIF ++!ENDIF + +# Begin Target + @@ -2515,28 +2512,28 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.mak /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 +!IF "$(CFG)" == "" +CFG=jaws3 - Win32 Debug +!MESSAGE No configuration specified. Defaulting to jaws3 - Win32 Debug. -+!ENDIF ++!ENDIF + +!IF "$(CFG)" != "jaws3 - Win32 Release" && "$(CFG)" != "jaws3 - Win32 Debug" +!MESSAGE Invalid configuration "$(CFG)" specified. +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: -+!MESSAGE ++!MESSAGE +!MESSAGE NMAKE /f "jaws3.mak" CFG="jaws3 - Win32 Debug" -+!MESSAGE ++!MESSAGE +!MESSAGE Possible choices for configuration are: -+!MESSAGE ++!MESSAGE +!MESSAGE "jaws3 - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "jaws3 - Win32 Debug" (based on "Win32 (x86) Console Application") -+!MESSAGE ++!MESSAGE +!ERROR An invalid configuration is specified. -+!ENDIF ++!ENDIF + +!IF "$(OS)" == "Windows_NT" +NULL= -+!ELSE ++!ELSE +NULL=nul -+!ENDIF ++!ENDIF + +CPP=cl.exe +RSC=rc.exe @@ -2578,13 +2575,13 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.mak /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 +"$(INTDIR)" : + if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" + -+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\.." /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\jaws3.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ++CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\.." /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\jaws3.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +BSC32=bscmake.exe -+BSC32_FLAGS=/nologo /o"$(OUTDIR)\jaws3.bsc" ++BSC32_FLAGS=/nologo /o"$(OUTDIR)\jaws3.bsc" +BSC32_SBRS= \ -+ ++ +LINK32=link.exe -+LINK32_FLAGS=ace.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\jaws3-r.pdb" /machine:I386 /out:"$(OUTDIR)\jaws3-r.exe" /libpath:"..\..\..\ace" ++LINK32_FLAGS=ace.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\jaws3-r.pdb" /machine:I386 /out:"$(OUTDIR)\jaws3-r.exe" /libpath:"..\..\..\ace" +LINK32_OBJS= \ + "$(INTDIR)\Asynch_IO.obj" \ + "$(INTDIR)\Concurrency.obj" \ @@ -2651,13 +2648,13 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.mak /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 +"$(INTDIR)" : + if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" + -+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\jaws3.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c ++CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\jaws3.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +BSC32=bscmake.exe -+BSC32_FLAGS=/nologo /o"$(OUTDIR)\jaws3.bsc" ++BSC32_FLAGS=/nologo /o"$(OUTDIR)\jaws3.bsc" +BSC32_SBRS= \ -+ ++ +LINK32=link.exe -+LINK32_FLAGS=aced.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\jaws3.pdb" /debug /machine:I386 /out:"$(OUTDIR)\jaws3.exe" /pdbtype:sept /libpath:"..\..\..\ace" ++LINK32_FLAGS=aced.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\jaws3.pdb" /debug /machine:I386 /out:"$(OUTDIR)\jaws3.exe" /pdbtype:sept /libpath:"..\..\..\ace" +LINK32_OBJS= \ + "$(INTDIR)\Asynch_IO.obj" \ + "$(INTDIR)\Concurrency.obj" \ @@ -2684,46 +2681,46 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.mak /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + -+!ENDIF ++!ENDIF + +.c{$(INTDIR)}.obj:: + $(CPP) @<< -+ $(CPP_PROJ) $< ++ $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< -+ $(CPP_PROJ) $< ++ $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< -+ $(CPP_PROJ) $< ++ $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< -+ $(CPP_PROJ) $< ++ $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< -+ $(CPP_PROJ) $< ++ $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< -+ $(CPP_PROJ) $< ++ $(CPP_PROJ) $< +<< + + +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("jaws3.dep") +!INCLUDE "jaws3.dep" -+!ELSE ++!ELSE +!MESSAGE Warning: cannot find "jaws3.dep" -+!ENDIF -+!ENDIF ++!ENDIF ++!ENDIF + + +!IF "$(CFG)" == "jaws3 - Win32 Release" || "$(CFG)" == "jaws3 - Win32 Debug" @@ -2823,5 +2820,5 @@ diff -u -r -N ./JAWS3/jaws3/jaws3.mak /c/dev/Win32/ACE_wrappers/apps/JAWS3/jaws3 + + + -+!ENDIF ++!ENDIF + diff --git a/ACE/apps/JAWS3/zCHANGES b/ACE/apps/JAWS3/zCHANGES index ca8720817ac..ec931fb0af6 100644 --- a/ACE/apps/JAWS3/zCHANGES +++ b/ACE/apps/JAWS3/zCHANGES @@ -1,6 +1,3 @@ -$Id$ - -$Log$ Revision 1.1 2003/08/25 07:40:34 kobica Added JAWS3 to ACE_wrappers repo diff --git a/ACE/apps/gperf/ace_gperf.texi b/ACE/apps/gperf/ace_gperf.texi index 9384503bbb1..501f1512407 100644 --- a/ACE/apps/gperf/ace_gperf.texi +++ b/ACE/apps/gperf/ace_gperf.texi @@ -1,7 +1,5 @@ \input texinfo @c -*-texinfo-*- -@c $Id$ - @include version.texi @c %**start of header @@ -498,11 +496,11 @@ particular class of static search sets. A minimal perfect hash function is defined by two properties: @itemize @bullet -@item +@item It allows keyword recognition in a static search set using at most @emph{one} probe into the hash table. This represents the ``perfect'' property. -@item +@item The actual memory allocated to store the keywords is precisely large enough for the keyword set, and @emph{no larger}. This is the ``minimal'' property. @@ -687,7 +685,7 @@ example taken from a partial list of C reserved words: @example @group -# These are a few C reserved words, see the c.@code{gperf} file +# These are a few C reserved words, see the c.@code{gperf} file # for a complete list of ANSI C reserved words. unsigned sizeof @@ -820,7 +818,7 @@ Duplicate hash values occur for two reasons: @item Since @code{gperf} does not backtrack it is possible for it to process all your input keywords without finding a unique mapping for each word. -However, frequently only a very small number of duplicates occur, and +However, frequently only a very small number of duplicates occur, and the majority of keys still require one probe into the table. @item Sometimes a set of keys may have the same names, but possess different @@ -980,7 +978,7 @@ associated value range should be, in relationship to the number of keys. If the @var{size-multiple} is negative the maximum associated value is calculated by @emph{dividing} it into the total number of keys. For example, a value of 3 means ``allow the maximum associated value to be -about 3 times larger than the number of input keys.'' +about 3 times larger than the number of input keys.'' Conversely, a value of -3 means ``allow the maximum associated value to be about 3 times smaller than the number of input keys.'' Negative @@ -1060,7 +1058,7 @@ likely to be a @emph{perfect} hash function anymore! Finally, use the @samp{-f} option if you want @code{gperf} to generate the perfect hash function @emph{fast}, with less emphasis on making it minimal. -@item +@item The size of the generate static keyword array can get @emph{extremely} large if the input keyword file is large or if the keywords are quite similar. This tends to slow down the compilation of the generated C @@ -1072,7 +1070,7 @@ large switch statements it is important to qualify the @var{-S} option with an appropriate numerical argument that controls the number of switch statements generated. -@item +@item The maximum number of key positions selected for a given key has an arbitrary limit of 126. This restriction should be removed, and if anyone considers this a problem write me and let me know so I can remove @@ -1097,7 +1095,7 @@ module is essential independent from other program modules. Additional worthwhile improvements include: @itemize @bullet -@item +@item Make the algorithm more robust. At present, the program halts with an error diagnostic if it can't find a direct solution and the @samp{-D} option is not enabled. A more comprehensive, albeit computationally @@ -1105,7 +1103,7 @@ expensive, approach would employ backtracking or enable alternative options and retry. It's not clear how helpful this would be, in general, since most search sets are rather small in practice. -@item +@item Another useful extension involves modifying the program to generate ``minimal'' perfect hash functions (under certain circumstances, the current version can be rather extravagant in the generated table size). @@ -1140,20 +1138,20 @@ determining both the minimum and maximum elements in a list. [1] Chang, C.C.: @i{A Scheme for Constructing Ordered Minimal Perfect Hashing Functions} Information Sciences 39(1986), 187-195. - + [2] Cichelli, Richard J. @i{Author's Response to ``On Cichelli's Minimal Perfec t Hash Functions Method''} Communications of the ACM, 23, 12(December 1980), 729. - + [3] Cichelli, Richard J. @i{Minimal Perfect Hash Functions Made Simple} Communications of the ACM, 23, 1(January 1980), 17-19. - + [4] Cook, C. R. and Oldehoeft, R.R. @i{A Letter Oriented Minimal Perfect Hashing Function} SIGPLAN Notices, 17, 9(September 1982), 18-27. [5] Cormack, G. V. and Horspool, R. N. S. and Kaiserwerth, M. @i{Practical Perfect Hashing} Computer Journal, 28, 1(January 1985), 54-58. - + [6] Jaeschke, G. @i{Reciprocal Hashing: A Method for Generating Minimal Perfect Hashing Functions} Communications of the ACM, 24, 12(December 1981), 829-833. diff --git a/ACE/bin/ACE-casts-convert b/ACE/bin/ACE-casts-convert index 0b158ea1afa..1c8527cfaf5 100755 --- a/ACE/bin/ACE-casts-convert +++ b/ACE/bin/ACE-casts-convert @@ -4,8 +4,6 @@ # # @file ACE-casts-convert # -# $Id$ -# # Script to convert all ACE cast macro calls (e.g. # ACE_static_cast (foo, bar)) to their standard C++ counterparts (e.g. # static_cast<foo> (bar)). diff --git a/ACE/bin/FOCUS/specializations/Context-Specific-Optimizations/Dispatch-Resolution-Optimization.spl b/ACE/bin/FOCUS/specializations/Context-Specific-Optimizations/Dispatch-Resolution-Optimization.spl index c56543cf54f..e59d369abd2 100644 --- a/ACE/bin/FOCUS/specializations/Context-Specific-Optimizations/Dispatch-Resolution-Optimization.spl +++ b/ACE/bin/FOCUS/specializations/Context-Specific-Optimizations/Dispatch-Resolution-Optimization.spl @@ -9,7 +9,6 @@ * on them * * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * $Id$ --> <transform> diff --git a/ACE/bin/FOCUS/specializations/Flushing_Strategy/Leader_Follower_Flushing_Strategy.spl b/ACE/bin/FOCUS/specializations/Flushing_Strategy/Leader_Follower_Flushing_Strategy.spl index a33b90ba255..1019274a5f2 100644 --- a/ACE/bin/FOCUS/specializations/Flushing_Strategy/Leader_Follower_Flushing_Strategy.spl +++ b/ACE/bin/FOCUS/specializations/Flushing_Strategy/Leader_Follower_Flushing_Strategy.spl @@ -7,7 +7,6 @@ * Leader_Follower flushing strategy. * * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * $Id$ --> <transform> diff --git a/ACE/bin/FOCUS/specializations/Protocol_Family/IIOP/iiop.spl b/ACE/bin/FOCUS/specializations/Protocol_Family/IIOP/iiop.spl index d0da22a42f9..190eb3e4ed9 100644 --- a/ACE/bin/FOCUS/specializations/Protocol_Family/IIOP/iiop.spl +++ b/ACE/bin/FOCUS/specializations/Protocol_Family/IIOP/iiop.spl @@ -9,7 +9,6 @@ * Acceptor and Connector implementations within ACE+TAO. * * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * $Id$ --> <transform> diff --git a/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_MT.spl b/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_MT.spl index 6d4ecf6609b..b4c0f762aa7 100644 --- a/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_MT.spl +++ b/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_MT.spl @@ -7,7 +7,6 @@ * is a select reactor. * * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * $Id$ --> <transform> @@ -156,7 +155,7 @@ virtual int register_handler (ACE_HANDLE handle, </file> -<!-- +<!-- <file name="Select_Reactor_T.inl"> <remove>#include "ace/Reactor.h"</remove> diff --git a/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_ST.spl b/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_ST.spl index 145136455a2..978055844cd 100644 --- a/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_ST.spl +++ b/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_ST.spl @@ -7,7 +7,6 @@ * is a select reactor. * * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * $Id$ --> <transform> @@ -131,7 +130,7 @@ virtual int register_handler (ACE_HANDLE handle, </file> -<!-- +<!-- <file name="Select_Reactor_T.inl"> <remove>#include "ace/Reactor.h"</remove> diff --git a/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl b/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl index 48b17f05e60..0b539aefc3a 100644 --- a/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl +++ b/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl @@ -7,7 +7,6 @@ * that are present in Select_Reactor.spl * * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * $Id$ --> <transform> diff --git a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Leader_Follower.spl b/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Leader_Follower.spl index 004ba08fc2d..98c7e5dcd7c 100644 --- a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Leader_Follower.spl +++ b/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Leader_Follower.spl @@ -6,7 +6,6 @@ * to specialize the Wait_Strategy with the TAO_Wait_On_Leader_Follower strategy * * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * $Id$ --> <transform> diff --git a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl b/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl index 65d6ff48fe7..87362026710 100644 --- a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl +++ b/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl @@ -6,7 +6,6 @@ * to specialize the Wait_Strategy with the Wait_On_Read strategy * * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * $Id$ --> <transform> diff --git a/ACE/bin/ace-install b/ACE/bin/ace-install index 6712f83de32..312fcb243ec 100755 --- a/ACE/bin/ace-install +++ b/ACE/bin/ace-install @@ -1,8 +1,5 @@ #!/bin/sh -# $Id$ - - ##################################################################### # install_ace: distill the minimal stuff out of the ACE+TAO distribution # alias cpio 'xargs -i echo {}'; # just for testing the script diff --git a/ACE/bin/ace_components b/ACE/bin/ace_components index 34cc45f2735..565aad16966 100755 --- a/ACE/bin/ace_components +++ b/ACE/bin/ace_components @@ -1,5 +1,4 @@ #! /bin/sh -# $Id$ # # Encapsulates set/access of a components file, which records set of # components that were built in a library. Intended to be used by diff --git a/ACE/bin/ace_ld b/ACE/bin/ace_ld index 0f5cc50e1b0..ac4840b2641 100755 --- a/ACE/bin/ace_ld +++ b/ACE/bin/ace_ld @@ -2,8 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; -# $Id$ -# # Drop-in replacement for "ld" that supports munching. # # The first three lines above let this script run without specifying the diff --git a/ACE/bin/aix_shr b/ACE/bin/aix_shr index 16daded8e02..489e1b2bb47 100755 --- a/ACE/bin/aix_shr +++ b/ACE/bin/aix_shr @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ # Filter out the duplicate symbol warnings from Visual Age C++ # diff --git a/ACE/bin/auto_compile b/ACE/bin/auto_compile index db6f2158703..c4ab9fae624 100755 --- a/ACE/bin/auto_compile +++ b/ACE/bin/auto_compile @@ -3,8 +3,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' if 0; # -*- perl -*- -# $Id$ -# # This script checkouts ACE from CVS, updates the "clone" directory, # compiles $ACE_ROOT/ace and $ACE_ROOT/tests and finally runs # $ACE_ROOT/tests/run_tests.sh. diff --git a/ACE/bin/auto_compile_wrapper b/ACE/bin/auto_compile_wrapper index ffdc9b803fd..26da7839f1f 100755 --- a/ACE/bin/auto_compile_wrapper +++ b/ACE/bin/auto_compile_wrapper @@ -1,7 +1,5 @@ #!/bin/sh # -# $Id$ -# # Usually cron setups a really miserable environment, this script # serves two purposes: # 1. Setup a good environment for auto_compile. diff --git a/ACE/bin/auto_ptr.perl b/ACE/bin/auto_ptr.perl index ca75bb8b4c1..e42d7ad8252 100755 --- a/ACE/bin/auto_ptr.perl +++ b/ACE/bin/auto_ptr.perl @@ -2,8 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -pi -S $0 ${1+"$@"}' & eval 'exec perl -pi -S $0 $argv:q' if 0; -# $Id$ -# # You may want to run the "find" command with this script, which maybe # something like this: # diff --git a/ACE/bin/count_lines b/ACE/bin/count_lines index f440e19c765..dde49cc6ed5 100755 --- a/ACE/bin/count_lines +++ b/ACE/bin/count_lines @@ -3,8 +3,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' if 0; # -*- perl -*- -# $Id$ -# use File::Basename; diff --git a/ACE/bin/create_ace_build b/ACE/bin/create_ace_build index 273342bbd50..987a40c47f2 100755 --- a/ACE/bin/create_ace_build +++ b/ACE/bin/create_ace_build @@ -2,8 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; -# $Id$ -# # Creates an ACE build tree in directory "build/<build name>" below the current # directory, which must be an ACE "top level" directory (such as # $ACE_ROOT). The build tree directory structure mirrors that of the ACE @@ -180,20 +178,20 @@ sub wanted { /^Static_Release\z/s && ($File::Find::prune = 1) || - ( + ( ($nlink || (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_))) && ! -l $_ && ! /^core\z/s && ! /^.*\.state\z/s && - ! /^.*\.so\z/s && - ! /^.*\.[oa]\z/s && - ! /^.*\.dll\z/s && - ! /^.*\.lib\z/s && - ! /^.*\.obj\z/s && + ! /^.*\.so\z/s && + ! /^.*\.[oa]\z/s && + ! /^.*\.dll\z/s && + ! /^.*\.lib\z/s && + ! /^.*\.obj\z/s && ! /^.*~\z/s && - ! /^\.\z/s && + ! /^\.\z/s && ! /^\.#.*\z/s && - ! /^.*\.log\z/s + ! /^.*\.log\z/s ) && push(@files, $File::Find::name); } diff --git a/ACE/bin/g++dep b/ACE/bin/g++dep index 73767c627e9..188f8ac0c08 100755 --- a/ACE/bin/g++dep +++ b/ACE/bin/g++dep @@ -1,6 +1,4 @@ #! /bin/sh -# $Id$ - # This utility is a lightly edited version of the freed Berkeley # script `mkdep'. The current script is intended to work for GNU G++. diff --git a/ACE/bin/generate_rel_manpages b/ACE/bin/generate_rel_manpages index b0579121edc..a8e4b2a34fb 100755 --- a/ACE/bin/generate_rel_manpages +++ b/ACE/bin/generate_rel_manpages @@ -2,8 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; -# $Id$ - use strict; require Cwd; diff --git a/ACE/bin/make-components b/ACE/bin/make-components index a2b9c782807..cd317f630c4 100755 --- a/ACE/bin/make-components +++ b/ACE/bin/make-components @@ -1,6 +1,4 @@ #! /bin/sh -# $Id$ - # Allow each ACE component to be built in a simple way, as follows: # # $ACE_ROOT/bin/make-components "your flags" diff --git a/ACE/bin/reverse_clean b/ACE/bin/reverse_clean index 37d77daee50..a4c2786ba7a 100755 --- a/ACE/bin/reverse_clean +++ b/ACE/bin/reverse_clean @@ -2,8 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; # -*- perl -*- -# $Id$ -# # This script does a realclean of the list in the reverse order that # is passed to this. This is just a utility script @@ -12,7 +10,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' if ($ARGV[0] eq ''){ print STDERR "$0: No directories provided\n"; die "provide list of directories"; -} +} my $make = $ARGV[0]; shift; diff --git a/ACE/docs/README.tutorials b/ACE/docs/README.tutorials index 8c84c98b1b5..4e9b6f00ba6 100644 --- a/ACE/docs/README.tutorials +++ b/ACE/docs/README.tutorials @@ -1,5 +1,3 @@ -# $Id$ - ACE tutorials can be found in the following directories: . examples/C++NPv1 - C++ Network Programming Volume 1 examples. diff --git a/ACE/etc/purify.solaris2 b/ACE/etc/purify.solaris2 index cd01a1fa08b..84e97e6e8f3 100644 --- a/ACE/etc/purify.solaris2 +++ b/ACE/etc/purify.solaris2 @@ -1,5 +1,3 @@ -#### $Id$ -#### #### To use: create a symlink, named .purify, to this file in your home #### directory: #### % ln -s $ACE_ROOT/env/purify.solaris2 ~/.purify diff --git a/ACE/examples/APG/Svc_Config/svc.conf.dynamic b/ACE/examples/APG/Svc_Config/svc.conf.dynamic index 3243d1a2f84..e8ffb12c8ad 100644 --- a/ACE/examples/APG/Svc_Config/svc.conf.dynamic +++ b/ACE/examples/APG/Svc_Config/svc.conf.dynamic @@ -1,4 +1,2 @@ -# $Id$ - dynamic HA_Status_Dynamic_Service Service_Object * HA_Status:_make_HA_Status() "-f status.ini" diff --git a/ACE/examples/APG/Svc_Config/svc.conf.static b/ACE/examples/APG/Svc_Config/svc.conf.static index 26ed66e2522..0103380c776 100644 --- a/ACE/examples/APG/Svc_Config/svc.conf.static +++ b/ACE/examples/APG/Svc_Config/svc.conf.static @@ -1,3 +1 @@ -# $Id$ - static HA_Status_Static_Service "-f status.ini" diff --git a/ACE/examples/ConfigViewer/ConfigurationViewer.rc b/ACE/examples/ConfigViewer/ConfigurationViewer.rc index f490ccefc2d..4fa69d8669a 100644 --- a/ACE/examples/ConfigViewer/ConfigurationViewer.rc +++ b/ACE/examples/ConfigViewer/ConfigurationViewer.rc @@ -1,6 +1,4 @@ /* -*- C++ -*- */ -// $Id$ - #include "wx/msw/wx.rc" mondrian ICON "mondrian.ico" diff --git a/ACE/examples/Service_Configurator/Misc/svc.conf1 b/ACE/examples/Service_Configurator/Misc/svc.conf1 index f992697baa9..2995c61ebe9 100644 --- a/ACE/examples/Service_Configurator/Misc/svc.conf1 +++ b/ACE/examples/Service_Configurator/Misc/svc.conf1 @@ -1,5 +1,3 @@ -# $Id$ - # Dynamically configure the Timer_Service into the application process # and pass in up to 4 arguments. The final 3 arguments are retrieved # from environment variables, so they can be set by changing your diff --git a/ACE/examples/Service_Configurator/Misc/svc.conf2 b/ACE/examples/Service_Configurator/Misc/svc.conf2 index a01ab71a78b..5d33bd69e18 100644 --- a/ACE/examples/Service_Configurator/Misc/svc.conf2 +++ b/ACE/examples/Service_Configurator/Misc/svc.conf2 @@ -1,10 +1,8 @@ -# $Id$ - # Statically configure the Timer_Service, which must have been linked # statically into the application process. Up to 4 arguments are # passed in. The final 3 arguments are retrieved from environment # variables, so they can be set by changing your environment before # running the main program. If you don't have these variables set -# they are ignored. +# they are ignored. static Timer_Service_1 "timer $INTERVAL $MAX_TIMEOUTS $TRACE" diff --git a/ACE/html/Stats/configuration.shtml b/ACE/html/Stats/configuration.shtml index 9243e76a3a7..1ba2cd994ed 100644 --- a/ACE/html/Stats/configuration.shtml +++ b/ACE/html/Stats/configuration.shtml @@ -2,7 +2,6 @@ "http://www.w3.org/TR/html4/loose.dtd"> <HTML> <HEAD> - <!-- $Id$ --> <TITLE>Configuration</TITLE> <LINK href="Stats.css" rel="stylesheet" type="text/css"> </HEAD> diff --git a/ACE/html/Stats/detailed_performance.shtml b/ACE/html/Stats/detailed_performance.shtml index c0fb2975b07..d61ae54e8da 100644 --- a/ACE/html/Stats/detailed_performance.shtml +++ b/ACE/html/Stats/detailed_performance.shtml @@ -2,14 +2,13 @@ "http://www.w3.org/TR/html4/loose.dtd"> <HTML> <HEAD> - <!-- $Id$ --> <TITLE>Performance Metrics Detailed Results</TITLE> <LINK href="Stats.css" rel="stylesheet" type="text/css"> </HEAD> <BODY> <!--#include file="navigation.html"--> - + <P> Results for the performance experiments in <CODE>$TAO_ROOT/performance-tests</CODE>. diff --git a/ACE/html/Stats/footprint.shtml b/ACE/html/Stats/footprint.shtml index e9fed552179..330191ce1e6 100644 --- a/ACE/html/Stats/footprint.shtml +++ b/ACE/html/Stats/footprint.shtml @@ -2,7 +2,6 @@ "http://www.w3.org/TR/html4/loose.dtd"> <HTML> <HEAD> - <!-- $Id$ --> <TITLE>Footprint Metrics Results</TITLE> <LINK href="Stats.css" rel="stylesheet" type="text/css"> </HEAD> @@ -27,8 +26,8 @@ executables that represent the minimum size of TAO's client and server. </LI> </UL> - <UL> <LI> Detailed Footprint, for a closer look at the sizes of - libraries and its dependencies. + <UL> <LI> Detailed Footprint, for a closer look at the sizes of + libraries and its dependencies. <UL> <LI><a href="regular/ace_Footprint.html">ACE</a> <LI><a href="regular/tao_Footprint.html">TAO</a> @@ -39,7 +38,7 @@ </LI> </UL> </BODY> <P> <HR> - + <!--#include file="navigation.html"--> <!--#include file="footer.html"--> </HTML> diff --git a/ACE/html/Stats/index.shtml b/ACE/html/Stats/index.shtml index 8ff22840f3b..3843557a582 100644 --- a/ACE/html/Stats/index.shtml +++ b/ACE/html/Stats/index.shtml @@ -2,7 +2,6 @@ "http://www.w3.org/TR/html4/loose.dtd"> <HTML> <HEAD> - <!-- $Id$ --> <TITLE>ACE+TAO+CIAO+DAnCE Metrics</TITLE> <LINK href="Stats.css" rel="stylesheet" type="text/css"> </HEAD> @@ -21,7 +20,7 @@ href="http://www.dre.vanderbilt.edu/scoreboard"> nightly</A> regression tests. The complete source for the tests is available as part of the ACE+TAO+CIAO+DAnCE <A - HREF="http://download.dre.vanderbilt.edu">distribution</A>. + HREF="http://download.dre.vanderbilt.edu">distribution</A>. The hardware and software configuration used for these tests is described <A HREF="configuration.shtml">here</A>. Notice, however, that the diff --git a/ACE/html/Stats/simple_footprint.shtml b/ACE/html/Stats/simple_footprint.shtml index df8e9d3f908..37617eb6b7a 100644 --- a/ACE/html/Stats/simple_footprint.shtml +++ b/ACE/html/Stats/simple_footprint.shtml @@ -2,7 +2,6 @@ "http://www.w3.org/TR/html4/loose.dtd"> <HTML> <HEAD> - <!-- $Id$ --> <TITLE>Footprint Metrics Detailed Results</TITLE> <LINK href="Stats.css" rel="stylesheet" type="text/css"> </HEAD> diff --git a/ACE/html/doxygen.css b/ACE/html/doxygen.css index 6afcb64d97f..67c9baefb84 100644 --- a/ACE/html/doxygen.css +++ b/ACE/html/doxygen.css @@ -1,4 +1,3 @@ -<!-- $Id$ --> BODY { background: white; color: black; diff --git a/ACE/performance-tests/RPC/ping.x b/ACE/performance-tests/RPC/ping.x index ea078ffe139..31c3be713b5 100644 --- a/ACE/performance-tests/RPC/ping.x +++ b/ACE/performance-tests/RPC/ping.x @@ -1,8 +1,4 @@ /* - * $Id$ - */ - -/* * A small program to test RPC round-trip delays. */ program PINGPROG { diff --git a/ACE/performance-tests/SCTP/README.OpenSS7 b/ACE/performance-tests/SCTP/README.OpenSS7 index 5183e872e12..6e811bd7630 100644 --- a/ACE/performance-tests/SCTP/README.OpenSS7 +++ b/ACE/performance-tests/SCTP/README.OpenSS7 @@ -1,30 +1,28 @@ -// $Id$ - This document describes the OpenSS7 API in detail. Introduction ============= - -OpenSS7 defines two types of services, UDP style and TCP style. How OpenSS7 -distinguishes the two styles is by the way in which the data is presented to -the application. In OpenSS7, data is presented as byte streams or datagrams. -The stream style is considered the TCP style socket, and the datagram is + +OpenSS7 defines two types of services, UDP style and TCP style. How OpenSS7 +distinguishes the two styles is by the way in which the data is presented to +the application. In OpenSS7, data is presented as byte streams or datagrams. +The stream style is considered the TCP style socket, and the datagram is considered the UDP style socket. The UDP style socket does not represent a one -to many mapping of file descriptors to associations as the IETF compatible +to many mapping of file descriptors to associations as the IETF compatible sockets does. Instead of adding new system calls, OpenSS7 decided to modify some of the -existing system calls to play nicely with multi-homing. So, to bind to +existing system calls to play nicely with multi-homing. So, to bind to multiple addresses, you pass in an array of struct sockaddr* structures and the total length in bytes of the array. Also, when accepting connections from a -peer, you would pass in a pointer to an array of struct sockaddr* and the +peer, you would pass in a pointer to an array of struct sockaddr* and the length of the array in bytes. Building ACE/TAO with support for OpenSS7 SCTP ============================================== - - apply OpenSS7's SCTP patch (see OpenSS7's readme for details) + - apply OpenSS7's SCTP patch (see OpenSS7's readme for details) - compile kernel with the following kernel variables (.config file) + CONFIG_SCTP=y @@ -42,7 +40,7 @@ Common Calls ============ There are a few common calls which have the same semantics no matter which -interface you are using (UDP style or TCP style). So, the usual calls used in +interface you are using (UDP style or TCP style). So, the usual calls used in a client are: 1) socket() @@ -61,7 +59,7 @@ while the usual calls for a server are as follows: 5) accept() 6) close() -The previous example mimics the way in which the TCP protocol is used. +The previous example mimics the way in which the TCP protocol is used. There are some exceptions to the above sequence which we will get into a little later. So, let's talk about the system calls above. @@ -106,7 +104,7 @@ The connect() call can be used to initialize a connection with a peer SCTP machine. A connection can be initialized in 2 ways. The first is this call(connect()). The second way is to allow implicit initialization when the application calls sendmsg or sendto with the address of the remote host -specified. To allow data to be piggybacked with the COOKIE_ECHO chunk, you +specified. To allow data to be piggybacked with the COOKIE_ECHO chunk, you must use the second initialization technique. The signature of connect is as follows: @@ -133,9 +131,9 @@ Accept() -------- The accept() call allows the application to explicitly accept an incoming association initialization attempt. accept() returns a new file descriptor -which can be used to send data to the client. accept() has a slightly -different semantic which allows it to take an array of address structures. -This gives the application the chance to get a specified number of addresses +which can be used to send data to the client. accept() has a slightly +different semantic which allows it to take an array of address structures. +This gives the application the chance to get a specified number of addresses from the peer on initialization. The signature of accept() is as follows: int accept(int fd, struct sockaddr* r_addr, socklen_t *r_addr_len) @@ -159,7 +157,7 @@ Start the association shutdown sequence. The signature is as follows: Data Interfaces =============== This section describes the sending and receiving of data on an SCTP socket. -This is where the differences between the TCP style and UDP style sockets +This is where the differences between the TCP style and UDP style sockets shows. SCTP uses the standard pairs of calls: 1) send()/recv() @@ -174,15 +172,15 @@ calls returns only datagrams. For example, assume a sender sends 2 100 byte datagrams. Now assume that the receiver calls one of the receive routines with a max buffer size of 120 bytes. Assuming no errors are encountered, only 100 bytes are returned to the receiver (only 1 datagram), leaving the last 20 bytes -empty in the receivers buffer. When the last of a datagram is read, the -MSG_EOR flag is returned, and if the datagram is too big to fit into the -specified buffer, the MSG_TRUNC flag is returned. +empty in the receivers buffer. When the last of a datagram is read, the +MSG_EOR flag is returned, and if the datagram is too big to fit into the +specified buffer, the MSG_TRUNC flag is returned. With TCP styles sockets, the data is presented to the application as a stream -of bytes (like TCP). For example, assume the sender sends 2 100 byte -datagrams. Now assume that the receiver calls one of the receive routines with -a max buffer size of 120. Assuming no errors are encountered, 120 bytes are -returned (100 from the first datagram and 20 from the next datagram), leaving +of bytes (like TCP). For example, assume the sender sends 2 100 byte +datagrams. Now assume that the receiver calls one of the receive routines with +a max buffer size of 120. Assuming no errors are encountered, 120 bytes are +returned (100 from the first datagram and 20 from the next datagram), leaving 80 bytes in the second datagram. MSG_EOR and MSG_TRUNC are never returned. Send()/Recv() @@ -217,10 +215,10 @@ The msg argument holds the data to be sent to the peer. It also can take an address to send the data to. So, for example, if you had an association with 2 addresses for the peer and the default path used the first address, and you wanted to send data to the other address, you could specify that address in the -msg structure. If this address field is NULL, then data is sent out the -default address. +msg structure. If this address field is NULL, then data is sent out the +default address. -This interface also allows other functions by using the ancillary data field +This interface also allows other functions by using the ancillary data field in the msg structure. By using the ancillary data field, you may send data out a different stream by using the SCTP_SID control message. This type of control message would take an integer representing the stream to send data out as it's @@ -233,7 +231,7 @@ Sendto()/Recvfrom() The sendto/recvfrom interface allows the specification of which remote address to send data. The signature of sendto/recvfrom is as follows: - int sendto(int fd, void *data, size_t d_len, int flags, + int sendto(int fd, void *data, size_t d_len, int flags, struct sockaddr* r_addr, socklen_t r_addr_len) Where: fd - A SCTP socket descriptor diff --git a/ACE/performance-tests/SCTP/README.SCTP b/ACE/performance-tests/SCTP/README.SCTP index 95c3cb0b53a..afe6853730b 100644 --- a/ACE/performance-tests/SCTP/README.SCTP +++ b/ACE/performance-tests/SCTP/README.SCTP @@ -1,22 +1,19 @@ -# $Id$ - -This document provides general information about the SCTP protocol. - +This document provides general information about the SCTP protocol. Introduction ============= -SCTP (Stream Control Transmission Protocol) is a new transport layer protocol -developed by the IETF and defined by RFC2960. Originally designed for the -transmission of message-oriented applications such as the transportation of +SCTP (Stream Control Transmission Protocol) is a new transport layer protocol +developed by the IETF and defined by RFC2960. Originally designed for the +transmission of message-oriented applications such as the transportation of signaling data for PSTNs (Public Switched Telephone Networks), SCTP can be used -in any application that uses TCP. +in any application that uses TCP. Major Features -------------- - Direct support for multi-homing - - Support for multiple streams per connection (known as associations) - to reduce "head of line" blocking problems. + - Support for multiple streams per connection (known as associations) + to reduce "head of line" blocking problems. - Four way handshake reducing the possibility for blind denial of service attacks. - Adjustment of congestion control parameters @@ -25,31 +22,31 @@ in any application that uses TCP. API's ======== -The SCTP drafts have defined several different API's. The first reference -implementation was a user level library. This allowed an application to use -SCTP through several functions and callbacks. As of this writing a +The SCTP drafts have defined several different API's. The first reference +implementation was a user level library. This allowed an application to use +SCTP through several functions and callbacks. As of this writing a transition from the user level libraries to the kernel is underway. -The IETF TSVWG (Transport Area Working Group) has published a draft -(draft-ietf-tsvwg-sctpsocket-06.txt) that defines a mapping between SCTP and +The IETF TSVWG (Transport Area Working Group) has published a draft +(draft-ietf-tsvwg-sctpsocket-06.txt) that defines a mapping between SCTP and the BSD sockets interface. This interface has made porting TCP applications to SCTP as simple as changing one socket call. OpenSS7 -------- - OpenSS7 has defined, a similar BSD style sockets interface. It is + OpenSS7 has defined, a similar BSD style sockets interface. It is slightly different from the one defined by the IETF, however, at the - time of our evaluation it was the most stable implementation. + time of our evaluation it was the most stable implementation. - Please see README.OpenSS7 for details and build instructions. + Please see README.OpenSS7 for details and build instructions. LKSCTP ------ - The LKSCTP implementation is based on the TSVWG's sockets draft. + The LKSCTP implementation is based on the TSVWG's sockets draft. It is included with the Linux 2.6 series test kernels. Backported - (Linux 2.4) patches are also available from the LKSCTP website. + (Linux 2.4) patches are also available from the LKSCTP website. - Please see README.LKSCTP for more details and build instructions. + Please see README.LKSCTP for more details and build instructions. Resources =========== @@ -61,8 +58,8 @@ Resources Internet-Drafts ---------------- - - draft-ietf-tsvwg-sctpsocket-07.txt: + + draft-ietf-tsvwg-sctpsocket-07.txt: Sockets API Extensions for Stream Control Transmission Protocol draft-ietf-tsvwg-sctpimpguide-08.txt diff --git a/ACE/performance-tests/SCTP/README.SCTP_PERF_TEST b/ACE/performance-tests/SCTP/README.SCTP_PERF_TEST index 81cacef02e0..1d2006c24c0 100644 --- a/ACE/performance-tests/SCTP/README.SCTP_PERF_TEST +++ b/ACE/performance-tests/SCTP/README.SCTP_PERF_TEST @@ -1,5 +1,3 @@ -$Id$ - Release 1.0 - January 2003 *********************************** @@ -141,7 +139,7 @@ and used on the command line in place of the shorter "Flag". Hence ./SOCK_STREAM_clt -s 5 -is equivalent to +is equivalent to ./SOCK_STREAM_clt --payload-size-power-of-2 5 @@ -230,7 +228,7 @@ SOCK_SEQPACK_srv: Enable Nagle's algorithm (which is disabled by default). server-port [ -p int ] - + the port where the server's passive-mode socket will be bound. The default is 45453. @@ -258,7 +256,7 @@ SOCK_SEQPACK_srv, but the latter offers additional functionality: If your machine has three or more interfaces, and you wish to bind the socket only to a subset of two or more, AND you are using SOCK_SEQPACK_srv, THEN you may explicitly specify the - desired interface with an expression such as + desired interface with an expression such as "-a 192.168.221.104,192.168.1.43". The argument here is a comma-delimited list of dotted-decimal IPv4 addresses with no whitespace interspersed. This level of control is not @@ -300,7 +298,7 @@ The steps of the walk-through are as follows: 1. Start the server. $ ./SOCK_STREAM_srv - (12761|1024) Accepting connections on port 45453 + (12761|1024) Accepting connections on port 45453 on interface INADDR_ANY using IPPROTO_SCTP (12761|1024) starting server at port 45453 (12761|1024) select timed out @@ -308,7 +306,7 @@ The steps of the walk-through are as follows: (12761|1024) select timed out (12761|1024) select timed out ... - + The server will continue to print, periodically, the message "select timed out" as it waits for clients to connect. @@ -317,7 +315,7 @@ The steps of the walk-through are as follows: $ ./SOCK_STREAM_clt -s 7 -c 1000 3. Observing the debugging output from the server, you should see - evidence that the client has connected. + evidence that the client has connected. (12761|1024) select timed out (12761|1024) select timed out diff --git a/ACE/performance-tests/SCTP/run_spectrum.config b/ACE/performance-tests/SCTP/run_spectrum.config index cb2beb17f5e..ca9a8968ac9 100644 --- a/ACE/performance-tests/SCTP/run_spectrum.config +++ b/ACE/performance-tests/SCTP/run_spectrum.config @@ -1,6 +1,3 @@ -# -# $Id$ -# # This is the default configuration file for run_spectrum.pl. # Configuration options given in this file will be passed to # SOCK_STREAM_clt or SOCK_SEQPACK_clt. diff --git a/ACE/tests/pharlap/run_pharlap_tests.bat b/ACE/tests/pharlap/run_pharlap_tests.bat index 910f2a678f5..b8fa6eeafaf 100755 --- a/ACE/tests/pharlap/run_pharlap_tests.bat +++ b/ACE/tests/pharlap/run_pharlap_tests.bat @@ -1,6 +1,4 @@ @echo off -rem $Id$ - rem This file runs all the tests on PharLap ETS. rem To use this either give it no arguments to run all the tests or rem pass it the test name (without the extention) to run only one diff --git a/ACE/tests/tests_pharlap_msvc.lnk b/ACE/tests/tests_pharlap_msvc.lnk index 39af043e409..16a9bf954a2 100644 --- a/ACE/tests/tests_pharlap_msvc.lnk +++ b/ACE/tests/tests_pharlap_msvc.lnk @@ -1,4 +1,3 @@ -! $Id$ ! Application linker command file for ACE tests. ! Visual C++ Compiler with PC-Compatible Target diff --git a/TAO/TAO_IDL/tao_idl.1 b/TAO/TAO_IDL/tao_idl.1 index 94f8596bad1..49563d67f47 100644 --- a/TAO/TAO_IDL/tao_idl.1 +++ b/TAO/TAO_IDL/tao_idl.1 @@ -1,8 +1,6 @@ .\" Process this file with .\" groff -man -Tascii tao_idl.1 .\" -.\" $Id$ -.\" .TH tao_idl 1 "DECEMBER 1998" "CORBA Tools" "User Manuals" .SH NAME tao_idl \- Compile IDL sources for use with the ACE ORB (TAO) diff --git a/TAO/examples/Advanced/TO-DO b/TAO/examples/Advanced/TO-DO index 76d0b1fbc55..589c040573a 100644 --- a/TAO/examples/Advanced/TO-DO +++ b/TAO/examples/Advanced/TO-DO @@ -1,6 +1,3 @@ -$Id$ -______________________________________________________________________________ - This is a 'To Do' list for the TAO versions of the Henning and Vinoski examples ($TAO_ROOT/examples/Advanced). It is an ongoing effort to get these examples working with TAO, 'out of the box' with as few changes as diff --git a/TAO/examples/Advanced/ch_12/CHANGES b/TAO/examples/Advanced/ch_12/CHANGES index 4a09d079b18..09c580e0afa 100644 --- a/TAO/examples/Advanced/ch_12/CHANGES +++ b/TAO/examples/Advanced/ch_12/CHANGES @@ -1,32 +1,30 @@ -$Id$ - -Changelog for chapter 8 and 10 example in "Advanced CORBA -Programming with C++" by Michi Henning and Steve Vinoski, -Copyright 1999, Addison-Wesley, Reading, MA. The following -changes have been made to the book's source code to make the +Changelog for chapter 8 and 10 example in "Advanced CORBA +Programming with C++" by Michi Henning and Steve Vinoski, +Copyright 1999, Addison-Wesley, Reading, MA. The following +changes have been made to the book's source code to make the example work with TAO and with various platforms and compilers. _______________________________________________________________________________ ESSENTIAL CHANGES: - 1. Changed filename extensions from .hh and .cc to .h + 1. Changed filename extensions from .hh and .cc to .h and .cpp, and made all necessary changes in file content. 2. a) Commented-out "#include <corba/poaS.h>" in server.h - + b) Added #include "icp.h" to server.h. - + c) Unnecessary standard includes of <iostreams.h>, <assert.h>, - <fstream.h> and <stdlib.h> must be removed or moved to follow the + <fstream.h> and <stdlib.h> must be removed or moved to follow the local includes in server.h, server.cpp, client.cpp, and icp.cpp. - d) The following files may need their includes further rearranged - to avoid warnings and errors (g++). The following orderings - seem to work fine: - - server.cpp: "server.h", <algorithm>, "icp.h", <strstream.h> + d) The following files may need their includes further rearranged + to avoid warnings and errors (g++). The following orderings + seem to work fine: + - server.cpp: "server.h", <algorithm>, "icp.h", <strstream.h> - server.h: "CCSS.h", "icp.h", <map>, <list> - 3. Added CORBA_Environment variable to - DeviceLocator::preinvoke() and ::postinvoke() + 3. Added CORBA_Environment variable to + DeviceLocator::preinvoke() and ::postinvoke() in server.h and server.cpp to match the signatures of parent methods in TAO's ServanLocator class. @@ -34,18 +32,18 @@ ESSENTIAL CHANGES: operator<<(ostream & os, const CCS::Controller::EChange & ec) definition in server.cpp and client.cpp. - 5. commented-out "delete this;" from method + 5. commented-out "delete this;" from method Thermometer_impl::remove() in server.cpp. (Change should soon be reflected in authors' code) _______________________________________________________________________________ ADDITIONAL CHANGES: 6. Added .in() to _var parameters wherever needed: - -client.cpp: + -client.cpp: 4 times in operator<<(ostream, CCS::Thermometer_ptr) 6 times in main(). 5 are is_nil(), 1 is _narrow() 2 additions in main() of .inout to _var parameters to set_temp(..). - -server.cpp, + -server.cpp, 2 changes in make_dref() 2 changes in Controller_impl::Controller_impl() 4 changes in Controller_impl::~Controller_impl() @@ -56,10 +54,10 @@ ADDITIONAL CHANGES: 7 changes in main() 7. created needed file at /tmp/CCS_DB. (location is hard-coded) - To run, move CCS_DB from this directory to /tmp on the + To run, move CCS_DB from this directory to /tmp on the local machine. - 8. fixed warnings by commented out unused parameters in + 8. fixed warnings by commented out unused parameters in -DeviceLocator_impl::postinvoke(..) in server.h -DeviceLocator_impl::preinvoke(..) in server.cpp @@ -72,7 +70,7 @@ ADDITIONAL CHANGES: ______________________________________________________________________________ To Do: - - fix error on 2 cases of fstream.close() + - fix error on 2 cases of fstream.close() in server.cpp and icp.cpp diff --git a/TAO/examples/Advanced/ch_18/CHANGES b/TAO/examples/Advanced/ch_18/CHANGES index 404883d09de..b729befa84a 100644 --- a/TAO/examples/Advanced/ch_18/CHANGES +++ b/TAO/examples/Advanced/ch_18/CHANGES @@ -1,36 +1,34 @@ -$Id$ - -Changelog for chapter 8 and 10 example in "Advanced CORBA -Programming with C++" by Michi Henning and Steve Vinoski, -Copyright 1999, Addison-Wesley, Reading, MA. The following -changes have been made to the book's source code to make the +Changelog for chapter 8 and 10 example in "Advanced CORBA +Programming with C++" by Michi Henning and Steve Vinoski, +Copyright 1999, Addison-Wesley, Reading, MA. The following +changes have been made to the book's source code to make the example work with TAO and with various platforms and compilers. _______________________________________________________________________________ ESSENTIAL CHANGES: - 1. Changed filename extensions from .hh and .cc to .h + 1. Changed filename extensions from .hh and .cc to .h and .cpp, and made all necessary changes in file content. 2. a) Commented-out "#include <corba/poaS.h>" in server.h - + b) Added #include "icp.h" to server.h. - + c) changed #include <CosNaming.h> to <orbsvcs/CosNamingC.h> in server.cpp and client.cpp d) Unnecessary standard includes of <iostreams.h>, <assert.h>, - <fstream.h> and <stdlib.h> must be removed or moved to follow the + <fstream.h> and <stdlib.h> must be removed or moved to follow the local includes in server.h, server.cpp, client.cpp, and icp.cpp. - - e) The following files may need their includes further rearranged - to avoid warnings and errors (g++). The following orderings - seem to work fine: - - server.cpp: "server.h", <algorithm>, "icp.h", - <orbsvcs/CosNamingC.h>, <strstream.h> + + e) The following files may need their includes further rearranged + to avoid warnings and errors (g++). The following orderings + seem to work fine: + - server.cpp: "server.h", <algorithm>, "icp.h", + <orbsvcs/CosNamingC.h>, <strstream.h> - server.h: "CCSS.h", "icp.h", <map>, <list> - 3. Added CORBA_Environment variable to - DeviceLocator::preinvoke() and ::postinvoke() + 3. Added CORBA_Environment variable to + DeviceLocator::preinvoke() and ::postinvoke() in server.h and server.cpp to match the signatures of parent methods in TAO's ServanLocator class. @@ -38,20 +36,20 @@ ESSENTIAL CHANGES: operator<<(ostream & os, const CCS::Controller::EChange & ec) definition in server.cpp and client.cpp. - 5. commented-out "delete this;" from method + 5. commented-out "delete this;" from method Thermometer_impl::remove() in server.cpp. (Change should soon be reflected in authors' code) _______________________________________________________________________________ ADDITIONAL CHANGES: 6. Added .in() to _var parameters wherever needed: - -client.cpp: + -client.cpp: 4 times in operator<<(ostream, CCS::Thermometer_ptr) 3 times in resolve_init() - 3 times in resolve_name() + 3 times in resolve_name() 5 times in main() Also added .inout() 2 times in main() for parameters to set_temp() - + -server.cpp: 3 changes in resolve_init() 2 changes in make_dref() @@ -64,10 +62,10 @@ ADDITIONAL CHANGES: 7 change in main() 7. created needed file at /tmp/CCS_DB. (location is hard-coded) - To run, move CCS_DB from this directory to /tmp on the + To run, move CCS_DB from this directory to /tmp on the local machine. - 8. fixed warnings by commented out unused parameters in + 8. fixed warnings by commented out unused parameters in -DeviceLocator_impl::postinvoke(..) in server.h -DeviceLocator_impl::preinvoke(..) in server.cpp @@ -79,7 +77,7 @@ ADDITIONAL CHANGES: _______________________________________________________________________________ To Do: - - fix error on 4 cases of fstream.close() + - fix error on 4 cases of fstream.close() in server.cpp and icp.cpp, now commented-out diff --git a/TAO/examples/Advanced/ch_21/CHANGES b/TAO/examples/Advanced/ch_21/CHANGES index 97a72853ed8..ec79d72c2d7 100644 --- a/TAO/examples/Advanced/ch_21/CHANGES +++ b/TAO/examples/Advanced/ch_21/CHANGES @@ -1,36 +1,34 @@ -$Id$ - -Changelog for chapter 8 and 10 example in "Advanced CORBA -Programming with C++" by Michi Henning and Steve Vinoski, -Copyright 1999, Addison-Wesley, Reading, MA. The following -changes have been made to the book's source code to make the +Changelog for chapter 8 and 10 example in "Advanced CORBA +Programming with C++" by Michi Henning and Steve Vinoski, +Copyright 1999, Addison-Wesley, Reading, MA. The following +changes have been made to the book's source code to make the example work with TAO and with various platforms and compilers. ______________________________________________________________________________ ESSENTIAL CHANGES: - 1. Changed filename extensions from .hh and .cc to .h + 1. Changed filename extensions from .hh and .cc to .h and .cpp, and made all necessary changes in file content. 2. a) Commented-out "#include <corba/poaS.h>" in server.h - + b) Added #include "icp.h" to server.h. - + c) Unnecessary includes of <iostreams.h>, <assert.h>, - <fstream.h> and <stdlib.h> must be removed or moved to - follow all other includes in server.h, server.cpp, + <fstream.h> and <stdlib.h> must be removed or moved to + follow all other includes in server.h, server.cpp, client.cpp, and icp.cpp. - - d) The following files may need their includes further rearranged - to avoid warnings and errors (g++). The following orderings - seem to work fine: - - server.cpp: "server.h", <algorithm>, "icp.h", - <strstream.h> + + d) The following files may need their includes further rearranged + to avoid warnings and errors (g++). The following orderings + seem to work fine: + - server.cpp: "server.h", <algorithm>, "icp.h", + <strstream.h> - server.h: "CCSS.h", "icp.h",<ace/Synch_T.h>, <map>, set, <list> - icp.cpp: <string>, <map>, <algorithm>, <stdlib.h>, - "icp.h" + "icp.h" - 3. Added CORBA_Environment variable to - DeviceLocator::preinvoke() and ::postinvoke() + 3. Added CORBA_Environment variable to + DeviceLocator::preinvoke() and ::postinvoke() in server.h and server.cpp to match the signatures of parent methods in TAO's ServantLocator class. @@ -38,23 +36,23 @@ ESSENTIAL CHANGES: operator<<(ostream & os, const CCS::Controller::EChange & ec) definition in server.cpp and client.cpp. - 5. commented-out "delete this;" from method + 5. commented-out "delete this;" from method Thermometer_impl::remove() in server.cpp. (Change should soon be reflected in authors' code) 6. member initializers reordeder in Thermometer_impl:: - Thermometer_impl() in server.cpp to match the declaration order - in server.h + Thermometer_impl() in server.cpp to match the declaration order + in server.h ______________________________________________________________________________ ADDITIONAL CHANGES: 7. Added .in() to _var parameters wherever needed: - -client.cpp: + -client.cpp: 4 times in operator<<(ostream, CCS::Thermometer_ptr) 6 times in main(). 5 are is_nil(), 1 is _narrow() - 2 times added .inout() to _var parameters in main() for calls + 2 times added .inout() to _var parameters in main() for calls to set_tmp(..) - -server.cpp, + -server.cpp, 2 changes in make_dref() 3 changes in Controller_impl::Controller_impl() 4 changes in Controller_impl::~Controller_impl() @@ -65,10 +63,10 @@ ADDITIONAL CHANGES: 7 changes in main() 8. created needed file at /tmp/CCS_DB. (location is hard-coded) - To run, move CCS_DB from this directory to /tmp on the + To run, move CCS_DB from this directory to /tmp on the local machine. - 9. fixed warnings by commented out unused parameters in + 9. fixed warnings by commented out unused parameters in -DeviceLocator_impl::postinvoke(..) in server.h -DeviceLocator_impl::preinvoke(..) in server.cpp @@ -80,7 +78,7 @@ ADDITIONAL CHANGES: ______________________________________________________________________________ To Do: - - fix error on 2 cases of fstream.close() + - fix error on 2 cases of fstream.close() in server.cpp and icp.cpp ____________________________________________________________ diff --git a/TAO/examples/Advanced/ch_3/CHANGES b/TAO/examples/Advanced/ch_3/CHANGES index 4185ef533a8..3ac18b3e7a0 100644 --- a/TAO/examples/Advanced/ch_3/CHANGES +++ b/TAO/examples/Advanced/ch_3/CHANGES @@ -1,19 +1,17 @@ -$Id$ - -Changelog for chapter 3 example in "Advanced CORBA Programming -with C++" by Michi Henning and Steve Vinoski, Copyright 1999, +Changelog for chapter 3 example in "Advanced CORBA Programming +with C++" by Michi Henning and Steve Vinoski, Copyright 1999, Addison-Wesley, Reading, MA. The following changes have been made -to the book's source code to make the example work with TAO and +to the book's source code to make the example work with TAO and with various platforms and compilers. ______________________________________________________________________________ ESSENTIAL CHANGES: - 1. changed filenames .cc to .cpp and .hh h, and modified #includes in + 1. changed filenames .cc to .cpp and .hh h, and modified #includes in client.cpp server.cpp and server.h appropriately. 2. a) changed #include "time.h" to #include "timeC.h" in client.cpp - b) Moved standard #includes below local #includes, and commented-out + b) Moved standard #includes below local #includes, and commented-out unnecessary #includes to avoid warnings and errors (g++) -client.cpp now reads: #include "timeC.h" @@ -26,9 +24,9 @@ ESSENTIAL CHANGES: ______________________________________________________________________________ ADDITIONAL CHANGES: - 3. added .in() to _var type parameters + 3. added .in() to _var type parameters -3 times in client.cpp for calls to is_nil() and _narrow() - -3 times in main() in server.cpp for calls to _narrow(), + -3 times in main() in server.cpp for calls to _narrow(), object_to_string, and << diff --git a/TAO/examples/Advanced/ch_8_and_10/CHANGES b/TAO/examples/Advanced/ch_8_and_10/CHANGES index b1454a1983d..2e01836d490 100644 --- a/TAO/examples/Advanced/ch_8_and_10/CHANGES +++ b/TAO/examples/Advanced/ch_8_and_10/CHANGES @@ -1,23 +1,21 @@ -$Id$ - -Changelog for chapter 8 and 10 example in "Advanced CORBA -Programming with C++" by Michi Henning and Steve Vinoski, -Copyright 1999, Addison-Wesley, Reading, MA. The following -changes have been made to the book's source code to make the +Changelog for chapter 8 and 10 example in "Advanced CORBA +Programming with C++" by Michi Henning and Steve Vinoski, +Copyright 1999, Addison-Wesley, Reading, MA. The following +changes have been made to the book's source code to make the example work with TAO and with various platforms and compilers. _______________________________________________________________________________ ESSENTIAL CHANGES: - 1. Changed filenames from .cc to .cpp and .hh to.h, + 1. Changed filenames from .cc to .cpp and .hh to.h, and modified #includes appropriatly - 2. a) Unnecessary standard includes of <iostreams.h> and <assert.h> must + 2. a) Unnecessary standard includes of <iostreams.h> and <assert.h> must be removed or moved to follow the local includes in server.h, server.cpp, client.cpp, and icp.cpp. - - b) The following files may need their includes further rearranged - to avoid warnings and errors (g++). The following orderings - seem to work fine: + + b) The following files may need their includes further rearranged + to avoid warnings and errors (g++). The following orderings + seem to work fine: -server.cpp: "server.h", <algorithm>, "icp.h" -server.h: "CCSS.h", <map> @@ -28,15 +26,15 @@ ESSENTIAL CHANGES: _______________________________________________________________________________ ADDITIONAL CHANGES: 4. Added .in() to _var parameters wherever needed: - -client.cpp: + -client.cpp: -4 changes in operator<<(ostream & os, CCS::Thermometer_ptr t) -6 changes in main(): 5 calls to is_nil(), 1 call to _narrow - -2 additions in main() of .inout() to _var parameters of set_temp(). + -2 additions in main() of .inout() to _var parameters of set_temp(). Note: .inout() is functionally the same as .in() in this case - - -server.cpp: + + -server.cpp: 3 changes in main() - + _______________________________________________________________________________ TO DO: -discrepancy in temperatures in my output vs. sample output diff --git a/TAO/examples/RTCORBA/Activity/svc.conf.client b/TAO/examples/RTCORBA/Activity/svc.conf.client index 89ae701d721..d1596c2752b 100644 --- a/TAO/examples/RTCORBA/Activity/svc.conf.client +++ b/TAO/examples/RTCORBA/Activity/svc.conf.client @@ -1,14 +1,8 @@ -# $Id$ - # -- E X A M P L E conf. file -- # Note! priority values are for Linux - - static RT_ORB_Loader "-ORBSchedPolicy SCHED_RR -ORBScopePolicy PROCESS -ORBPriorityMapping direct" - - static Builder "-TaskCount 2 -ThreadTask -JobName job_10 -Priority 10 -Period 1 -ExecTime 10000 -Phase 0 -Iter 20 -Load 1000 -ThreadTask -JobName job_80 -Priority 80 -Period 1 -ExecTime 10000 -Phase 0 -Iter 20 -Load 1000" diff --git a/TAO/examples/RTCORBA/Activity/svc.conf.server b/TAO/examples/RTCORBA/Activity/svc.conf.server index 20de7d0b1d7..f5944646c05 100644 --- a/TAO/examples/RTCORBA/Activity/svc.conf.server +++ b/TAO/examples/RTCORBA/Activity/svc.conf.server @@ -1,5 +1,3 @@ -# $Id$ - # -- E X A M P L E conf. file -- # Note! priority values are for Linux diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.client b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.client index 0071cce9b32..f16ccd6fcd0 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.client +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.client @@ -1,5 +1,3 @@ -# $Id$ - # -- E X A M P L E conf. file -- # Note! priority values are for Linux diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.server b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.server index 9a1afac76d6..baee8854a83 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.server +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.server @@ -1,5 +1,3 @@ -# $Id$ - # -- E X A M P L E conf. file -- # Note! priority values are for Linux diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.client b/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.client index fffd9361166..90735c209d1 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.client +++ b/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.client @@ -1,5 +1,3 @@ -# $Id$ - # -- E X A M P L E conf. file -- # Note! priority values are for Linux diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.server b/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.server index 20d54c64778..97bcc0114a0 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.server +++ b/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.server @@ -1,5 +1,3 @@ -# $Id$ - # -- E X A M P L E conf. file -- # Note! priority values are for Linux diff --git a/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java.JDK1.2 b/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java.JDK1.2 index 49a665569c3..53e611055a5 100644 --- a/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java.JDK1.2 +++ b/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java.JDK1.2 @@ -1,8 +1,6 @@ -// $Id$ -// // ============================================================================ // -// +// // = FILENAME // PushConsumer.java // @@ -12,14 +10,14 @@ // = DESCRIPTION // This is a Push Consumer which takes the data field of the // event and updates with it a Data Handler. -// +// // // ============================================================================ public class PushConsumer extends RtecEventComm._PushConsumerImplBase { - + public static final int ACE_ES_EVENT_ANY = 0; public static final int ACE_ES_EVENT_SHUTDOWN = 1; public static final int ACE_ES_EVENT_ACT = 2; @@ -41,22 +39,22 @@ public class PushConsumer extends RtecEventComm._PushConsumerImplBase private RtecEventChannelAdmin.EventChannel channel_admin_; private RtecEventChannelAdmin.ConsumerAdmin consumer_admin_; private RtecEventChannelAdmin.ProxyPushSupplier suppliers_; - + public PushConsumer (org.omg.CORBA.ORB orb, DataHandler dataHandler) { orb_ = orb; dataHandler_ = dataHandler; } - - + + public void push (RtecEventComm.Event[] events) { - if (total_received_ < 5) + if (total_received_ < 5) System.out.println ("Demo Consumer: Received an event! ->Number: " + total_received_); else if (total_received_ == 5) System.out.println ("Demo Consumer: Everything is fine. Going to be mute."); - - + + if (events.length == 0) { System.err.println ("No events"); @@ -64,81 +62,81 @@ public class PushConsumer extends RtecEventComm._PushConsumerImplBase else { total_received_++; - + for (int i = 0; i < events.length; ++i) { - if(events[i].type_ == ACE_ES_EVENT_NOTIFICATION) + if(events[i].type_ == ACE_ES_EVENT_NOTIFICATION) { try { dataHandler_.update (events[i].data_.any_value); } - catch(org.omg.CORBA.SystemException e) + catch(org.omg.CORBA.SystemException e) { System.err.println(e); } - } + } } } } - - public void disconnect_push_consumer() + + public void disconnect_push_consumer() { System.out.println ("Demo Consumer: Have to disconnect!"); } - + public void open_consumer (RtecEventChannelAdmin.EventChannel event_channel, RtecScheduler.Scheduler scheduler, String name) { - - try + + try { - + // Define Real-time information - + rt_info_ = scheduler.create (name); - + scheduler.set (rt_info_, RtecScheduler.Criticality.VERY_LOW_CRITICALITY, - new TimeBase.ulonglong (0,0), + new TimeBase.ulonglong (0,0), new TimeBase.ulonglong (0,0), new TimeBase.ulonglong (0,0), 2500000, // period RtecScheduler.Importance.VERY_LOW_IMPORTANCE, new TimeBase.ulonglong (0,0), 1, - RtecScheduler.Info_Type.OPERATION); - + RtecScheduler.Info_Type.OPERATION); + // Register for Notification and Shutdown events - RtecEventComm.Event notification_event = - new RtecEventComm.Event (ACE_ES_EVENT_NOTIFICATION, 0, + RtecEventComm.Event notification_event = + new RtecEventComm.Event (ACE_ES_EVENT_NOTIFICATION, 0, 1, // ttl new TimeBase.ulonglong (0,0), new TimeBase.ulonglong (0,0), new TimeBase.ulonglong (0,0), new RtecEventComm.EventData (orb_.create_any ())); - - RtecEventChannelAdmin.Dependency dependencies[] = new RtecEventChannelAdmin.Dependency[1]; + + RtecEventChannelAdmin.Dependency dependencies[] = new RtecEventChannelAdmin.Dependency[1]; dependencies[0] = new RtecEventChannelAdmin.Dependency (notification_event, rt_info_); - + RtecEventChannelAdmin.ConsumerQOS qos = new RtecEventChannelAdmin.ConsumerQOS (dependencies, - false); - + false); + // The channel administrator is the event channel we got from the invocation // of this routine channel_admin_ = event_channel; - + // Connect as a consumer consumer_admin_ = channel_admin_.for_consumers (); - + // Obtain a reference to the proxy push supplier suppliers_ = consumer_admin_.obtain_push_supplier (); - + suppliers_.connect_push_consumer (this, qos); - + System.out.println ("Registered the consumer successfully."); - + } catch (RtecEventChannelAdmin.TypeError e) { @@ -161,11 +159,11 @@ public class PushConsumer extends RtecEventComm._PushConsumerImplBase System.err.println ("Demo_Consumer.open_consumer: Duplicate names"); System.err.println (e); } - catch(org.omg.CORBA.SystemException e) + catch(org.omg.CORBA.SystemException e) { System.err.println(e); - } - } + } + } } diff --git a/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java.JDK1.2 b/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java.JDK1.2 index b6039ee72d9..b718b984a7f 100644 --- a/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java.JDK1.2 +++ b/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java.JDK1.2 @@ -1,7 +1,5 @@ -// $Id$ -// // ============================================================================ -// +// // = FILENAME // PushConsumerFactory.java // @@ -14,24 +12,24 @@ // ============================================================================ -public class PushConsumerFactory +public class PushConsumerFactory { - + private org.omg.CORBA.ORB orb_; private org.omg.CORBA.Object naming_service_object_; private DataHandler dataHandler_; private Navigation navigation_; private Weapons weapons_; - - - public PushConsumerFactory (DataHandler dataHandler, - String nameServiceIOR, + + + public PushConsumerFactory (DataHandler dataHandler, + String nameServiceIOR, String[] args, java.applet.Applet applet) { - try { + try { dataHandler_ = dataHandler; - + // if the DOVE Browser is running as an Applet if (applet != null) { orb_ = org.omg.CORBA.ORB.init (applet, null); @@ -39,16 +37,16 @@ public class PushConsumerFactory else { // not running as an Applet, but as an normal Application orb_ = org.omg.CORBA.ORB.init (args, null); } - + // Get the Naming Service initial reference - + // Name Service Lookup cannot be used when running as an Applet if (nameServiceIOR == null && applet != null) { System.out.println (" Name Service Lookup cannot be used when running as an Applet! Quit!"); System.exit (1); } - - if (nameServiceIOR == null) { // only used when running via "java" or "vbj" + + if (nameServiceIOR == null) { // only used when running via "java" or "vbj" System.out.println ("Using the lookup protocol!"); NS_Resolve ns_resolve = new NS_Resolve (); naming_service_object_ = ns_resolve.resolve_name_service (orb_); @@ -57,33 +55,33 @@ public class PushConsumerFactory System.out.println ("Using the following IOR: " + nameServiceIOR); naming_service_object_ = orb_.string_to_object (nameServiceIOR); } - - } + + } catch(org.omg.CORBA.SystemException e) { System.err.println ("PushConsumerFactory constructor: ORB and Name Service initialization"); System.err.println(e); - } - + } + } - - public class Object_is_null_exception extends Exception + + public class Object_is_null_exception extends Exception { Object_is_null_exception (String s) { super (s); } } - + public void run () { try { - + // Get the Naming Context to allow resolving the EventService and // ScheduleService - CosNaming.NamingContext naming_context = + CosNaming.NamingContext naming_context = CosNaming.NamingContextHelper.narrow (naming_service_object_); - + if (naming_context == null) { System.err.println ("The Naming Context is null"); @@ -101,8 +99,8 @@ public class PushConsumerFactory { throw new Object_is_null_exception("EventService Object is null"); } - - RtecEventChannelAdmin.EventChannel event_channel = + + RtecEventChannelAdmin.EventChannel event_channel = RtecEventChannelAdmin.EventChannelHelper.narrow (event_channel_object); System.out.println ("Reference to the Event Service is ok."); @@ -111,39 +109,39 @@ public class PushConsumerFactory CosNaming.NameComponent[] s_name_components = new CosNaming.NameComponent[1]; s_name_components[0] = new CosNaming.NameComponent ("ScheduleService",""); - org.omg.CORBA.Object scheduler_object = naming_context.resolve (s_name_components); - + org.omg.CORBA.Object scheduler_object = naming_context.resolve (s_name_components); + if (scheduler_object == null) { throw new Object_is_null_exception("ScheduleService Object is null"); } - - RtecScheduler.Scheduler scheduler = + + RtecScheduler.Scheduler scheduler = RtecScheduler.SchedulerHelper.narrow (scheduler_object); - + System.out.println ("Reference to the Naming Service is ok."); - - + + // Start the consumer System.out.println ("Instantiating the Push Consumer."); PushConsumer pushConsumer = new PushConsumer (orb_, dataHandler_); System.out.println ("Initializing the Push Consumer."); pushConsumer.open_consumer (event_channel, scheduler, "demo_consumer"); - + // Tell the CORBA environment that we are ready - + orb_.connect (pushConsumer); - - System.out.println ("Going into the event dispatching loop."); - + System.out.println ("Going into the event dispatching loop."); + + java.lang.Object sync = new java.lang.Object(); synchronized (sync) { sync.wait(); } } catch (java.lang.InterruptedException e) - { + { } catch (CosNaming.NamingContextPackage.CannotProceed e) { @@ -158,18 +156,18 @@ public class PushConsumerFactory catch (CosNaming.NamingContextPackage.NotFound e) { System.err.println ("CosNaming.NamingContextPackage.NotFound"); - System.err.println (e); + System.err.println (e); } catch (Object_is_null_exception e) { System.err.println (e); } - catch(org.omg.CORBA.SystemException e) + catch(org.omg.CORBA.SystemException e) { System.err.println ("PushConsumerFactory.run: Failure"); System.err.println(e); - } - } + } + } } // public class PushConsumerFactory diff --git a/TAO/interop-tests/CdrOutArg/orbix/cxx_demo.mk b/TAO/interop-tests/CdrOutArg/orbix/cxx_demo.mk index 85db56bcedc..c258efe2d2a 100644 --- a/TAO/interop-tests/CdrOutArg/orbix/cxx_demo.mk +++ b/TAO/interop-tests/CdrOutArg/orbix/cxx_demo.mk @@ -1,4 +1,3 @@ -#$Id$ ################################################################################# # # Copyright (c) 1993-2009 Progress Software Corporation and/or diff --git a/TAO/interop-tests/CdrOutArg/orbix/demo.mk b/TAO/interop-tests/CdrOutArg/orbix/demo.mk index 9391e205e13..0e757269c19 100644 --- a/TAO/interop-tests/CdrOutArg/orbix/demo.mk +++ b/TAO/interop-tests/CdrOutArg/orbix/demo.mk @@ -1,4 +1,3 @@ -#$Id$ ################################################################################# # # Copyright (c) 1993-2009 Progress Software Corporation and/or diff --git a/TAO/interop-tests/CdrOutArg/orbix/makefile b/TAO/interop-tests/CdrOutArg/orbix/makefile index 05132c66657..865cd473c4b 100644 --- a/TAO/interop-tests/CdrOutArg/orbix/makefile +++ b/TAO/interop-tests/CdrOutArg/orbix/makefile @@ -1,4 +1,3 @@ -# $Id$ # mcknerney, 11/7/2013 CXXLOCAL_DEFINES= diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl.for_ifr b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl.for_ifr index 220d3c09aa0..39bdf17c395 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl.for_ifr +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl.for_ifr @@ -1,13 +1,9 @@ -// $Id$ - -//IDL - #ifndef TAO_COUNTRY_IDL #define TAO_COUNTRY_IDL //#include "orbsvcs/CosEventComm.idl" -interface Country //: ::CosTypedEventComm::TypedPushConsumer +interface Country //: ::CosTypedEventComm::TypedPushConsumer { void update_population (in string country, in long population); diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/README.uav b/TAO/orbsvcs/tests/AVStreams/mpeg/README.uav index d41cac85743..147a30103fa 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/README.uav +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/README.uav @@ -1,7 +1,5 @@ -$Id$ - The original MPEG player in this directory has been removed, -since it has been superceded by a better example, developed +since it has been superseded by a better example, developed jointly by BBN Technologies and OOMWorks. The example is available here: diff --git a/TAO/orbsvcs/tests/EC_Multiple/dyn_plot b/TAO/orbsvcs/tests/EC_Multiple/dyn_plot index ee3c5450ad0..02db8eb38ab 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/dyn_plot +++ b/TAO/orbsvcs/tests/EC_Multiple/dyn_plot @@ -2,8 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; -# $Id$ -# # Plots two lines, with min-max ranges, from two DYN.LCL.tbl files. # # The first three lines above let this script run without specifying the diff --git a/TAO/orbsvcs/tests/EC_Multiple/gen_dynamic b/TAO/orbsvcs/tests/EC_Multiple/gen_dynamic index a1b80e258e6..ad39cc51c1f 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/gen_dynamic +++ b/TAO/orbsvcs/tests/EC_Multiple/gen_dynamic @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# HP_SUPPLIERS="1" LP_CONSUMERS="1 10 100 200 300 500 1000" diff --git a/TAO/orbsvcs/tests/EC_Multiple/gen_latency b/TAO/orbsvcs/tests/EC_Multiple/gen_latency index 4d79000e45d..07456dcefe3 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/gen_latency +++ b/TAO/orbsvcs/tests/EC_Multiple/gen_latency @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# HP_SUPPLIERS="1 2 10" HP_CONSUMERS="1 5 10 20" diff --git a/TAO/orbsvcs/tests/EC_Multiple/gen_overhead b/TAO/orbsvcs/tests/EC_Multiple/gen_overhead index 3f6cf50acd5..6cf0518aa23 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/gen_overhead +++ b/TAO/orbsvcs/tests/EC_Multiple/gen_overhead @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# #TESTS_SOURCES="X LCL RMT1 RMT2 RPT.X RPT.LCL RPT.RMT1 RPT.RMT2" TESTS_SOURCES="RPT.X RPT.LCL RPT.RMT1 RPT.RMT2" @@ -72,7 +69,7 @@ for i in $TESTS; do *) LABEL="Test Number [unknown test]" ;; esac - + gnuplot <<_EOF_ set grid xtics ytics set xlabel "$LABEL" diff --git a/TAO/orbsvcs/tests/EC_Multiple/gen_throughput b/TAO/orbsvcs/tests/EC_Multiple/gen_throughput index 6dce32939d0..5cea1f25bcd 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/gen_throughput +++ b/TAO/orbsvcs/tests/EC_Multiple/gen_throughput @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# HP_CONSUMERS="1 5 10 20" # The number of high priority consumers. diff --git a/TAO/orbsvcs/tests/EC_Multiple/gen_utilization b/TAO/orbsvcs/tests/EC_Multiple/gen_utilization index f39760531f0..ad0941c1fd7 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/gen_utilization +++ b/TAO/orbsvcs/tests/EC_Multiple/gen_utilization @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# HP_WORKLOADS="60 65 70 72 74 76 78 80 81 82 83 84 85 86 87 88 89 90" diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_dynamic b/TAO/orbsvcs/tests/EC_Multiple/run_dynamic index 9a1e98fc31c..8669e5b9b1d 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/run_dynamic +++ b/TAO/orbsvcs/tests/EC_Multiple/run_dynamic @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# # The number of messages to send. MSG_COUNT=100 diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_latency b/TAO/orbsvcs/tests/EC_Multiple/run_latency index b387707ac5b..d80b451096e 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/run_latency +++ b/TAO/orbsvcs/tests/EC_Multiple/run_latency @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# # The number of messages to send. MSG_COUNT=100 diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_overhead b/TAO/orbsvcs/tests/EC_Multiple/run_overhead index bcafe566537..c8fe5e11b2b 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/run_overhead +++ b/TAO/orbsvcs/tests/EC_Multiple/run_overhead @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# MSG_INTERVAL=5000 # 50000 # The interval between the messages, in usecs diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_schedule b/TAO/orbsvcs/tests/EC_Multiple/run_schedule index 7512b8914d1..c0e25960a32 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/run_schedule +++ b/TAO/orbsvcs/tests/EC_Multiple/run_schedule @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# # The number of high-priority messages to send. HP_MSG_COUNT=400 diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_throughput b/TAO/orbsvcs/tests/EC_Multiple/run_throughput index 4c922b89658..de208bf8593 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/run_throughput +++ b/TAO/orbsvcs/tests/EC_Multiple/run_throughput @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# MSG_COUNT=500 # The number of messages to send. diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_utilization b/TAO/orbsvcs/tests/EC_Multiple/run_utilization index 4a40e6c7e06..833d4b27d92 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/run_utilization +++ b/TAO/orbsvcs/tests/EC_Multiple/run_utilization @@ -1,6 +1,4 @@ #!/bin/sh -# -# $Id$ HP_WORKLOADS="0 60 65 70 72 74 76 78 80 81 82 83 84 85 86 87 88 89 90" HP_MSGS=200 diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys index e069725985e..fb616747524 100755 --- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys +++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys @@ -1,5 +1,4 @@ #!/bin/bash -x -# $Id$ openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \ -out server-cert.pem -keyout server-key.pem \ @@ -7,11 +6,11 @@ openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \ cat server-cert.pem >>server-key.pem cat server-cert.pem >ca.pem - + openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \ -out client-cert.pem -keyout client-key.pem \ -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=client" cat client-cert.pem >>client-key.pem cat client-cert.pem >>ca.pem - + diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys index e069725985e..fb616747524 100755 --- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys +++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys @@ -1,5 +1,4 @@ #!/bin/bash -x -# $Id$ openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \ -out server-cert.pem -keyout server-key.pem \ @@ -7,11 +6,11 @@ openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \ cat server-cert.pem >>server-key.pem cat server-cert.pem >ca.pem - + openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \ -out client-cert.pem -keyout client-key.pem \ -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=client" cat client-cert.pem >>client-key.pem cat client-cert.pem >>ca.pem - + diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys index e069725985e..fb616747524 100755 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys @@ -1,5 +1,4 @@ #!/bin/bash -x -# $Id$ openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \ -out server-cert.pem -keyout server-key.pem \ @@ -7,11 +6,11 @@ openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \ cat server-cert.pem >>server-key.pem cat server-cert.pem >ca.pem - + openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \ -out client-cert.pem -keyout client-key.pem \ -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=client" cat client-cert.pem >>client-key.pem cat client-cert.pem >>ca.pem - + diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic index 63da9842c39..4135bf8aa6c 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic @@ -1,7 +1,4 @@ -# $Id$ -# # Please see $TAO_ROOT/docs/Options.html for details on these options. -# dynamic Resource_Factory Service_Object * TAO:_make_TAO_Default_Resource_Factory() "-ORBResources global -ORBReactorlock null -ORBInputCDRAllocator null" dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null" diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test index e52dd38cece..c8949aa0b53 100755 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test @@ -1,6 +1,4 @@ #! /bin/sh -# $Id$ -# # Spawns MT_Cubit server and client executables on a single host. usage="usage: $0 [-n <iterations>] [-r <host>] [-t] [-l] <# low priority threads>" diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README.tests b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README.tests index c81387596f6..13150470eb2 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README.tests +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README.tests @@ -1,12 +1,10 @@ -// $Id$ - Note: this file is in very rough version. Updates are coming soon. ORB/OS CPU processing Overhead Test ----------------------- 1. Execute the following command to obtain latency for CORBA requests: - ./client -u 10000000 + ./client -u 10000000 NOTE: This runs a copy of the server in the same process as the client and executes 10,000,000 CORBA requests. Take a note of the total latency (L1). @@ -40,5 +38,5 @@ Context Switch Test ------------------- Use the same arguments as the latency test, and add "-c" -NOTE: For Windows NT use a tool like Microsoft Spy that is installed with +NOTE: For Windows NT use a tool like Microsoft Spy that is installed with MS Visual C++ to obtain the context switch data. diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/plot b/TAO/performance-tests/Cubit/TAO/MT_Cubit/plot index d83cc92e988..8eb7c3fee5b 100755 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/plot +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/plot @@ -2,8 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}' & eval 'exec perl -w -S $0 $argv:q' if 0; -# $Id$ -# # Plots output from summarize. open (HIGH_LATENCY, "> h") || die "$0: unable to open \"h\""; diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/summarize b/TAO/performance-tests/Cubit/TAO/MT_Cubit/summarize index 3fb8cf24cc8..72333e5c245 100755 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/summarize +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/summarize @@ -2,8 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}' & eval 'exec perl -w -S $0 $argv:q' if 0; -# $Id$ -# # Summarizes results from a series of runs of MT_Cubit_Test, with # different numbers of clients. Example usage: # diff --git a/TAO/tao/PI/diff/PolicyFactory.diff b/TAO/tao/PI/diff/PolicyFactory.diff index c91fa7f65da..f05dda1497b 100644 --- a/TAO/tao/PI/diff/PolicyFactory.diff +++ b/TAO/tao/PI/diff/PolicyFactory.diff @@ -3,8 +3,6 @@ @@ -1,6 +1,6 @@ // -*- C++ -*- // --// $Id$ -+// $Id$ // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** // TAO and the TAO IDL Compiler have been developed by: @@ -109,8 +107,6 @@ @@ -1,6 +1,6 @@ // -*- C++ -*- // --// $Id$ -+// $Id$ // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** // TAO and the TAO IDL Compiler have been developed by: diff --git a/TAO/tao/PortableServer/diffs/PS_Forward.diff b/TAO/tao/PortableServer/diffs/PS_Forward.diff index db64ebb520b..c7fab42e6fa 100644 --- a/TAO/tao/PortableServer/diffs/PS_Forward.diff +++ b/TAO/tao/PortableServer/diffs/PS_Forward.diff @@ -3,15 +3,13 @@ @@ -1,6 +1,6 @@ // -*- C++ -*- // --// $Id$ -+// $Id$ - + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** // TAO and the TAO IDL Compiler have been developed by: @@ -61,11 +61,24 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ - + +class TAO_ServantBase; +class TAO_ServantBase_var; +class TAO_Local_ServantBase; @@ -20,7 +18,7 @@ + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 - + namespace PortableServer { + typedef TAO_ServantBase ServantBase; @@ -30,7 +28,7 @@ + + typedef TAO_Local_ServantBase LocalServantBase; + typedef TAO_DynamicImplementation DynamicImplementation; - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:472 @@ -113,27 +126,6 @@ @@ -40,7 +38,7 @@ - -#if !defined (_PORTABLESERVER_POA__TRAITS_CH_) -#define _PORTABLESERVER_POA__TRAITS_CH_ -- +- - template<> - struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POA> - { @@ -59,5 +57,5 @@ - -#endif /* end #if !defined */ } - + // TAO_IDL - Generated from diff --git a/TAO/tests/CSD_Collocation/svc.conf.csd b/TAO/tests/CSD_Collocation/svc.conf.csd index 2e5fd28b84e..f9130f04785 100644 --- a/TAO/tests/CSD_Collocation/svc.conf.csd +++ b/TAO/tests/CSD_Collocation/svc.conf.csd @@ -1,7 +1,4 @@ -# $Id$ -# # Please see $TAO_ROOT/docs/Options.html for details on these options. -# # This is a single threaded "server." static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null" diff --git a/TAO/tests/Explicit_Event_Loop/CHANGES b/TAO/tests/Explicit_Event_Loop/CHANGES index 6e0c6694fc2..1dd8729ad74 100644 --- a/TAO/tests/Explicit_Event_Loop/CHANGES +++ b/TAO/tests/Explicit_Event_Loop/CHANGES @@ -1,19 +1,17 @@ -$Id$ - -Changelog for chapter 3 example in "Advanced CORBA Programming -with C++" by Michi Henning and Steve Vinoski, Copyright 1999, +Changelog for chapter 3 example in "Advanced CORBA Programming +with C++" by Michi Henning and Steve Vinoski, Copyright 1999, Addison-Wesley, Reading, MA. The following changes have been made -to the book's source code to make the example work with TAO and +to the book's source code to make the example work with TAO and with various platforms and compilers. ______________________________________________________________________________ ESSENTIAL CHANGES: - 1. changed filenames .cc to .cpp and .hh h, and modified #includes in + 1. changed filenames .cc to .cpp and .hh h, and modified #includes in client.cpp server.cpp and server.h appropriately. 2. a) changed #include "time.h" to #include "timeC.h" in client.cpp - b) Moved standard #includes below local #includes, and commented-out + b) Moved standard #includes below local #includes, and commented-out unnecessary #includes to avoid warnings and errors (g++) -client.cpp now reads: #include "timeC.h" @@ -26,18 +24,18 @@ ESSENTIAL CHANGES: ______________________________________________________________________________ ADDITIONAL CHANGES: - 3. added .in() to _var type parameters + 3. added .in() to _var type parameters -3 times in client.cpp for calls to is_nil() and _narrow() - -3 times in main() in server.cpp for calls to _narrow(), + -3 times in main() in server.cpp for calls to _narrow(), object_to_string, and << ______________________________________________________________________________ CHANGES MADE EXCLUSIVLY FOR TESTING PURPOSES - 4. to allow the test to be built without exceptions=1, all try/catch - code has been replaced with ACE_TRY macros, and the CORBA Environment + 4. to allow the test to be built without exceptions=1, all try/catch + code has been replaced with ACE_TRY macros, and the CORBA Environment variable has been added to the parameters of get_gmt(). - + 5. In server.cpp, the call to orb->run() has been replaced with an explicit event utilizing orb->work_pending() and orb->perform_work(). diff --git a/TAO/tests/Oneways_Invoking_Twoways/svcconf b/TAO/tests/Oneways_Invoking_Twoways/svcconf index 1987d3d81c6..13521616fb4 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/svcconf +++ b/TAO/tests/Oneways_Invoking_Twoways/svcconf @@ -1,8 +1,5 @@ -# $Id$ -# - # This configuration file is used to use only the default TAO -# strategies +# strategies dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt" diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic b/TAO/tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic index 8b03973b4b9..c288d674567 100644 --- a/TAO/tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic +++ b/TAO/tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic @@ -1,3 +1 @@ -# $Id$ - static RT_ORB_Loader "-RTORBDynamicThreadIdleTimeout 1000000" diff --git a/TAO/tests/Timeout/README.expected_behavior b/TAO/tests/Timeout/README.expected_behavior index 0b2c8fa6586..fad69c61ca5 100644 --- a/TAO/tests/Timeout/README.expected_behavior +++ b/TAO/tests/Timeout/README.expected_behavior @@ -1,5 +1,3 @@ -# $Id$ - This note documents results of my attempts to very carefully examine behaviour of Timeouts in TAO on real-time OS (such as Linux with RT patches) and to obtain a precise understand of behavior of timeouts. diff --git a/TAO/utils/catior/README.catior b/TAO/utils/catior/README.catior index a862cf0d7bb..8dbfe4f3cf7 100644 --- a/TAO/utils/catior/README.catior +++ b/TAO/utils/catior/README.catior @@ -1,5 +1,3 @@ -$Id$ - CatIOR is a utility that takes in a stringified IOR and decodes it, printing out the information contained in it. diff --git a/TAO/utils/nslist/README.nslist b/TAO/utils/nslist/README.nslist index 7f2b8ffd16c..181bef07998 100644 --- a/TAO/utils/nslist/README.nslist +++ b/TAO/utils/nslist/README.nslist @@ -1,7 +1,5 @@ -$Id$ - This utility lists the current entries in the Naming Service in a -nicely formatted manner. To run it, just type +nicely formatted manner. To run it, just type % nslist [[ --ior ][ --ctxior ] | --nsior ] @@ -28,7 +26,7 @@ reference entry and the IOR of the NameService itself. % nslist --ctxior -will additionally print the IORs of any subcontexts found within NameService. +will additionally print the IORs of any subcontexts found within NameService. % nslist --nsior |