summaryrefslogtreecommitdiff
path: root/TAO/CIAO/CCF
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/CIAO/CCF')
-rw-r--r--TAO/CIAO/CCF/Bootstrap.rules2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/LexicalAnalyzer.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/LexicalAnalyzer.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/Makefile.archive2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/Parser.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/Parser.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Elements.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Factory.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction/HomeExecutor.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Composition.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Elements.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Factory.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Factory.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SyntaxTree.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Composition.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Composition.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/HomeExecutor.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/HomeExecutor.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/Token.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/Traversal.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/Traversal/Composition.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/Traversal/Composition.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/Traversal/HomeExecutor.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/Traversal/HomeExecutor.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CIDL/Traversal/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.cpp5
-rw-r--r--TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.hpp205
-rw-r--r--TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp263
-rw-r--r--TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineGrammar.cpp5
-rw-r--r--TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp393
-rw-r--r--TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.cpp59
-rw-r--r--TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.hpp12
-rw-r--r--TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationBuffer.hpp10
-rw-r--r--TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationIDL.hpp10
-rw-r--r--TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp4
-rw-r--r--TAO/CIAO/CCF/CCF/CodeGenerationKit/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp40
-rw-r--r--TAO/CIAO/CCF/CCF/CompilerElements/Context.hpp6
-rw-r--r--TAO/CIAO/CCF/CCF/CompilerElements/Diagnostic.cpp1
-rw-r--r--TAO/CIAO/CCF/CCF/CompilerElements/Diagnostic.hpp1
-rw-r--r--TAO/CIAO/CCF/CCF/CompilerElements/ExH.hpp12
-rw-r--r--TAO/CIAO/CCF/CCF/CompilerElements/FileSystem.hpp15
-rw-r--r--TAO/CIAO/CCF/CCF/CompilerElements/Introspection.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/CompilerElements/Introspection.hpp1
-rw-r--r--TAO/CIAO/CCF/CCF/CompilerElements/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp309
-rw-r--r--TAO/CIAO/CCF/CCF/CompilerElements/ReferenceCounting.hpp12
-rw-r--r--TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp76
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Makefile.archive2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Parser.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Parser.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Parsing/Action.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Parsing/Elements.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Parsing/Recovery.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Attribute.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Elements.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Factory.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Attribute.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Include.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Include.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Interface.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Module.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Module.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Operation.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Include.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Interface.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Module.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/BuiltIn.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/BuiltIn.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.tpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Interface.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Interface.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Module.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Module.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Operation.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Operation.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Translation.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Translation.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueType.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueType.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Token.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Token.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal/BuiltIn.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal/BuiltIn.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal/Interface.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal/Interface.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal/Module.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal/Module.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal/Operation.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal/Operation.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal/Translation.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal/Translation.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/LexicalAnalyzer.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/LexicalAnalyzer.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Makefile.archive2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Parser.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Parser.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Component.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Consumes.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Elements.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Emits.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/EventType.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Factory.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Home.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Component.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Consumes.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Consumes.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Elements.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Emits.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Emits.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/EventType.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Home.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Provides.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Publishes.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Publishes.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Uses.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Provides.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Publishes.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Uses.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SyntaxTree.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/EventType.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/EventType.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Home.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Home.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Operation.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Operation.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Token.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Traversal.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Traversal/Component.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Traversal/Component.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Traversal/Home.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Traversal/Home.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Traversal/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Traversal/Operation.cpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/Traversal/Operation.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/Makefile.alt4
-rw-r--r--TAO/CIAO/CCF/Documentation/Build.html2
-rw-r--r--TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp2
-rw-r--r--TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.hpp2
-rw-r--r--TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp2
-rw-r--r--TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-1.idl2
-rw-r--r--TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.cidl2
-rw-r--r--TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.idl2
-rw-r--r--TAO/CIAO/CCF/Example/CIDL/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/indent_idl.cpp2
-rw-r--r--TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/Example/CodeGenerationKit/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/Example/Makefile.alt2
-rw-r--r--TAO/CIAO/CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl2
-rw-r--r--TAO/CIAO/CCF/Test/IDL2/Parser/Recovery/interface.idl2
-rw-r--r--TAO/CIAO/CCF/Test/IDL2/Parser/Recovery/module.idl2
203 files changed, 1611 insertions, 196 deletions
diff --git a/TAO/CIAO/CCF/Bootstrap.rules b/TAO/CIAO/CCF/Bootstrap.rules
index 0f60a4c3cda..b995b842d45 100644
--- a/TAO/CIAO/CCF/Bootstrap.rules
+++ b/TAO/CIAO/CCF/Bootstrap.rules
@@ -1,6 +1,6 @@
# file : Bootstrap.rules
# author : Boris Kolpackov <boris@kolpackov.net>
-# cvs-id : $id$
+# cvs-id : $Id$
# basics
#
diff --git a/TAO/CIAO/CCF/CCF/CIDL/LexicalAnalyzer.cpp b/TAO/CIAO/CCF/CCF/CIDL/LexicalAnalyzer.cpp
index 3fb305e6aa1..4a73d93397c 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/LexicalAnalyzer.cpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/LexicalAnalyzer.cpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/LexicalAnalyzer.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/CIDL/LexicalAnalyzer.hpp"
diff --git a/TAO/CIAO/CCF/CCF/CIDL/LexicalAnalyzer.hpp b/TAO/CIAO/CCF/CCF/CIDL/LexicalAnalyzer.hpp
index cbcaa9a84af..0ffd9b04912 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/LexicalAnalyzer.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/LexicalAnalyzer.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/LexicalAnalyzer.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_LEXICAL_ANALYZER_HPP
#define CCF_CIDL_LEXICAL_ANALYZER_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/Makefile.alt b/TAO/CIAO/CCF/CCF/CIDL/Makefile.alt
index 52d7722dafb..92932355815 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/CIDL/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/CIDL/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root := ../..
diff --git a/TAO/CIAO/CCF/CCF/CIDL/Makefile.archive b/TAO/CIAO/CCF/CCF/CIDL/Makefile.archive
index 0fac4c23f8e..b4028a11644 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/Makefile.archive
+++ b/TAO/CIAO/CCF/CCF/CIDL/Makefile.archive
@@ -1,6 +1,6 @@
# file : CCF/CIDL/Makefile.archive
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../..
diff --git a/TAO/CIAO/CCF/CCF/CIDL/Parser.cpp b/TAO/CIAO/CCF/CCF/CIDL/Parser.cpp
index 15da8627f44..5ea093a4bf0 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/Parser.cpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/Parser.cpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/Parser.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/CIDL/Parser.hpp"
diff --git a/TAO/CIAO/CCF/CCF/CIDL/Parser.hpp b/TAO/CIAO/CCF/CCF/CIDL/Parser.hpp
index ccc54ae51cf..beaaf3db546 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/Parser.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/Parser.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/Parser.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_PARSER_HPP
#define CCF_CIDL_PARSER_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction.hpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction.hpp
index cb0a6db08dd..8d451a8baaf 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SemanticAction.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_SEMANTIC_ACTION_HPP
#define CCF_CIDL_SEMANTIC_ACTION_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp
index 039d60022f9..02e0e55ce4f 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SemanticAction/Composition.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/CIDL/SemanticAction/Composition.hpp"
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.hpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.hpp
index 8c413208099..71f67a85aec 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SemanticAction/Composition.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_SEMANTIC_ACTION_COMPOSITION_HPP
#define CCF_CIDL_SEMANTIC_ACTION_COMPOSITION_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Elements.hpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Elements.hpp
index 6abc20b7e1b..83c80bdf56b 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Elements.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SemanticAction/Elements.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_SEMANTIC_ACTION_ELEMENTS_HPP
#define CCF_CIDL_SEMANTIC_ACTION_ELEMENTS_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Factory.hpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Factory.hpp
index dd7ba59cee3..0ca55bbe47b 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Factory.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Factory.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SemanticAction/Factory.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_SEMANTIC_ACTION_FACTORY_HPP
#define CCF_CIDL_SEMANTIC_ACTION_FACTORY_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/HomeExecutor.hpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/HomeExecutor.hpp
index 0c6c0b10ae9..fca339e9fcb 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/HomeExecutor.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/HomeExecutor.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SemanticAction/HomeExecutor.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_SEMANTIC_ACTION_HOME_EXECUTOR_HPP
#define CCF_CIDL_SEMANTIC_ACTION_HOME_EXECUTOR_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp
index 1f0f7eb5fb8..27d8caf2f17 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SemanticAction/Impl/Composition.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/CIDL/SemanticAction/Impl/Composition.hpp"
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Composition.hpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Composition.hpp
index 1dd83d8ed70..0bde34b0740 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Composition.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Composition.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SemanticAction/Impl/Composition.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_SEMANTIC_ACTION_IMPL_COMPOSITION_HPP
#define CCF_CIDL_SEMANTIC_ACTION_IMPL_COMPOSITION_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Elements.hpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Elements.hpp
index 422d57f3ed9..8379bc63337 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Elements.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SemanticAction/Impl/Elements.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_SEMANTIC_ACTION_IMPL_ELEMENTS_HPP
#define CCF_CIDL_SEMANTIC_ACTION_IMPL_ELEMENTS_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Factory.cpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Factory.cpp
index 1b32c0b14c1..4987a9d61dd 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Factory.cpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Factory.cpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SemanticAction/Impl/Factory.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/CIDL/SemanticAction/Impl/Factory.hpp"
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Factory.hpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Factory.hpp
index 441f95b48a6..857fd4e275c 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Factory.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Factory.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SemanticAction/Impl/Factory.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_SEMANTIC_ACTION_IMPL_FACTORY_HPP
#define CCF_CIDL_SEMANTIC_ACTION_IMPL_FACTORY_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp
index a0cf40b7b8e..a14734c0b30 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/CIDL/SemanticAction/Impl/HomeExecutor.hpp"
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.hpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.hpp
index 8364f526cbb..83944a9a3ab 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SemanticAction/Impl/HomeExecutor.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_SEMANTIC_ACTION_IMPL_HOME_EXECUTOR_HPP
#define CCF_CIDL_SEMANTIC_ACTION_IMPL_HOME_EXECUTOR_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Makefile.alt b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Makefile.alt
index 90017394a9f..f89e7ea0726 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/CIDL/SemanticAction/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../../..
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree.hpp b/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree.hpp
index 5a94d3fa045..71ff42e2771 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SyntaxTree.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_SYNTAX_TREE_HPP
#define CCF_CIDL_SYNTAX_TREE_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Composition.cpp b/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Composition.cpp
index 2ca82d8dd0d..bc24cb8d732 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Composition.cpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Composition.cpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SyntaxTree/Composition.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/CIDL/SyntaxTree/Composition.hpp"
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Composition.hpp b/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Composition.hpp
index 4202753137d..446a702cef9 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Composition.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Composition.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SyntaxTree/Composition.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_SYNTAX_TREE_COMPOSITION_HPP
#define CCF_CIDL_SYNTAX_TREE_COMPOSITION_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/HomeExecutor.cpp b/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/HomeExecutor.cpp
index 3e064402df8..0557e43cd04 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/HomeExecutor.cpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/HomeExecutor.cpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SyntaxTree/HomeExecutor.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/CIDL/SyntaxTree/HomeExecutor.hpp"
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/HomeExecutor.hpp b/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/HomeExecutor.hpp
index dd0048bb953..63f9047aae7 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/HomeExecutor.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/HomeExecutor.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/SyntaxTree/HomeExecutor.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_SYNTAX_TREE_HOME_EXECUTOR_HPP
#define CCF_CIDL_SYNTAX_TREE_HOME_EXECUTOR_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Makefile.alt b/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Makefile.alt
index b41f935d72a..d7ac4c25d7b 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/CIDL/SyntaxTree/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/CIDL/SyntaxTree/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../../..
diff --git a/TAO/CIAO/CCF/CCF/CIDL/Token.hpp b/TAO/CIAO/CCF/CCF/CIDL/Token.hpp
index 368511ec670..40bd13b252c 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/Token.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/Token.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/Token.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_TOKEN_HPP
#define CCF_CIDL_TOKEN_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/Traversal.hpp b/TAO/CIAO/CCF/CCF/CIDL/Traversal.hpp
index 7e58168fce9..a1e071847f1 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/Traversal.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/Traversal.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/Traversal.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_TRAVERSAL_HPP
#define CCF_CIDL_TRAVERSAL_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/Traversal/Composition.cpp b/TAO/CIAO/CCF/CCF/CIDL/Traversal/Composition.cpp
index d204c31f177..ed5cbc50e9f 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/Traversal/Composition.cpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/Traversal/Composition.cpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/Traversal/Composition.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/CIDL/Traversal/Composition.hpp"
diff --git a/TAO/CIAO/CCF/CCF/CIDL/Traversal/Composition.hpp b/TAO/CIAO/CCF/CCF/CIDL/Traversal/Composition.hpp
index dcc1b8d70db..7cc7f94e4c3 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/Traversal/Composition.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/Traversal/Composition.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/Traversal/Composition.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_TRAVERSAL_COMPOSITION_HPP
#define CCF_CIDL_TRAVERSAL_COMPOSITION_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/Traversal/HomeExecutor.cpp b/TAO/CIAO/CCF/CCF/CIDL/Traversal/HomeExecutor.cpp
index 9919c1a9fd6..f228c780792 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/Traversal/HomeExecutor.cpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/Traversal/HomeExecutor.cpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/Traversal/HomeExecutor.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/CIDL/Traversal/HomeExecutor.hpp"
diff --git a/TAO/CIAO/CCF/CCF/CIDL/Traversal/HomeExecutor.hpp b/TAO/CIAO/CCF/CCF/CIDL/Traversal/HomeExecutor.hpp
index 04423678250..17e2f46dc1e 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/Traversal/HomeExecutor.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/Traversal/HomeExecutor.hpp
@@ -1,6 +1,6 @@
// file : CCF/CIDL/Traversal/HomeExecutor.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_CIDL_TRAVERSAL_HOME_EXECUTOR_HPP
#define CCF_CIDL_TRAVERSAL_HOME_EXECUTOR_HPP
diff --git a/TAO/CIAO/CCF/CCF/CIDL/Traversal/Makefile.alt b/TAO/CIAO/CCF/CCF/CIDL/Traversal/Makefile.alt
index 1955bc0e988..273bc5031b2 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/Traversal/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/CIDL/Traversal/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/CIDL/Traversal/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../../..
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.cpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.cpp
new file mode 100644
index 00000000000..018aea6ffcf
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.cpp
@@ -0,0 +1,5 @@
+// file : CCF/CodeGenerationKit/CommandLine.cpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#include "CCF/CodeGenerationKit/CommandLine.hpp"
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.hpp
new file mode 100644
index 00000000000..32655380386
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.hpp
@@ -0,0 +1,205 @@
+// file : CCF/CodeGenerationKit/CommandLine.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#ifndef COMMAND_LINE_HPP
+#define COMMAND_LINE_HPP
+
+#include <algorithm>
+#include <vector>
+#include <string>
+
+using namespace std;
+
+//@@ this stuff needs proper reimplementation
+
+class CommandLine
+{
+public:
+
+ CommandLine () throw () : separator (false) {}
+
+
+ // Option constrain checking
+public:
+
+ bool
+ require (std::string option) const throw ()
+ {
+ return std::find_if (options.begin (),
+ options.end (),
+ OptionNamePredicat (option)) != options.end ();
+ }
+
+ bool
+ depends (std::string dependant,
+ std::string principal) const throw ()
+ {
+ Options::const_iterator begin = options.begin ();
+ Options::const_iterator end = options.end ();
+
+ if (std::find_if (begin, end, OptionNamePredicat (dependant)) != end)
+ {
+ return std::find_if (begin, end, OptionNamePredicat (principal)) != end;
+ }
+ else
+ {
+ return true;
+ }
+ }
+
+ bool
+ inconsistent (std::string a,
+ std::string b) const throw ()
+ {
+ Options::const_iterator begin = options.begin ();
+ Options::const_iterator end = options.end ();
+
+ if (std::find_if (begin, end, OptionNamePredicat (a)) != end)
+ {
+ return std::find_if (begin, end, OptionNamePredicat (b)) == end;
+ }
+ else
+ {
+ return true;
+ }
+ }
+
+ std::string
+ get_value (std::string name, std::string const& not_found_value) const
+ {
+ Options::const_iterator i = std::find_if (
+ options.begin (),
+ options.end (),
+ OptionNamePredicat (name));
+
+ if (i != options.end () && !(i->value_.empty ()))
+ {
+ return i->value_;
+ }
+ else
+ {
+ return not_found_value;
+ }
+ }
+
+ std::string
+ get_value (std::string name, char const* not_found_value) const
+ {
+ Options::const_iterator i = std::find_if (
+ options.begin (),
+ options.end (),
+ OptionNamePredicat (name));
+
+ if (i != options.end () && !(i->value_.empty ()))
+ {
+ return i->value_;
+ }
+ else
+ {
+ return std::string (not_found_value);
+ }
+ }
+
+ bool
+ get_value (std::string name, bool not_found_value) const
+ {
+ Options::const_iterator i = std::find_if (
+ options.begin (),
+ options.end (),
+ OptionNamePredicat (name));
+
+ if (i != options.end ())
+ {
+ return true;
+ }
+ else
+ {
+ return not_found_value;
+ }
+ }
+
+ // Arguments
+ //
+ //
+
+ typedef
+ std::vector<std::string>
+ Arguments;
+
+ typedef
+ Arguments::const_iterator
+ ArgumentIterator;
+
+ ArgumentIterator
+ argument_begin () const
+ {
+ return arguments.begin ();
+ }
+
+
+ ArgumentIterator
+ argument_end () const
+ {
+ return arguments.end ();
+ }
+
+
+public:
+
+ struct Option
+ {
+ enum OptionType
+ {
+ EQUATIONAL,
+ COMPOSITE
+ };
+
+ Option (OptionType type,
+ std::string const& name,
+ std::string const& value) throw ()
+ : type_ (type),
+ name_ (name),
+ value_ (value)
+ {
+ }
+
+ OptionType type_;
+ std::string name_;
+ std::string value_;
+ };
+
+
+
+ struct OptionNamePredicat
+ {
+ OptionNamePredicat (std::string const& name)
+ : name_ (name)
+ {
+ }
+
+ bool operator ()(Option const& option) throw ()
+ {
+ return name_ == option.name_;
+ }
+
+ private:
+ std::string const name_;
+ };
+
+ typedef
+ std::vector<Option>
+ Options;
+
+ typedef
+ std::vector<std::string>
+ Arguments;
+
+ std::string command;
+ Options options;
+ Arguments arguments;
+
+ bool separator;
+};
+
+#endif // COMMAND_LINE_HPP
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp
new file mode 100644
index 00000000000..42cfcb5051f
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp
@@ -0,0 +1,263 @@
+// file : CCF/CodeGenerationKit/CommandLineDescriptor.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#ifndef COMMAND_LINE_DESCRIPTOR_H
+#define COMMAND_LINE_DESCRIPTOR_H
+
+#include <string>
+#include <vector>
+#include <ostream>
+
+//@@ temporary. should probably be changed to CommandLine
+namespace CL
+{
+ class OptionDescription
+ {
+ public:
+ OptionDescription (std::string name,
+ std::string description,
+ bool optional)
+ : optional_ (optional),
+ name_ (name),
+ value_synopsis_ (),
+ description_ (description)
+ {
+ }
+
+
+ OptionDescription (std::string name,
+ std::string value_synopsis,
+ std::string description,
+ bool optional)
+ : optional_ (optional),
+ name_ (name),
+ value_synopsis_ (value_synopsis),
+ description_ (description)
+ {
+ }
+
+ public:
+ bool
+ optional () const
+ {
+ return optional_;
+ }
+
+ std::string
+ name () const
+ {
+ return name_;
+ }
+
+ std::string
+ value_synopsis () const
+ {
+ return value_synopsis_;
+ }
+
+ std::string
+ description () const
+ {
+ return description_;
+ }
+
+
+ private:
+ bool optional_;
+ std::string name_;
+ std::string value_synopsis_;
+ std::string description_;
+ };
+
+
+ class Description
+ {
+ public:
+ Description (std::string command)
+ : command_ (command)
+ {
+ }
+
+ private:
+ typedef
+ std::vector<OptionDescription>
+ OptionDescriptionList;
+
+ public:
+
+ std::string
+ command () const
+ {
+ return command_;
+ }
+
+
+ public:
+ typedef
+ OptionDescriptionList::const_iterator
+ OptionIterator;
+
+ OptionIterator
+ begin_option () const
+ {
+ return options_.begin ();
+ }
+
+ OptionIterator
+ end_option () const
+ {
+ return options_.end ();
+ }
+
+ void
+ add_option (OptionDescription const& od)
+ {
+ options_.push_back (od);
+ }
+
+ private:
+ typedef
+ std::vector<std::string>
+ ArgumentDescriptionList;
+
+ public:
+ typedef
+ ArgumentDescriptionList::const_iterator
+ ArgumentIterator;
+
+ ArgumentIterator
+ begin_argument () const
+ {
+ return arguments_.begin ();
+ }
+
+ ArgumentIterator
+ end_argument () const
+ {
+ return arguments_.end ();
+ }
+
+ void
+ add_argument (std::string arg)
+ {
+ arguments_.push_back (arg);
+ }
+
+ private:
+
+ std::string command_;
+ OptionDescriptionList options_;
+ ArgumentDescriptionList arguments_;
+ };
+
+ inline void
+ print_text (std::ostream& os, Description const& d)
+ {
+ os << d.command ();
+
+ Description::OptionIterator ob = d.begin_option ();
+ Description::OptionIterator oe = d.end_option ();
+
+ if (ob != oe)
+ {
+ os << " { OPTIONS }";
+ }
+
+ Description::ArgumentIterator ab = d.begin_argument ();
+ Description::ArgumentIterator ae = d.end_argument ();
+
+ for (; ab != ae; ab++)
+ {
+ os << " <" << *ab << ">";
+ }
+
+ os << endl << endl;
+
+ for (; ob != oe; ob++)
+ {
+ os << (ob->optional () ? "[--" : "--")
+ << ob->name ()
+ << (ob->value_synopsis ().empty () ? "" : " ")
+ << ob->value_synopsis ()
+ << (ob->optional () ? "]" : "")
+ << endl;
+
+ os << "\t\t" << ob->description () << endl;
+ }
+
+ }
+
+
+ inline void
+ print_html (std::ostream& os, Description const& d)
+ {
+ os << "<html>" << endl
+ << "<body>" << endl
+ << "<div align=\"center\">" << endl
+ << "<table width=\"700\" border=\"0\" cellspacing=\"0\" "
+ << "cellpadding=\"0\">" << endl
+ << "<tr>" << endl
+ << "<td>" << endl;
+
+ os << "<p>" << endl
+ << "<code>" << endl;
+
+ os << d.command ();
+
+ Description::OptionIterator ob = d.begin_option ();
+ Description::OptionIterator oe = d.end_option ();
+
+ if (ob != oe)
+ {
+ os << " { OPTIONS }";
+ }
+
+ Description::ArgumentIterator ab = d.begin_argument ();
+ Description::ArgumentIterator ae = d.end_argument ();
+
+ for (; ab != ae; ab++)
+ {
+ os << " &lt;" << *ab << "&gt;";
+ }
+
+ os << endl
+ << "</code>" << endl
+ << "</p>" << endl;
+
+
+ os << "<dl>" << endl;
+
+ for (; ob != oe; ob++)
+ {
+ os << "<dt>" << endl
+ << "<code>" << endl
+ << (ob->optional () ? "[--" : "--")
+ << ob->name ()
+ << (ob->value_synopsis ().empty () ? "" : " ")
+ << ob->value_synopsis ()
+ << (ob->optional () ? "]" : "") << endl
+ << "</code>" << endl
+ << "</dt>" << endl;
+
+ os << "<dd>" << endl
+ << "<p>" << endl
+ << ob->description () << endl
+ << "</p>" << endl
+ << "</dd>" << endl;
+ }
+
+ os << "</dl>" << endl;
+
+ os << "</td>" << endl
+ << "</tr>" << endl
+ << "</table>" << endl
+ << "</div>" << endl
+ << "</body>" << endl
+ << "</html>" << endl;
+
+ }
+}
+
+
+#endif // COMMAND_LINE_DESCRIPTOR_H
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineGrammar.cpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineGrammar.cpp
new file mode 100644
index 00000000000..fc700def53a
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineGrammar.cpp
@@ -0,0 +1,5 @@
+// file : CCF/CodeGenerationKit/CommandLineGrammar.cpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#include "CCF/CodeGenerationKit/CommandLineGrammar.hpp"
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp
new file mode 100644
index 00000000000..af9f38b4763
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp
@@ -0,0 +1,393 @@
+// file : CCF/CodeGenerationKit/CommandLineGrammar.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#ifndef COMMAND_LINE_GRAMMAR_H
+#define COMMAND_LINE_GRAMMAR_H
+
+#include <vector>
+#include <string>
+
+#include <boost/spirit.hpp>
+
+#include "CCF/CodeGenerationKit/CommandLine.hpp"
+
+
+using namespace std;
+using namespace boost::spirit;
+
+template <typename S>
+struct string_directive : public unary<S, parser<string_directive<S> > >
+{
+ typedef
+ string_directive
+ self_t;
+
+ string_directive (S const& a)
+ : unary<S, parser<string_directive<S> > > (a)
+ {
+ }
+
+ template <typename ScannerT>
+ typename parser_result<self_t, ScannerT>::type
+ parse(ScannerT const& scan) const
+ {
+ typedef
+ typename ScannerT::iterator_t
+ Iterator;
+
+ typedef
+ typename ScannerT::value_t
+ Value;
+
+ typedef
+ typename Value::const_iterator
+ ValueIterator;
+
+ Iterator save = scan.first;
+
+ int len = 0;
+
+ if (!scan.at_end())
+ {
+ // Now go one level deeper
+
+ Value const& v = *scan;
+
+ ValueIterator first = v.begin ();
+ ValueIterator last = v.end ();
+
+ scanner<ValueIterator, scanner_policies <> > sl_scan(first, last);
+
+ match<nil_t> hit = this->subject ().parse(sl_scan);
+
+ if (hit.length() == v.length ())
+ {
+ ++scan;
+
+ return scan.create_match(1, nil_t(), save, scan.first);
+ }
+ else
+ {
+ return scan.no_match();
+ }
+ }
+ else
+ {
+ return scan.no_match();
+ }
+ }
+};
+
+
+template <typename S>
+string_directive<S>
+string_d (parser<S> const& a)
+{
+ return string_directive<S>(a.derived());
+}
+
+
+struct CLineGrammar : public grammar<CLineGrammar>
+{
+ CommandLine& cl_;
+
+ CLineGrammar (CommandLine& cl) throw () : cl_(cl) {}
+
+
+ template <typename IteratorT, typename CodeT>
+ struct SemanticAction
+ {
+ SemanticAction (CommandLine& cl) : cl_ (cl), code_ () {}
+
+ void operator()(IteratorT first, IteratorT last) const
+ {
+ string str (first, last);
+ code_.execute (cl_, str);
+ }
+
+ private:
+ CommandLine& cl_;
+ CodeT code_;
+ };
+
+
+ struct SetCommandName
+ {
+ void execute (CommandLine& cl, string const& s) const throw ()
+ {
+ cl.command = s;
+ }
+ };
+
+
+ template <typename IteratorT>
+ struct SetOptionName
+ {
+ SetOptionName (CommandLine& cl,
+ CommandLine::Option::OptionType type)
+ : cl_ (cl), type_ (type)
+ {
+ }
+
+ void operator()(IteratorT first, IteratorT last) const
+ {
+ string s (first, last);
+ cl_.options.push_back (CommandLine::Option(type_, s, ""));
+ }
+
+ private:
+ CommandLine& cl_;
+ CommandLine::Option::OptionType type_;
+ };
+
+
+ struct SetOptionValue
+ {
+ void execute (CommandLine& cl, string const& s) const throw ()
+ {
+ CommandLine::Options::reverse_iterator r = cl.options.rbegin ();
+
+ if (r != cl.options.rend () && r->value_ == "")
+ {
+ r->value_ = s;
+ }
+ else
+ {
+ //@@
+ //throw
+ }
+ }
+ };
+
+ struct SetArgument
+ {
+ void execute (CommandLine& cl, string const& s) const throw ()
+ {
+ cl.arguments.push_back (s);
+ }
+ };
+
+ struct SetSeparator
+ {
+ void execute (CommandLine& cl, string const& s) const throw ()
+ {
+ cl.separator = true;
+ }
+ };
+
+
+ template <typename ScannerT>
+ struct definition
+ {
+ typedef
+ typename ScannerT::value_t::const_iterator
+ SLIterator;
+
+ typedef
+ scanner<SLIterator, scanner_policies <> >
+ SLScanner;
+
+ typedef
+ rule<ScannerT>
+ Rule;
+
+ typedef
+ rule<SLScanner>
+ SLRule;
+
+
+ Rule r_argument;
+ Rule r_arg_list;
+
+ Rule argument;
+ Rule arg_list;
+
+ SLRule option_prefix;
+ SLRule e_name; // equational name, i.e. can meet '='
+ SLRule c_name; // composite name, i.e. failes if meets '='
+ SLRule e_value; // equational value, i.e. can contain leading '-'
+ SLRule c_value; // composite value, i.e. cannot contain leading '-'
+
+ Rule composite;
+ Rule equational;
+
+ Rule option_list;
+ Rule option;
+
+ SLRule command_name;
+
+ Rule command_line;
+
+ // Semantic actions
+
+ typedef
+ SemanticAction<SLIterator, SetCommandName>
+ CommandNameHandler;
+
+ typedef
+ SetOptionName<SLIterator>
+ OptionNameHandler;
+
+ typedef
+ SemanticAction<SLIterator, SetOptionValue>
+ OptionValueHandler;
+
+ typedef
+ SemanticAction<SLIterator, SetArgument>
+ ArgumentHandler;
+
+ typedef
+ SemanticAction<SLIterator, SetSeparator>
+ SeperatorHandler;
+
+ /*
+
+ <epigraph>
+
+ As many people naively believe command line is
+ not a space separated array of words.
+
+ -- unknown author.
+ </epigraph>
+
+
+
+ NOTE:
+
+ (1) This grammar is space-sensitive.
+
+ (2) Anychar is assumend not to clash with <argv-delim>. Instead
+ <argv-delim> is assumed to be a next-dimension entitiy.
+
+
+ <command-line> ::= <command-name>
+ [
+ [ <argv-delim> <option-list>]
+ [
+ <option-prefix> [<argv-delim> <arg-list>] |
+ <argv-delim> <r-arg-list>
+ ]
+ ]
+
+ <command-name> ::= anychar+
+
+ <option-list> ::= <option> { <argv-delim> <option> }*
+ <option> ::= <composite> | <equational>
+ <composite> ::= <option-prefix> <name> [ <argv-delim><c-value> ]
+ <equational> ::= <option-prefix> <name> '=' <e-value>
+ <option-prefix> ::= '-' [ '-' ]
+ <name> ::= {anychar - '='}+
+ <c-value> ::= anychar+ - {<option-prefix> anychar*}
+ <e-valie> ::= anychar+
+
+ <arg-list> ::= <argument> { <arg-delim> <argument> }*
+ <r-arg-list> ::= <r-argument> { <arg-delim> <argument> }*
+
+ <argument> ::= anychar+
+ <r-argument> ::= anychar+ - {<option-prefix> anychar*}
+
+
+ */
+
+
+ definition(CLineGrammar const& self)
+ {
+ command_line =
+
+ string_d (command_name) >>
+ !option_list >>
+ !(
+ (
+ string_d
+ (
+ option_prefix[ SeperatorHandler (self.cl_) ]
+ ) >> !arg_list
+ ) | r_arg_list
+ );
+
+ // command name
+
+ command_name = (+anychar_p)[CommandNameHandler (self.cl_)];
+
+ // options
+
+ option_list = *(option);
+
+ option = composite | equational;
+
+ composite =
+
+ string_d
+ (
+ option_prefix >> c_name
+
+ ) >> !string_d (c_value);
+
+ equational = string_d (option_prefix >> e_name >> '=' >> e_value);
+
+ option_prefix = lexeme_d[ch_p('-') >> !ch_p('-')];
+
+ e_name =
+
+ lexeme_d
+ [
+ (
+ +(
+ anychar_p - ('=' | space_p)
+ )
+
+ )[ OptionNameHandler (self.cl_, CommandLine::Option::EQUATIONAL) ]
+ ];
+
+ c_name =
+
+ lexeme_d
+ [
+ (
+ +(anychar_p - space_p) -
+
+ (
+ *(anychar_p - '=') >> '=' >> *anychar_p
+ )
+
+ )[ OptionNameHandler (self.cl_, CommandLine::Option::COMPOSITE) ]
+ ];
+
+ e_value = (+anychar_p)[ OptionValueHandler (self.cl_) ];
+
+
+ c_value =
+ (
+ +anychar_p - ( option_prefix >> *anychar_p )
+
+ )[ OptionValueHandler (self.cl_) ];
+
+
+
+ // arguments
+
+ arg_list = *(argument);
+ r_arg_list = !(r_argument >> *argument);
+
+ argument = string_d ((+anychar_p)[ ArgumentHandler (self.cl_) ]);
+
+ r_argument = string_d
+ (
+ (
+ +anychar_p - (option_prefix >> *anychar_p)
+
+ )[ ArgumentHandler (self.cl_) ]
+ );
+
+ }
+
+ rule<ScannerT> const& start() const
+ {
+ return command_line;
+ }
+ };
+};
+
+
+#endif // COMMAND_LINE_GRAMMAR_H
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.cpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.cpp
new file mode 100644
index 00000000000..03d35a2d6a3
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.cpp
@@ -0,0 +1,59 @@
+// file : CCF/CodeGenerationKit/CommandLineParser.cpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#include "CCF/CodeGenerationKit/CommandLineParser.hpp"
+#include "CCF/CodeGenerationKit/CommandLineGrammar.hpp"
+
+#include <vector>
+#include <string>
+#include <iostream>
+
+using std::cerr;
+using std::endl;
+
+bool parse (int argc, char* argv[], CommandLine& cl) throw ()
+{
+ typedef
+ std::vector<std::string>
+ Argv;
+
+ Argv v;
+
+ for (int i = 0; i < argc; i++)
+ {
+ v.push_back (argv[i]);
+ }
+
+ Argv::iterator first = v.begin ();
+ Argv::iterator last = v.end ();
+
+ scanner<Argv::iterator, scanner_policies <> > scan(first, last);
+
+ CLineGrammar g (cl);
+
+ match<nil_t> hit = g.parse(scan);
+
+ bool result = hit.length() == v.size ();
+
+ // some semantic analisys
+ if (!cl.separator)
+ {
+ CommandLine::Options::reverse_iterator r = cl.options.rbegin ();
+
+ if (r != cl.options.rend () &&
+ r->value_ != "" &&
+ r->type_ == CommandLine::Option::COMPOSITE)
+ {
+
+ cerr << "command line: assuming <" << r->value_
+ << "> to be a value of option <" << r->name_
+ << "> and not the first argument" << endl;
+
+ cerr << "command line: write ... --" << r->name_ << " -- "
+ << r->value_ << " ... to indicate otherwise" << endl;
+ }
+ }
+
+ return result;
+}
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.hpp
new file mode 100644
index 00000000000..f985b448ae3
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.hpp
@@ -0,0 +1,12 @@
+// file : CCF/CodeGenerationKit/CommandLineParser.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#ifndef COMMAND_LINE_PARSER_H
+#define COMMAND_LINE_PARSER_H
+
+#include "CCF/CodeGenerationKit/CommandLine.hpp"
+
+bool parse (int argc, char* argv[], CommandLine& cl) throw ();
+
+#endif // COMMAND_LINE_PARSER_H
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationBuffer.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationBuffer.hpp
index a83acf84d52..75af953c318 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationBuffer.hpp
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationBuffer.hpp
@@ -1,5 +1,9 @@
-#ifndef CCF_CODE_GENERATION_KIT_INDENTATION_BUFFER
-#define CCF_CODE_GENERATION_KIT_INDENTATION_BUFFER
+// file : CCF/CodeGenerationKit/IndentationBuffer.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#ifndef CCF_CODE_GENERATION_KIT_INDENTATION_BUFFER_HPP
+#define CCF_CODE_GENERATION_KIT_INDENTATION_BUFFER_HPP
#include "CCF/CompilerElements/ExH.hpp"
@@ -53,4 +57,4 @@ namespace Indentation
};
}
-#endif // CCF_CODE_GENERATION_KIT_INDENTATION_BUFFER
+#endif // CCF_CODE_GENERATION_KIT_INDENTATION_BUFFER_HPP
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationIDL.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationIDL.hpp
index cc77cac30de..e8dcdea0ac3 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationIDL.hpp
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationIDL.hpp
@@ -1,5 +1,9 @@
-#ifndef CCF_CODE_GENERATION_KIT_INDENTATION_IDL
-#define CCF_CODE_GENERATION_KIT_INDENTATION_IDL
+// file : CCF/CodeGenerationKit/IndentationIDL.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#ifndef CCF_CODE_GENERATION_KIT_INDENTATION_IDL_HPP
+#define CCF_CODE_GENERATION_KIT_INDENTATION_IDL_HPP
#include <deque>
@@ -212,4 +216,4 @@ namespace Indentation
};
}
-#endif // CCF_CODE_GENERATION_KIT_INDENTATION_IDL
+#endif // CCF_CODE_GENERATION_KIT_INDENTATION_IDL_HPP
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp
index 2688396360e..8dfc4093bdb 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp
@@ -1,3 +1,7 @@
+// file : CCF/CodeGenerationKit/IndentationImplanter.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
#ifndef CCF_CODE_GENERATION_KIT_INDENTATION_IMPLANTER
#define CCF_CODE_GENERATION_KIT_INDENTATION_IMPLANTER
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/Makefile.alt b/TAO/CIAO/CCF/CCF/CodeGenerationKit/Makefile.alt
index b0f54b4420e..4658bdb4a91 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/CodeGenerationKit/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../..
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp
new file mode 100644
index 00000000000..3f19100b3bc
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp
@@ -0,0 +1,40 @@
+// file : CCF/CodeGenerationKit/Regex.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#ifndef CCF_RUNTIME_REGEX_HPP
+#define CCF_RUNTIME_REGEX_HPP
+
+#include <string>
+#include <boost/regex.hpp>
+
+namespace regex
+{
+ using boost::regex;
+ using boost::regex_merge;
+
+ inline std::string
+ perl_s (std::string src, std::string e)
+ {
+ char delimiter = '/';
+
+ std::string::size_type first = e.find (delimiter);
+ std::string::size_type middle = e.find (delimiter, first + 1);
+ std::string::size_type last = e.find (delimiter, middle + 1);
+
+ std::string pattern (e, first + 1, middle - first - 1);
+ std::string format (e, middle + 1, last - middle - 1);
+
+ //std::cout << pattern << " " << format << std::endl;
+
+ regex expr (pattern);
+
+ return regex_merge (
+ src,
+ expr,
+ format,
+ boost::match_default | boost::format_all );
+ }
+}
+
+#endif // CCF_RUNTIME_REGEX_HPP
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/Context.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/Context.hpp
index 42679278ae2..249668f7ad5 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/Context.hpp
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/Context.hpp
@@ -1,6 +1,6 @@
-// file : CCF/CompilerElements/Context.hpp
-// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// file : CCF/CompilerElements/Context.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
#ifndef CCF_COMPILER_ELEMENTS_CONTEXT_HPP
#define CCF_COMPILER_ELEMENTS_CONTEXT_HPP
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/Diagnostic.cpp b/TAO/CIAO/CCF/CCF/CompilerElements/Diagnostic.cpp
index ac49d1c74ae..5c3002faabb 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/Diagnostic.cpp
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/Diagnostic.cpp
@@ -1,6 +1,5 @@
// file : CCF/Runtime/DiagnosticStream.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
// cvs-id : $Id$
#include "CCF/Runtime/DiagnosticStream.hpp"
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/Diagnostic.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/Diagnostic.hpp
index 6253d61a6df..835f6b51058 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/Diagnostic.hpp
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/Diagnostic.hpp
@@ -1,6 +1,5 @@
// file : CCF/CompilerElements/Diagnostic.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
// cvs-id : $Id$
#ifndef CCF_DIAGNOSTIC_HPP
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/ExH.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/ExH.hpp
new file mode 100644
index 00000000000..ad7e1b71950
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/ExH.hpp
@@ -0,0 +1,12 @@
+// file : CCF/CompilerElements/ExH.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#ifndef CCF_RUNTIME_EX_H_H
+#define CCF_RUNTIME_EX_H_H
+
+#include "Utility/ExH/ExH.hpp"
+
+namespace ExH = Utility::ExH;
+
+#endif // CCF_RUNTIME_EX_H_H
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/FileSystem.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/FileSystem.hpp
new file mode 100644
index 00000000000..8e16824db1f
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/FileSystem.hpp
@@ -0,0 +1,15 @@
+// file : CCF/CompilerElements/FileSystem.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#ifndef CCF_RUNTIME_FILE_SYSTEM_HPP
+#define CCF_RUNTIME_FILE_SYSTEM_HPP
+
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem/exception.hpp>
+#include <boost/filesystem/operations.hpp>
+
+namespace fs = boost::filesystem;
+
+#endif // CCF_RUNTIME_FILE_SYSTEM_HPP
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/Introspection.cpp b/TAO/CIAO/CCF/CCF/CompilerElements/Introspection.cpp
index 63be8349d89..9e625e0272a 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/Introspection.cpp
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/Introspection.cpp
@@ -1,6 +1,6 @@
// file : CCF/CompilerElements/Introspection.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
//
// This is a hack to avoid link dependency on Utility library.
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/Introspection.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/Introspection.hpp
index 293e6d2dff9..898e596fa88 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/Introspection.hpp
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/Introspection.hpp
@@ -1,6 +1,5 @@
// file : CCF/CompilerElements/Introspection.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
// cvs-id : $Id$
#ifndef CCF_RUNTIME_INTROSPECTION_HPP
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/Makefile.alt b/TAO/CIAO/CCF/CCF/CompilerElements/Makefile.alt
index af1fe95fa10..3626ec1eb28 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/CompilerElements/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../..
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp
new file mode 100644
index 00000000000..8e0585874ab
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp
@@ -0,0 +1,309 @@
+// file : CCF/CompilerElements/Preprocessor.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#ifndef CCF_PREPROCESSOR_HPP
+#define CCF_PREPROCESSOR_HPP
+
+#include <deque>
+
+#include "CCF/CompilerElements/TokenStream.hpp"
+
+namespace CCF
+{
+ //@@ this code is experimental and needs cleaning
+ class Preprocessor : public TokenStream<char>
+ {
+ public:
+ virtual
+ ~Preprocessor () {}
+
+ Preprocessor (TokenStream<char>& is)
+ : state (PREPROCESSING),
+ loc_ ("C"),
+ is_ (is)
+ {
+ }
+
+ public:
+ virtual int_type
+ next ()
+ {
+ return out_get ();
+ }
+
+ private:
+ int_type
+ underflow ()
+ {
+ int_type i = in_get ();
+
+ if (eos (i))
+ {
+ return i;
+ }
+
+ char_type c = to_char_type (i);
+
+ //std::cerr << "next_i: c = " << c << std::endl;
+
+ switch (c)
+ {
+ case '\\': return handle_escape ();
+ case '\"':
+ {
+ if (state == STRING_LITERAL) state = PREPROCESSING;
+ else if (state == PREPROCESSING) state = STRING_LITERAL;
+ else
+ {
+ //@@error
+ }
+ break;
+ }
+ case '\'':
+ {
+ if (state == CHAR_LITERAL) state = PREPROCESSING;
+ else if (state == PREPROCESSING) state = CHAR_LITERAL;
+ else
+ {
+ //@@error
+ }
+ break;
+ }
+ case '#':
+ {
+ if (state != PREPROCESSING) break;
+ return handle_preprocessor_token ();
+ }
+ }
+
+ return i;
+ }
+
+ int_type
+ handle_escape ()
+ {
+ int_type i = in_get ();
+
+ if (eos (i))
+ {
+ //@@ error
+ return i;
+ }
+
+ char_type c = to_char_type (i);
+
+ //@@ '\n' won't work on MShit
+ switch (c)
+ {
+ case '\n': return underflow (); //skip it
+ default:
+ {
+ out_buffer_.push_back (i);
+ return '\\';
+ }
+ }
+ }
+
+ void
+ skip_white_space ()
+ {
+ while (true)
+ {
+ int_type i = in_get ();
+ if (!eos (i))
+ {
+ char_type c = to_char_type (i);
+ if (std::isspace (c, loc_) && c != '\n') continue;
+ }
+
+ in_put (i);
+ break;
+ }
+ }
+
+ int_type
+ handle_preprocessor_token ()
+ {
+ //std::cerr << "handle_preprocessor_token" << std::endl;
+
+ skip_white_space ();
+
+ std::string lexeme;
+
+ int_type i;
+ char_type c;
+
+ while (true)
+ {
+ i = in_get ();
+
+ if (eos (i))
+ {
+ //@@ error
+ return i;
+ }
+
+ c = to_char_type (i);
+
+ if (std::isalnum (c, loc_))
+ {
+ lexeme += c;
+ continue;
+ }
+ break;
+ }
+
+ if (lexeme == "include") return handle_preprocessor_include ();
+ else
+ {
+ // skip till newline
+ while (true)
+ {
+ if (c == '\n') break;
+
+ i = in_get ();
+
+ if (eos (i))
+ {
+ //@@ error
+ return i;
+ }
+
+ c = to_char_type (i);
+ }
+ }
+
+ return underflow ();
+ }
+
+
+ int_type
+ handle_preprocessor_include ()
+ {
+ //out_put (std::string ("include"));
+
+ skip_white_space ();
+
+ std::string file;
+
+ int_type i = in_get ();
+
+ if (eos (i))
+ {
+ //@@ error
+ return i;
+ }
+
+ char_type c = to_char_type (i);
+
+ char_type finilizer;
+
+ if (c == '\"') finilizer = c;
+ else if (c == '<') finilizer = '>';
+ else
+ {
+ //@@error
+ }
+
+ while (true)
+ {
+ i = in_get ();
+
+ if (eos (i))
+ {
+ //@@ error
+ return i;
+ }
+
+ c = to_char_type (i);
+
+ if (c == finilizer) break;
+
+ file += c;
+ }
+
+ //@@ it's probably a good idea to skip until the newline
+ // and perhaps check that all the rest is whitespace.
+
+ if (finilizer == '>') out_put (std::string("sinclude \""));
+ else out_put (std::string("include \""));
+
+ out_put (file);
+ out_put ("\";");
+
+ return out_get ();
+ }
+
+
+ private:
+
+ // Buffer manipulation
+
+ int_type
+ in_get ()
+ {
+ if (in_buffer_.empty ())
+ {
+ return is_.next ();
+ }
+ else
+ {
+ int_type i = in_buffer_.front ();
+ in_buffer_.pop_front ();
+ return i;
+ }
+ }
+
+ void
+ in_put (int_type c)
+ {
+ in_buffer_.push_back (c);
+ }
+
+ int_type
+ out_get ()
+ {
+ if (out_buffer_.empty ())
+ {
+ return underflow ();
+ }
+ else
+ {
+ int_type i = out_buffer_.front ();
+ out_buffer_.pop_front ();
+ return i;
+ }
+ }
+
+ void
+ out_put (std::string const& str)
+ {
+ for (std::string::const_iterator i = str.begin (); i != str.end (); i++)
+ {
+ out_buffer_.push_back (*i);
+ }
+ }
+
+ void
+ out_put (int_type c)
+ {
+ out_buffer_.push_back (c);
+ }
+
+ private:
+ enum State
+ {
+ PREPROCESSING,
+ STRING_LITERAL,
+ CHAR_LITERAL
+ } state;
+
+ std::locale loc_;
+ TokenStream<char>& is_;
+ std::deque<int_type> in_buffer_;
+ std::deque<int_type> out_buffer_;
+ };
+}
+
+#endif //CCF_PREPROCESSOR_HPP
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/ReferenceCounting.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/ReferenceCounting.hpp
new file mode 100644
index 00000000000..0c3e0057d59
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/ReferenceCounting.hpp
@@ -0,0 +1,12 @@
+// file : CCF/CompilerElements/ReferenceCounting.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#ifndef CCF_RUNTIME_REFERENCE_COUNTING_H
+#define CCF_RUNTIME_REFERENCE_COUNTING_H
+
+#include "Utility/ReferenceCounting/ReferenceCounting.hpp"
+
+namespace ReferenceCounting = Utility::ReferenceCounting;
+
+#endif // CCF_RUNTIME_REFERENCE_COUNTING_H
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp
new file mode 100644
index 00000000000..0a9f291eec8
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp
@@ -0,0 +1,76 @@
+// file : CCF/CompilerElements/TokenStream.hpp
+// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id : $Id$
+
+#ifndef TOKEN_STREAM_HPP
+#define TOKEN_STREAM_HPP
+
+#include <string>
+#include <istream>
+
+namespace CCF
+{
+ template <typename Token>
+ class TokenStream
+ {
+ public:
+ virtual Token
+ next () = 0;
+ };
+
+
+ template <>
+ class TokenStream<char>
+ {
+ public:
+ typedef
+ std::char_traits<char>
+ traits;
+
+ typedef
+ traits::int_type
+ int_type;
+
+ typedef
+ traits::char_type
+ char_type;
+
+ public:
+ virtual int_type
+ next () = 0;
+
+ char_type
+ to_char_type (int_type i)
+ {
+ return traits::to_char_type (i);
+ }
+
+ bool
+ eos (int_type i)
+ {
+ return i == traits::eof ();
+ }
+ };
+
+ class InputStreamAdapter : public TokenStream<char>
+ {
+ public:
+ InputStreamAdapter (std::istream& is)
+ : is_ (is)
+ {
+ }
+
+ public:
+
+ virtual int_type
+ next ()
+ {
+ return is_.get ();
+ }
+
+ private:
+ std::istream& is_;
+ };
+}
+
+#endif //TOKEN_STREAM_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.cpp b/TAO/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.cpp
index 96b004ab030..d2c5242fbf2 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/LexicalAnalyzer.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/LexicalAnalyzer.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.hpp b/TAO/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.hpp
index c335453a595..4e21afda211 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/LexicalAnalyzer.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_LEXICAL_ANALYZER_HPP
#define CCF_IDL2_LEXICAL_ANALYZER_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL2/Makefile.alt
index cbe28cdb132..c2ed1a722b1 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/IDL2/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/IDL2/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root := ../..
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Makefile.archive b/TAO/CIAO/CCF/CCF/IDL2/Makefile.archive
index 134bf747408..1bbd69556d9 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Makefile.archive
+++ b/TAO/CIAO/CCF/CCF/IDL2/Makefile.archive
@@ -1,6 +1,6 @@
# file : CCF/IDL2/Makefile.archive
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../..
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Parser.cpp b/TAO/CIAO/CCF/CCF/IDL2/Parser.cpp
index e0fa5534c55..de98d944ca2 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Parser.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Parser.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Parser.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/Parser.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Parser.hpp b/TAO/CIAO/CCF/CCF/IDL2/Parser.hpp
index 111f0c776c9..6382f2a8c17 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Parser.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Parser.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Parser.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_PARSER_HPP
#define CCF_IDL2_PARSER_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Parsing/Action.hpp b/TAO/CIAO/CCF/CCF/IDL2/Parsing/Action.hpp
index 180f1aefa1d..2737abafb58 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Parsing/Action.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Parsing/Action.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Parsing/Action.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_PARSING_ACTION_HPP
#define CCF_IDL2_PARSING_ACTION_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Parsing/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL2/Parsing/Elements.hpp
index 8016f5460f9..f1ee6250f9c 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Parsing/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Parsing/Elements.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Parsing/Elements.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_PARSING_ELEMENTS_HPP
#define CCF_IDL2_PARSING_ELEMENTS_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Parsing/Recovery.hpp b/TAO/CIAO/CCF/CCF/IDL2/Parsing/Recovery.hpp
index 6501e23f576..021d28a034e 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Parsing/Recovery.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Parsing/Recovery.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Parsing/Recovery.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_PARSING_RECOVERY_HPP
#define CCF_IDL2_PARSING_RECOVERY_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp
index 71f77ce9aa6..8d0bc93e8d4 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_HPP
#define CCF_IDL2_SEMANTIC_ACTION_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Attribute.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Attribute.hpp
index da1114c3644..3fd8a8a196f 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Attribute.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Attribute.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Attribute.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_ATTRIBUTE_HPP
#define CCF_IDL2_SEMANTIC_ACTION_ATTRIBUTE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Elements.hpp
index 7e876fbfad9..3d53d703595 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Elements.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Elements.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_ELEMENTS_HPP
#define CCF_IDL2_SEMANTIC_ACTION_ELEMENTS_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Factory.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Factory.hpp
index bf8159bd31c..65ec9eb2b3a 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Factory.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Factory.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Factory.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_FACTORY_HPP
#define CCF_IDL2_SEMANTIC_ACTION_FACTORY_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp
index 4912e4eb4fe..d629baa3ca7 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Attribute.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SemanticAction/Impl/Attribute.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Attribute.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Attribute.hpp
index 170af461f55..3c444b12ee1 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Attribute.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Attribute.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Attribute.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_IMPL_ATTRIBUTE_HPP
#define CCF_IDL2_SEMANTIC_ACTION_IMPL_ATTRIBUTE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.cpp
index d4639e2a9ab..3c7cdc9ba32 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Elements.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SemanticAction/Impl/Elements.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp
index 51013bdceac..63866d7639a 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Elements.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_IMPL_ELEMENTS_HPP
#define CCF_IDL2_SEMANTIC_ACTION_IMPL_ELEMENTS_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp
index 2203152f852..f6ecbd8276c 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Factory.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SemanticAction/Impl/Factory.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp
index b653b404568..80dfcdfcdd4 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Factory.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_IMPL_FACTORY_HPP
#define CCF_IDL2_SEMANTIC_ACTION_IMPL_FACTORY_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Include.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Include.cpp
index 46df07935c6..531990a6631 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Include.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Include.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Include.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SemanticAction/Impl/Include.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Include.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Include.hpp
index 1615ee918c5..8c05b52100e 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Include.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Include.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Include.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_IMPL_INCLUDE_HPP
#define CCF_IDL2_SEMANTIC_ACTION_IMPL_INCLUDE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp
index f1868ef4121..f712dd8228d 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Interface.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SemanticAction/Impl/Interface.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Interface.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Interface.hpp
index 02f79ecbd04..a05d7acf164 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Interface.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Interface.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Interface.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_IMPL_INTERFACE_HPP
#define CCF_IDL2_SEMANTIC_ACTION_IMPL_INTERFACE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Module.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Module.cpp
index 4b08fe349ed..a7f12f2593f 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Module.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Module.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Module.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SemanticAction/Impl/Module.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Module.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Module.hpp
index 71ccbff3150..a71df8dcb8a 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Module.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Module.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Module.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_IMPL_MODULE_HPP
#define CCF_IDL2_SEMANTIC_ACTION_IMPL_MODULE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp
index e10ad634c47..caadb5220a9 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Operation.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SemanticAction/Impl/Operation.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Operation.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Operation.hpp
index 6f09cf2b5cb..686d851e8f3 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Operation.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Operation.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Impl/Operation.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_IMPL_OPERATION_HPP
#define CCF_IDL2_SEMANTIC_ACTION_IMPL_OPERATION_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Include.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Include.hpp
index 3155fb4c97f..6675b25f09e 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Include.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Include.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Include.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_INCLUDE_HPP
#define CCF_IDL2_SEMANTIC_ACTION_INCLUDE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Interface.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Interface.hpp
index 6de2f9e1bf8..01fe500a649 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Interface.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Interface.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Interface.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_INTERFACE_HPP
#define CCF_IDL2_SEMANTIC_ACTION_INTERFACE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Makefile.alt
index c096c4d7178..a0d210c2c1c 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/IDL2/SemanticAction/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../../..
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Module.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Module.hpp
index e74235db9f2..ef6613a5748 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Module.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Module.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Module.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_MODULE_HPP
#define CCF_IDL2_SEMANTIC_ACTION_MODULE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp
index 22e754befee..5b6190d1b4a 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Operation.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SemanticAction/Operation.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp
index 78815f70892..6fd74f992f6 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SemanticAction/Operation.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SEMANTIC_ACTION_OPERATION_HPP
#define CCF_IDL2_SEMANTIC_ACTION_OPERATION_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree.hpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree.hpp
index 9d0fddd3dc3..30f84070215 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SYNTAX_TREE_HPP
#define CCF_IDL2_SYNTAX_TREE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/BuiltIn.cpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/BuiltIn.cpp
index e3eaf20b3b0..bad07473b1c 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/BuiltIn.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/BuiltIn.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/BuiltIn.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SyntaxTree/BuiltIn.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/BuiltIn.hpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/BuiltIn.hpp
index b76fd551e52..6d543ac2448 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/BuiltIn.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/BuiltIn.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/BuiltIn.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SYNTAX_TREE_BUILT_IN_HPP
#define CCF_IDL2_SYNTAX_TREE_BUILT_IN_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.cpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.cpp
index 98f54e5b269..d71f3d656c4 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/Elements.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SyntaxTree/Elements.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.hpp
index a6942b4bd6a..f37eafa64df 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/Elements.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SYNTAX_TREE_ELEMENTS_HPP
#define CCF_IDL2_SYNTAX_TREE_ELEMENTS_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.tpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.tpp
index b2e7361b61f..1bf6eafd4c1 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.tpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Elements.tpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/Elements.tpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
namespace CCF
{
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Interface.cpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Interface.cpp
index a5ac0616441..0a72da83997 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Interface.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Interface.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/Interface.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SyntaxTree/Interface.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Interface.hpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Interface.hpp
index 7ab5ffa71b6..f17cdfa2413 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Interface.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Interface.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/Interface.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SYNTAX_TREE_INTERFACE_HPP
#define CCF_IDL2_SYNTAX_TREE_INTERFACE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Makefile.alt
index 718a5c08bbd..a224f3b0fe1 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/IDL2/SyntaxTree/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../../..
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Module.cpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Module.cpp
index bb94d9d99b4..0642e3e5506 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Module.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Module.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/Module.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SyntaxTree/Module.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Module.hpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Module.hpp
index df58b1813e1..03c9b468216 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Module.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Module.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/Module.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SYNTAX_TREE_MODULE_HPP
#define CCF_IDL2_SYNTAX_TREE_MODULE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Operation.cpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Operation.cpp
index 889d645d2a9..5c4ff65b47c 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Operation.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Operation.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/Operation.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SyntaxTree/Operation.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Operation.hpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Operation.hpp
index 27f43b1df02..3cb6dae67f4 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Operation.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Operation.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/Operation.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SYNTAX_TREE_OPERATION_HPP
#define CCF_IDL2_SYNTAX_TREE_OPERATION_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Translation.cpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Translation.cpp
index 7343f7f1315..f69dc2e7a36 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Translation.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Translation.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/Translation.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SyntaxTree/Translation.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Translation.hpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Translation.hpp
index 9735613632b..7f57ecf1f8e 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Translation.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Translation.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/Translation.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SYNTAX_TREE_TRANSLATION_HPP
#define CCF_IDL2_SYNTAX_TREE_TRANSLATION_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueType.cpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueType.cpp
index ba7ab7dbd58..368422630c5 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueType.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueType.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/ValueType.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/SyntaxTree/ValueType.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueType.hpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueType.hpp
index 66ee9714724..4a76622a691 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueType.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueType.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/SyntaxTree/ValueType.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_SYNTAX_TREE_VALUE_TYPE_HPP
#define CCF_IDL2_SYNTAX_TREE_VALUE_TYPE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Token.cpp b/TAO/CIAO/CCF/CCF/IDL2/Token.cpp
index ac656f87aa4..a251329a2d8 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Token.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Token.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Token.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/Token.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Token.hpp b/TAO/CIAO/CCF/CCF/IDL2/Token.hpp
index d558ded6054..54b9f00b2ab 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Token.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Token.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Token.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_TOKEN_HPP
#define CCF_IDL2_TOKEN_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
index 227f834b176..0dbfad93578 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Traversal.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_TRAVERSAL_HPP
#define CCF_IDL2_TRAVERSAL_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/BuiltIn.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/BuiltIn.cpp
index 672470e293c..522e875b103 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/BuiltIn.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/BuiltIn.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Traversal/BuiltIn.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/Traversal/BuiltIn.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/BuiltIn.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/BuiltIn.hpp
index 9eb02952f82..ea8b3a0ae59 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/BuiltIn.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/BuiltIn.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Traversal/BuiltIn.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_TRAVERSAL_BUILT_IN_HPP
#define CCF_IDL2_TRAVERSAL_BUILT_IN_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.cpp
index 8683660823b..eda7416b001 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Traversal/Elements.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/Traversal/Elements.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp
index be61733e792..2601d23da5f 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Traversal/Elements.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_TRAVERSAL_ELEMENTS_HPP
#define CCF_IDL2_TRAVERSAL_ELEMENTS_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Interface.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Interface.cpp
index 9a1e78454cf..4d6afac0d01 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Interface.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Interface.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Traversal/Interface.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/Traversal/Interface.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Interface.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Interface.hpp
index 641fae8da7b..c8ae18c5bd5 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Interface.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Interface.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Traversal/Interface.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_TRAVERSAL_INTERFACE_HPP
#define CCF_IDL2_TRAVERSAL_INTERFACE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Makefile.alt
index edf265d9492..67994d38627 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/IDL2/Traversal/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../../..
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Module.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Module.cpp
index e285ad9d225..6f3e420d896 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Module.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Module.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Traversal/Module.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/Traversal/Module.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Module.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Module.hpp
index c7ff4966931..404895db7fb 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Module.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Module.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Traversal/Module.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_TRAVERSAL_MODULE_HPP
#define CCF_IDL2_TRAVERSAL_MODULE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Operation.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Operation.cpp
index f02bba8675f..131f783e17a 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Operation.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Operation.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Traversal/Operation.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/Traversal/Operation.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Operation.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Operation.hpp
index f2503a376ad..df94cfcea34 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Operation.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Operation.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Traversal/Operation.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_TRAVERSAL_OPERATION_HPP
#define CCF_IDL2_TRAVERSAL_OPERATION_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Translation.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Translation.cpp
index 8cfa42efc3f..bcf0002b24b 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Translation.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Translation.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Traversal/Translation.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL2/Traversal/Translation.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Translation.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Translation.hpp
index e6ccf144dcc..a8b4faf6e75 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Translation.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Translation.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL2/Traversal/Translation.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL2_TRAVERSAL_TRANSLATION_HPP
#define CCF_IDL2_TRAVERSAL_TRANSLATION_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/LexicalAnalyzer.cpp b/TAO/CIAO/CCF/CCF/IDL3/LexicalAnalyzer.cpp
index 1a9ee064300..333c7560d04 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/LexicalAnalyzer.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/LexicalAnalyzer.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/LexicalAnalyzer.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/LexicalAnalyzer.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/LexicalAnalyzer.hpp b/TAO/CIAO/CCF/CCF/IDL3/LexicalAnalyzer.hpp
index ac663f1ec01..d72cc6b11b4 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/LexicalAnalyzer.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/LexicalAnalyzer.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/LexicalAnalyzer.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_LEXICAL_ANALYZER_HPP
#define CCF_IDL3_LEXICAL_ANALYZER_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL3/Makefile.alt
index 4ba66a73423..ac90ad9b82e 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/IDL3/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/IDL3/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root := ../..
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Makefile.archive b/TAO/CIAO/CCF/CCF/IDL3/Makefile.archive
index 805ee696a9f..6eb1b3ca901 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Makefile.archive
+++ b/TAO/CIAO/CCF/CCF/IDL3/Makefile.archive
@@ -1,6 +1,6 @@
# file : CCF/IDL3/Makefile.archive
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../..
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Parser.cpp b/TAO/CIAO/CCF/CCF/IDL3/Parser.cpp
index a465cf926d2..4aabe21ff05 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Parser.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Parser.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/Parser.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/Parser.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Parser.hpp b/TAO/CIAO/CCF/CCF/IDL3/Parser.hpp
index 6eabd838cbf..bebd3d437f6 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Parser.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Parser.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/Parser.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_PARSER_HPP
#define CCF_IDL3_PARSER_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction.hpp
index 7b7fc5129ea..e0de3b00bc5 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_HPP
#define CCF_IDL3_SEMANTIC_ACTION_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Component.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Component.hpp
index 7360099d212..b8bbd4337f1 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Component.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Component.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Component.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_COMPONENT_HPP
#define CCF_IDL3_SEMANTIC_ACTION_COMPONENT_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Consumes.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Consumes.hpp
index 9efedad2d28..b6a136ca49b 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Consumes.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Consumes.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Consumes.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_CONSUMES_HPP
#define CCF_IDL3_SEMANTIC_ACTION_CONSUMES_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Elements.hpp
index f0849ee5666..7637a0c473c 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Elements.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Elements.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_ELEMENTS_HPP
#define CCF_IDL3_SEMANTIC_ACTION_ELEMENTS_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Emits.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Emits.hpp
index ad36fdd6737..10fade5ec04 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Emits.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Emits.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Emits.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_EMITS_HPP
#define CCF_IDL3_SEMANTIC_ACTION_EMITS_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/EventType.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/EventType.hpp
index 9457fea407a..35406a9367b 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/EventType.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/EventType.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/EventType.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_EVENT_TYPE_HPP
#define CCF_IDL3_SEMANTIC_ACTION_EVENT_TYPE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Factory.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Factory.hpp
index 382d01677fa..34feee84ccf 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Factory.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Factory.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Factory.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_FACTORY_HPP
#define CCF_IDL3_SEMANTIC_ACTION_FACTORY_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Home.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Home.hpp
index f415380b807..782e84bb565 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Home.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Home.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Home.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_HOME_HPP
#define CCF_IDL3_SEMANTIC_ACTION_HOME_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp
index ad1d7bb1bd8..f6122e8e837 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/HomeFactory.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_HOME_FACTORY_HPP
#define CCF_IDL3_SEMANTIC_ACTION_HOME_FACTORY_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp
index 4edc62243f7..b0f9d8283c9 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Component.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SemanticAction/Impl/Component.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Component.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Component.hpp
index d3163140f34..ebf8504edd1 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Component.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Component.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Component.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_IMPL_COMPONENT_HPP
#define CCF_IDL3_SEMANTIC_ACTION_IMPL_COMPONENT_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Consumes.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Consumes.cpp
index f2cc97f062b..50fa3cdb279 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Consumes.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Consumes.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Consumes.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SemanticAction/Impl/Consumes.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Consumes.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Consumes.hpp
index 6abc07b82f9..f69662ebaf7 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Consumes.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Consumes.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Consumes.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_IMPL_CONSUMES_HPP
#define CCF_IDL3_SEMANTIC_ACTION_IMPL_CONSUMES_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Elements.hpp
index 9067f42b310..75782eb7a1a 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Elements.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Elements.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_IMPL_ELEMENTS_HPP
#define CCF_IDL3_SEMANTIC_ACTION_IMPL_ELEMENTS_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Emits.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Emits.cpp
index f72d19dd1ef..1466024e95a 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Emits.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Emits.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Emits.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SemanticAction/Impl/Emits.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Emits.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Emits.hpp
index 01438cf7616..922e8dc5c04 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Emits.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Emits.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Emits.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_IMPL_EMITS_HPP
#define CCF_IDL3_SEMANTIC_ACTION_IMPL_EMITS_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp
index a02c4777964..7c875a786d2 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/EventType.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SemanticAction/Impl/EventType.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/EventType.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/EventType.hpp
index e0ed61a6558..e18e6af8bce 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/EventType.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/EventType.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/EventType.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_IMPL_EVENT_TYPE_HPP
#define CCF_IDL3_SEMANTIC_ACTION_IMPL_EVENT_TYPE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp
index b60aa1847a8..ce2ad6b40b9 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Factory.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SemanticAction/Impl/Factory.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp
index e3f2d7c4dda..a8f03a3c0c9 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Factory.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_IMPL_FACTORY_HPP
#define CCF_IDL3_SEMANTIC_ACTION_IMPL_FACTORY_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp
index 6f10db4c9fb..d7fe0eb7e9d 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Home.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SemanticAction/Impl/Home.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Home.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Home.hpp
index 3895d251996..644e09eee28 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Home.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Home.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Home.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_IMPL_HOME_HPP
#define CCF_IDL3_SEMANTIC_ACTION_IMPL_HOME_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp
index 2549a1f8db9..a2868a48fce 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SemanticAction/Impl/HomeFactory.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.hpp
index ea44f515fc2..4bc1072048c 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/HomeFactory.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_IMPL_HOME_FACTORY_HPP
#define CCF_IDL3_SEMANTIC_ACTION_IMPL_HOME_FACTORY_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp
index 59d19593f7d..c205a3a6ada 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Include.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SemanticAction/Impl/Include.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp
index a91b9f41b1a..3eebd397b8d 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Include.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_IMPL_INCLUDE_HPP
#define CCF_IDL3_SEMANTIC_ACTION_IMPL_INCLUDE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp
index cd4b734b1ce..051532def28 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Provides.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SemanticAction/Impl/Provides.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Provides.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Provides.hpp
index 7183d28a2f1..c31733e671f 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Provides.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Provides.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Provides.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_IMPL_PROVIDES_HPP
#define CCF_IDL3_SEMANTIC_ACTION_IMPL_PROVIDES_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Publishes.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Publishes.cpp
index ca584b6f604..57051f968ea 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Publishes.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Publishes.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Publishes.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SemanticAction/Impl/Publishes.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Publishes.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Publishes.hpp
index e4b107fd555..0698f7b3bb9 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Publishes.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Publishes.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Publishes.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_IMPL_PUBLISHES_HPP
#define CCF_IDL3_SEMANTIC_ACTION_IMPL_PUBLISHES_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp
index cd039845b6e..d4f523744a8 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Uses.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SemanticAction/Impl/Uses.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Uses.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Uses.hpp
index 3f6a255cb3b..9ef9c5c97d3 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Uses.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Uses.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Impl/Uses.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_IMPL_USES_HPP
#define CCF_IDL3_SEMANTIC_ACTION_IMPL_USES_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Provides.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Provides.hpp
index 56b0cdd5350..e32fcdab84e 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Provides.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Provides.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Provides.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_PROVIDES_HPP
#define CCF_IDL3_SEMANTIC_ACTION_PROVIDES_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Publishes.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Publishes.hpp
index 243c9443bf3..1ce9898ffe5 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Publishes.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Publishes.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Publishes.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_PUBLISHES_HPP
#define CCF_IDL3_SEMANTIC_ACTION_PUBLISHES_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Uses.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Uses.hpp
index c535c8a4b05..867d6495c55 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Uses.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Uses.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SemanticAction/Uses.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SEMANTIC_ACTION_USES_HPP
#define CCF_IDL3_SEMANTIC_ACTION_USES_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree.hpp b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree.hpp
index cbdb4e5e501..87b2ea962fc 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SyntaxTree.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SYNTAX_TREE_HPP
#define CCF_IDL3_SYNTAX_TREE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.cpp b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.cpp
index 8705034f4d5..52abc26dcda 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SyntaxTree/Component.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SyntaxTree/Component.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.hpp b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.hpp
index 4aee1988ee4..6d0b095aad1 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SyntaxTree/Component.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SYNTAX_TREE_COMPONENT_HPP
#define CCF_IDL3_SYNTAX_TREE_COMPONENT_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/EventType.cpp b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/EventType.cpp
index d1f0283bf1d..67cd3fd8c4f 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/EventType.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/EventType.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SyntaxTree/EventType.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SyntaxTree/EventType.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/EventType.hpp b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/EventType.hpp
index 8f451a02ec1..5327b64d339 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/EventType.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/EventType.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SyntaxTree/EventType.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SYNTAX_TREE_EVENT_TYPE_HPP
#define CCF_IDL3_SYNTAX_TREE_EVENT_TYPE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Home.cpp b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Home.cpp
index 968e1402e5c..27653f64524 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Home.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Home.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SyntaxTree/Home.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SyntaxTree/Home.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Home.hpp b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Home.hpp
index 882689a7761..47f8901a14e 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Home.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Home.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SyntaxTree/Home.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SYNTAX_TREE_HOME_HPP
#define CCF_IDL3_SYNTAX_TREE_HOME_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Makefile.alt
index a80968aef54..006a2657de7 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/IDL3/SyntaxTree/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../../..
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Operation.cpp b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Operation.cpp
index a9a3f9f61a2..20fd061cf1d 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Operation.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Operation.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SyntaxTree/Operation.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/SyntaxTree/Operation.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Operation.hpp b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Operation.hpp
index 4df39bb7efe..15b7b69a312 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Operation.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Operation.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/SyntaxTree/Operation.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_SYNTAX_TREE_OPERATION_HPP
#define CCF_IDL3_SYNTAX_TREE_OPERATION_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Token.hpp b/TAO/CIAO/CCF/CCF/IDL3/Token.hpp
index da2a7be79f4..4a18aae6f13 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Token.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Token.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/Token.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_TOKEN_HPP
#define CCF_IDL3_TOKEN_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Traversal.hpp b/TAO/CIAO/CCF/CCF/IDL3/Traversal.hpp
index be64141f04d..53d3e7a26d5 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Traversal.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Traversal.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/Traversal.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_TRAVERSAL_HPP
#define CCF_IDL3_TRAVERSAL_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Component.cpp b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Component.cpp
index 9b8ee9f1693..a2fce1f242d 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Component.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Component.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/Traversal/Component.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/Traversal/Component.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Component.hpp b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Component.hpp
index 3207a2396d8..a078d2c2c96 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Component.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Component.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/Traversal/Component.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_TRAVERSAL_COMPONENT_HPP
#define CCF_IDL3_TRAVERSAL_COMPONENT_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.cpp b/TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.cpp
index 3c3df53a1f6..f59bc85a5bb 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/Traversal/EventType.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/Traversal/EventType.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.hpp b/TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.hpp
index 5158838df03..e8c1c190d88 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/Traversal/EventType.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_TRAVERSAL_EVENT_TYPE_HPP
#define CCF_IDL3_TRAVERSAL_EVENT_TYPE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Home.cpp b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Home.cpp
index 47012db092c..30bda0421d0 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Home.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Home.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/Traversal/Home.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/Traversal/Home.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Home.hpp b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Home.hpp
index c601e4ea269..6893ed90b80 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Home.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Home.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/Traversal/Home.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_TRAVERSAL_HOME_HPP
#define CCF_IDL3_TRAVERSAL_HOME_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Makefile.alt
index 24ec4b4228b..eb3ffe59b2d 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/IDL3/Traversal/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../../..
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Operation.cpp b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Operation.cpp
index b60d63b0742..c5cbc4a576b 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Operation.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Operation.cpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/Traversal/Operation.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/IDL3/Traversal/Operation.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Operation.hpp b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Operation.hpp
index 1cd71b2eb99..dd72be46f7e 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Operation.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Operation.hpp
@@ -1,6 +1,6 @@
// file : CCF/IDL3/Traversal/Operation.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef CCF_IDL3_TRAVERSAL_OPERATION_HPP
#define CCF_IDL3_TRAVERSAL_OPERATION_HPP
diff --git a/TAO/CIAO/CCF/CCF/Makefile.alt b/TAO/CIAO/CCF/CCF/Makefile.alt
index 245593c0032..1516cbc040c 100644
--- a/TAO/CIAO/CCF/CCF/Makefile.alt
+++ b/TAO/CIAO/CCF/CCF/Makefile.alt
@@ -1,6 +1,6 @@
# file : CCF/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root := ..
@@ -11,7 +11,7 @@ $(call include, $(root)/Config.rules)
$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules)
target_makefile_list :=
-target_directory_list := IDL2 IDL3 CIDL CodeGenerationKit
+target_directory_list := IDL2 IDL3 CIDL CodeGenerationKit CompilerElements
default_makefile_name := Makefile.alt
$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules)
diff --git a/TAO/CIAO/CCF/Documentation/Build.html b/TAO/CIAO/CCF/Documentation/Build.html
index 4be67e9fac1..d3d3cbdcc27 100644
--- a/TAO/CIAO/CCF/Documentation/Build.html
+++ b/TAO/CIAO/CCF/Documentation/Build.html
@@ -5,7 +5,7 @@
file : Documentation/Build.html
author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-cvs-id : $id$
+cvs-id : $Id$
-->
<html>
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp
index 95aae427d60..5ae1d5fb361 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp
@@ -1,6 +1,6 @@
// file : CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "ExecutorMappingGenerator.hpp"
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.hpp b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.hpp
index f9453eb6b07..10de696e1b3 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.hpp
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.hpp
@@ -1,6 +1,6 @@
// file : CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.hpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#ifndef EXECUTOR_MAPPING_GENERATOR_HPP
#define EXECUTOR_MAPPING_GENERATOR_HPP
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/Makefile.alt b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/Makefile.alt
index 68669e19517..a05914f5eb3 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/Makefile.alt
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/Makefile.alt
@@ -1,6 +1,6 @@
# file : Example/CIDL/LocalExecutorMapping/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../../..
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
index 06b86a22efb..55f28166cdc 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
@@ -1,6 +1,6 @@
// file : CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/CompilerElements/FileSystem.hpp"
#include "CCF/CompilerElements/TokenStream.hpp"
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-1.idl b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-1.idl
index f467b30c054..1f1e3df3843 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-1.idl
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-1.idl
@@ -1,6 +1,6 @@
// file : CCF/Example/CIDL/LocalExecutorMapping/test-1.idl
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include <Components.idl>
include "test-0.idl";
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.cidl b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.cidl
index 96c5a60bc71..34e635a9b43 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.cidl
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.cidl
@@ -1,6 +1,6 @@
// file : CCF/Example/CIDL/LocalExecutorMapping/test-2.cidl
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "test-2.idl"
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.idl b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.idl
index 4ee7636eb50..8def51e6267 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.idl
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.idl
@@ -1,6 +1,6 @@
// file : CCF/Example/CIDL/LocalExecutorMapping/test-2.idl
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
include "test-1.idl";
diff --git a/TAO/CIAO/CCF/Example/CIDL/Makefile.alt b/TAO/CIAO/CCF/Example/CIDL/Makefile.alt
index c02d28322b8..a7ad5cf2faa 100644
--- a/TAO/CIAO/CCF/Example/CIDL/Makefile.alt
+++ b/TAO/CIAO/CCF/Example/CIDL/Makefile.alt
@@ -1,6 +1,6 @@
# file : Example/CIDL/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root := ../..
diff --git a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/Makefile.alt b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/Makefile.alt
index ba307f859df..2d4e14a3a9e 100644
--- a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/Makefile.alt
+++ b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/Makefile.alt
@@ -1,6 +1,6 @@
# file : Example/CodeGnerationKit/Indentation/IDL/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root = ../../../..
diff --git a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/indent_idl.cpp b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/indent_idl.cpp
index a20cce40f74..ce0c5eb103c 100644
--- a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/indent_idl.cpp
+++ b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/indent_idl.cpp
@@ -1,6 +1,6 @@
// file : CCF/Example/CodeGenerationKit/Indentation/IDL/indent_idl.cpp
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
#include "CCF/CodeGenerationKit/IndentationIDL.hpp"
#include "CCF/CodeGenerationKit/IndentationImplanter.hpp"
diff --git a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/Makefile.alt b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/Makefile.alt
index 2170caf214a..0f09fe7a11b 100644
--- a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/Makefile.alt
+++ b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/Makefile.alt
@@ -1,6 +1,6 @@
# file : Example/CodeGenerationKit/Indentation/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root := ../../..
diff --git a/TAO/CIAO/CCF/Example/CodeGenerationKit/Makefile.alt b/TAO/CIAO/CCF/Example/CodeGenerationKit/Makefile.alt
index cce15219cea..07708e72d55 100644
--- a/TAO/CIAO/CCF/Example/CodeGenerationKit/Makefile.alt
+++ b/TAO/CIAO/CCF/Example/CodeGenerationKit/Makefile.alt
@@ -1,6 +1,6 @@
# file : Example/CodeGenerationKit/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root := ../..
diff --git a/TAO/CIAO/CCF/Example/Makefile.alt b/TAO/CIAO/CCF/Example/Makefile.alt
index a151c3b67ec..1b2df92a2b1 100644
--- a/TAO/CIAO/CCF/Example/Makefile.alt
+++ b/TAO/CIAO/CCF/Example/Makefile.alt
@@ -1,6 +1,6 @@
# file : Example/Makefile.alt
# author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-# cvs-id : $id$
+# cvs-id : $Id$
root := ..
diff --git a/TAO/CIAO/CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl b/TAO/CIAO/CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl
index 259977d3bbb..dc1aa225336 100644
--- a/TAO/CIAO/CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl
+++ b/TAO/CIAO/CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl
@@ -1,6 +1,6 @@
// file : CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
// This file is supposed to cover an IDL2 lexical structure and intended
// for IDL2 lexer regression testing.
diff --git a/TAO/CIAO/CCF/Test/IDL2/Parser/Recovery/interface.idl b/TAO/CIAO/CCF/Test/IDL2/Parser/Recovery/interface.idl
index 96b910cbfa8..22a99ffadf2 100644
--- a/TAO/CIAO/CCF/Test/IDL2/Parser/Recovery/interface.idl
+++ b/TAO/CIAO/CCF/Test/IDL2/Parser/Recovery/interface.idl
@@ -1,6 +1,6 @@
// file : CCF/Test/IDL2/Parsing/Recovery/interface.idl
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
interface Base {};
diff --git a/TAO/CIAO/CCF/Test/IDL2/Parser/Recovery/module.idl b/TAO/CIAO/CCF/Test/IDL2/Parser/Recovery/module.idl
index 57a7876df9b..edfd868809b 100644
--- a/TAO/CIAO/CCF/Test/IDL2/Parser/Recovery/module.idl
+++ b/TAO/CIAO/CCF/Test/IDL2/Parser/Recovery/module.idl
@@ -1,6 +1,6 @@
// file : CCF/Test/IDL2/Parsing/Recovery/module.idl
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id : $id$
+// cvs-id : $Id$
// Module declaration syntax errors
//