summaryrefslogtreecommitdiff
path: root/DAnCE
diff options
context:
space:
mode:
Diffstat (limited to 'DAnCE')
-rw-r--r--DAnCE/dance/DAnCE_ArtifactInstallation.idl2
-rw-r--r--DAnCE/dance/DAnCE_Core.mpc2
-rw-r--r--DAnCE/dance/DAnCE_DeploymentInterceptors.idl2
-rw-r--r--DAnCE/dance/DAnCE_DeploymentInterceptors_Base_Impl.cpp2
-rw-r--r--DAnCE/dance/DAnCE_DeploymentInterceptors_Base_Impl.h2
-rw-r--r--DAnCE/dance/DAnCE_LocalityManager.idl2
-rw-r--r--DAnCE/dance/DAnCE_Properties.mpc2
-rw-r--r--DAnCE/dance/DAnCE_Utility.cpp2
-rw-r--r--DAnCE/dance/DAnCE_Utility.h2
-rw-r--r--DAnCE/dance/Deployment/Deployment.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_Application.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_ApplicationManager.idl1
-rw-r--r--DAnCE/dance/Deployment/Deployment_Connection.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_Core.mpc2
-rw-r--r--DAnCE/dance/Deployment/Deployment_Data.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_DeploymentPlan.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_DomainApplication.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_DomainApplicationManager.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_ExecutionManager.idl1
-rw-r--r--DAnCE/dance/Deployment/Deployment_InvalidComponentExecParameter.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_InvalidConnection.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_InvalidNodeExecParameter.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_InvalidProperty.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_NodeApplication.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_NodeApplicationManager.idl1
-rw-r--r--DAnCE/dance/Deployment/Deployment_NodeManager.idl1
-rw-r--r--DAnCE/dance/Deployment/Deployment_Packaging_Data.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_PlanError.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_RepositoryManager.idl1
-rw-r--r--DAnCE/dance/Deployment/Deployment_ResourceCommitmentManager.idl1
-rw-r--r--DAnCE/dance/Deployment/Deployment_ResourceNotAvailable.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_StartError.idl1
-rw-r--r--DAnCE/dance/Deployment/Deployment_StopError.idl1
-rw-r--r--DAnCE/dance/Deployment/Deployment_TargetManager.idl2
-rw-r--r--DAnCE/dance/DomainApplication/DomainApplication.mpc2
-rw-r--r--DAnCE/dance/DomainApplication/Domain_Application_Export.h1
-rw-r--r--DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp2
-rw-r--r--DAnCE/dance/DomainApplication/Domain_Application_Impl.h1
-rw-r--r--DAnCE/dance/DomainApplicationManager/DomainApplicationManager.mpc2
-rw-r--r--DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Export.h1
-rw-r--r--DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Impl.cpp2
-rw-r--r--DAnCE/dance/DomainApplicationManager/Node_Locator.cpp2
-rw-r--r--DAnCE/dance/ExecutionManager/ExecutionManager.mpc2
-rw-r--r--DAnCE/dance/ExecutionManager/ExecutionManager_Impl.cpp2
-rw-r--r--DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp2
-rw-r--r--DAnCE/dance/ExecutionManager/Execution_Manager.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Configuration/CPU_Affinity.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Configuration/CPU_Affinity.h2
-rw-r--r--DAnCE/dance/LocalityManager/Configuration/CPU_Affinity_export.h1
-rw-r--r--DAnCE/dance/LocalityManager/Configuration/Configuration.mpc1
-rw-r--r--DAnCE/dance/LocalityManager/Configuration/Process_Name.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Configuration/Process_Name.h2
-rw-r--r--DAnCE/dance/LocalityManager/Configuration/Process_Name_export.h1
-rw-r--r--DAnCE/dance/LocalityManager/Configuration/Process_Priority.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Configuration/Process_Priority.h2
-rw-r--r--DAnCE/dance/LocalityManager/Configuration/Process_Priority_export.h1
-rw-r--r--DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc2
-rw-r--r--DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.h2
-rw-r--r--DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl_Export.h1
-rw-r--r--DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.h1
-rw-r--r--DAnCE/dance/LocalityManager/Handler/Config_Handler_Impl.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Handler/Config_Handler_Impl.h2
-rw-r--r--DAnCE/dance/LocalityManager/Handler/DAnCE_Locality_Handler_export.h1
-rw-r--r--DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.h2
-rw-r--r--DAnCE/dance/LocalityManager/Handler/Interceptor_Handler_Impl.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Handler/Interceptor_Handler_Impl.h2
-rw-r--r--DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.h1
-rw-r--r--DAnCE/dance/LocalityManager/Handler/LocalityHandler.mpc1
-rw-r--r--DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.h2
-rw-r--r--DAnCE/dance/LocalityManager/Handler/Plugin_Conf.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Handler/Plugin_Conf.h1
-rw-r--r--DAnCE/dance/LocalityManager/Interceptors/Best_Effort.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Interceptors/Best_Effort.h1
-rw-r--r--DAnCE/dance/LocalityManager/Interceptors/DAnCE_Error_Interceptors_export.h1
-rw-r--r--DAnCE/dance/LocalityManager/Interceptors/Error_Interceptors.mpc2
-rw-r--r--DAnCE/dance/LocalityManager/Interceptors/Standard_Error.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Interceptors/Standard_Error.h1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Dependency_Sorter.cpp1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Dependency_Sorter.h1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Deployment_Completion.cpp1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Deployment_Event.cpp1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Deployment_Event.inl1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler.inl1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler_export.h1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Events/Configured.cpp1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Events/Disconnect.cpp1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Events/Endpoint.cpp1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Events/Passivate.cpp1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Events/Remove.cpp1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Events/Start.cpp1
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp2
-rw-r--r--DAnCE/dance/LocalityManager/Scheduler/Scheduler.mpc2
-rw-r--r--DAnCE/dance/Logger/DAnCE_Logger_Export.h1
-rw-r--r--DAnCE/dance/Logger/Log_Macros.cpp2
-rw-r--r--DAnCE/dance/Logger/Log_Macros.h3
-rw-r--r--DAnCE/dance/Logger/Logger.mpc2
-rw-r--r--DAnCE/dance/Logger/Logger_Service.cpp1
-rw-r--r--DAnCE/dance/Logger/Logger_Service.h1
-rw-r--r--DAnCE/dance/NodeApplication/NodeApplication.mpc2
-rw-r--r--DAnCE/dance/NodeApplication/NodeApplication_Export.h1
-rw-r--r--DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp1
-rw-r--r--DAnCE/dance/NodeApplicationManager/NodeApplicationManager.mpc2
-rw-r--r--DAnCE/dance/NodeApplicationManager/NodeApplicationManager_Export.h1
-rw-r--r--DAnCE/dance/NodeApplicationManager/NodeApplicationManager_Impl.cpp2
-rw-r--r--DAnCE/dance/NodeManager/NodeManager.mpc2
-rw-r--r--DAnCE/dance/NodeManager/NodeManager_Impl.cpp2
-rw-r--r--DAnCE/dance/NodeManager/Node_Manager.cpp2
-rw-r--r--DAnCE/dance/NodeManager/Node_Manager_Module.cpp2
-rw-r--r--DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.cpp2
-rw-r--r--DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.idl2
-rw-r--r--DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.mpc1
-rw-r--r--DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon_Impl.cpp2
-rw-r--r--DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon_Impl.h2
-rw-r--r--DAnCE/dance/Plan_Launcher/EM_Launcher.cpp2
-rw-r--r--DAnCE/dance/Plan_Launcher/LM_Launcher.cpp2
-rw-r--r--DAnCE/dance/Plan_Launcher/NM_Launcher.cpp2
-rw-r--r--DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp2
-rw-r--r--DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc2
-rw-r--r--DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp2
-rw-r--r--DAnCE/dance/Plan_Launcher/Plan_Launcher_Export.h1
-rw-r--r--DAnCE/dance/RepositoryManager/PC_Updater.cpp2
-rw-r--r--DAnCE/dance/RepositoryManager/PC_Updater_T.cpp1
-rw-r--r--DAnCE/dance/RepositoryManager/RM_Helper.cpp2
-rw-r--r--DAnCE/dance/RepositoryManager/RepositoryManager.mpc2
-rw-r--r--DAnCE/dance/RepositoryManager/RepositoryManagerDaemon.idl2
-rw-r--r--DAnCE/dance/RepositoryManager/RepositoryManager_Impl.cpp2
-rw-r--r--DAnCE/dance/RepositoryManager/Repository_Manager.cpp2
-rw-r--r--DAnCE/dance/RepositoryManager/Repository_Manager_Module.cpp2
-rw-r--r--DAnCE/dance/RepositoryManager/URL_Parser.cpp2
-rw-r--r--DAnCE/dance/RepositoryManager/repository_manager_admin.cpp1
-rw-r--r--DAnCE/dance/RepositoryManager/repository_manager_admin.h2
-rw-r--r--DAnCE/dance/RepositoryManager/repository_manager_admin_exec.cpp2
-rw-r--r--DAnCE/dance/TargetManager/DomainDataManager.cpp1
-rw-r--r--DAnCE/dance/TargetManager/DomainDataManager.h1
-rw-r--r--DAnCE/dance/TargetManager/ResourceCommitmentManager.cpp1
-rw-r--r--DAnCE/dance/TargetManager/ResourceCommitmentManager.h1
-rw-r--r--DAnCE/dance/TargetManager/TargetManager.mpc2
-rw-r--r--DAnCE/dance/TargetManager/Target_Manager.cpp2
-rw-r--r--DAnCE/dance/TargetManager/Target_Manager_Module.cpp2
-rw-r--r--DAnCE/dance/Version.h1
-rw-r--r--DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp2
-rw-r--r--DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc1
-rw-r--r--DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc2
-rw-r--r--DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp2
-rw-r--r--DAnCE/tests/Config_Handlers/test.cpp2
-rw-r--r--DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc1
-rw-r--r--DAnCE/tests/DeploymentPlanDump/test.cpp2
-rw-r--r--DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc1
-rw-r--r--DAnCE/tests/DeploymentPlanTestReferences/test.cpp2
-rw-r--r--DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc1
-rw-r--r--DAnCE/tests/DeploymentTest1/test.cpp1
-rw-r--r--DAnCE/tests/LocalityManager/CircularDependency/CircularDependency.mpc1
-rw-r--r--DAnCE/tests/LocalityManager/CircularDependency/Circular_Dependency_export.h1
-rw-r--r--DAnCE/tests/LocalityManager/CircularDependency/Handler_A.cpp2
-rw-r--r--DAnCE/tests/LocalityManager/CircularDependency/Handler_A.h2
-rw-r--r--DAnCE/tests/LocalityManager/CircularDependency/Handler_B.cpp2
-rw-r--r--DAnCE/tests/LocalityManager/CircularDependency/Handler_B.h2
-rw-r--r--DAnCE/tests/LocalityManager/ExplicitExec/ExplicitExec.mpc2
-rw-r--r--DAnCE/tests/NameServiceTest/Dummy.idl2
-rw-r--r--DAnCE/tests/NameServiceTest/DummyImpl.cpp1
-rw-r--r--DAnCE/tests/NameServiceTest/DummyImpl.h1
-rw-r--r--DAnCE/tests/NameServiceTest/NameServiceTest.mpc2
-rw-r--r--DAnCE/tests/NameServiceTest/RegistrationPath.h1
-rw-r--r--DAnCE/tests/NameServiceTest/clt_main.cpp1
-rw-r--r--DAnCE/tests/NameServiceTest/srv_main.cpp1
-rw-r--r--DAnCE/tests/NodeApplicationManager-NodeApplication/NAM_NA.mpc1
-rw-r--r--DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp1
-rw-r--r--DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc2
-rw-r--r--DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp1
-rw-r--r--DAnCE/tests/Parsing/Parsing.mpc2
-rw-r--r--DAnCE/tests/Parsing/domain.cpp2
-rw-r--r--DAnCE/tests/Parsing/test.cpp2
-rw-r--r--DAnCE/tests/TargetManager/CmpClient.cpp1
-rw-r--r--DAnCE/tests/TargetManager/TM_Client.mpc2
-rw-r--r--DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc2
-rw-r--r--DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp2
-rw-r--r--DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.h2
-rw-r--r--DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_export.h1
-rw-r--r--DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp2
-rw-r--r--DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h2
-rw-r--r--DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp2
-rw-r--r--DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.cpp2
-rw-r--r--DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.h2
-rw-r--r--DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl2
-rw-r--r--DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_export.h1
-rw-r--r--DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp2
-rw-r--r--DAnCE/tools/Artifact_Installation/File_Installation_Handler.h2
-rw-r--r--DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp2
-rw-r--r--DAnCE/tools/Artifact_Installation/Http_Installation_Handler.h2
-rw-r--r--DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp2
-rw-r--r--DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.h2
-rw-r--r--DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp2
-rw-r--r--DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.h2
-rw-r--r--DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_export.h1
-rw-r--r--DAnCE/tools/Config_Handlers/ADD_Handler.cpp1
-rw-r--r--DAnCE/tools/Config_Handlers/Any_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/CCD_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/CEPE_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/CPD_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/CRDD_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/Common.h1
-rw-r--r--DAnCE/tools/Config_Handlers/Config_Handlers_Common_Export.h1
-rw-r--r--DAnCE/tools/Config_Handlers/Config_Handlers_Export.h1
-rw-r--r--DAnCE/tools/Config_Handlers/DD_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/DD_Handler.h1
-rw-r--r--DAnCE/tools/Config_Handlers/DP_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/DP_PCD_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/DnC_Dump.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/DnC_Dump_T.cpp1
-rw-r--r--DAnCE/tools/Config_Handlers/Dump_Obj.cpp1
-rw-r--r--DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc2
-rw-r--r--DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h1
-rw-r--r--DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/DynAny_Handler/DynString_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/ERE_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/ESD_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/IDD_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/IDREF_Base.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/ID_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/IRDD_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/MDD_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/PCD_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/PL_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/PL_Handler.h6
-rw-r--r--DAnCE/tools/Config_Handlers/PSPE_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp1
-rw-r--r--DAnCE/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp1
-rw-r--r--DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp1
-rw-r--r--DAnCE/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp1
-rw-r--r--DAnCE/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp1
-rw-r--r--DAnCE/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc2
-rw-r--r--DAnCE/tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h1
-rw-r--r--DAnCE/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp1
-rw-r--r--DAnCE/tools/Config_Handlers/RDD_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/Req_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/STD_CID_Handler.cpp1
-rw-r--r--DAnCE/tools/Config_Handlers/STD_CPD_Handler.cpp1
-rw-r--r--DAnCE/tools/Config_Handlers/STD_IAD_Handler.cpp1
-rw-r--r--DAnCE/tools/Config_Handlers/STD_PCD_Handler.cpp1
-rw-r--r--DAnCE/tools/Config_Handlers/STD_PC_Intf.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/Utils/Exceptions.h1
-rw-r--r--DAnCE/tools/Config_Handlers/XML_File_Intf.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/XSC_XML_Handlers_Export.h1
-rw-r--r--DAnCE/tools/Convert_Plan/Convert_Plan.cpp2
-rw-r--r--DAnCE/tools/Convert_Plan/Convert_Plan.mpc1
-rw-r--r--DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp2
-rw-r--r--DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h2
-rw-r--r--DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h1
-rw-r--r--DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc1
-rw-r--r--DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h1
-rw-r--r--DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp2
-rw-r--r--DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h2
-rw-r--r--DAnCE/tools/Domain_Validator/Domain_Validator.idl2
-rw-r--r--DAnCE/tools/Domain_Validator/Domain_Validator.mpc1
-rw-r--r--DAnCE/tools/Logger_Backend/ndds/DAnCE_NDDS_Log_Export.h1
-rw-r--r--DAnCE/tools/Logger_Backend/ndds/Log_Backend.cpp1
-rw-r--r--DAnCE/tools/Logger_Backend/ndds/Log_Backend.h2
-rw-r--r--DAnCE/tools/Logger_Backend/ndds/Log_Record.idl2
-rw-r--r--DAnCE/tools/Logger_Backend/ndds/Log_Server.cpp2
-rw-r--r--DAnCE/tools/Logger_Backend/ndds/NDDS_Logger.mpc2
-rw-r--r--DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h1
-rw-r--r--DAnCE/tools/Split_Plan/Locality_Splitter.cpp2
-rw-r--r--DAnCE/tools/Split_Plan/Locality_Splitter.h2
-rw-r--r--DAnCE/tools/Split_Plan/Node_Splitter.cpp2
-rw-r--r--DAnCE/tools/Split_Plan/Node_Splitter.h2
-rw-r--r--DAnCE/tools/Split_Plan/Split_Plan.cpp2
-rw-r--r--DAnCE/tools/Split_Plan/Split_Plan.h2
-rw-r--r--DAnCE/tools/Split_Plan/Split_Plan.mpc2
-rw-r--r--DAnCE/tools/Split_Plan/Split_Plan_exec.cpp2
-rw-r--r--DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp2
-rw-r--r--DAnCE/tools/Split_Plan/Sub_UUID_Generator.h2
-rw-r--r--DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp2
-rw-r--r--DAnCE/tools/System_Health/Daemon/SHS_Daemon.idl1
-rw-r--r--DAnCE/tools/System_Health/Daemon/SHS_Daemon.mpc1
-rw-r--r--DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp2
-rw-r--r--DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h2
-rw-r--r--DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_CORBA_Transport_export.h1
-rw-r--r--DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_Interceptors_export.h1
-rw-r--r--DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp2
-rw-r--r--DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h1
-rw-r--r--DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp2
-rw-r--r--DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h1
-rw-r--r--DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc2
-rw-r--r--DAnCE/tools/System_Health/Interceptors/SHS_Transport.h1
-rw-r--r--DAnCE/tools/System_Health/SHS_DataModel.idl1
-rw-r--r--DAnCE/tools/System_Health/System_Health.mpc1
301 files changed, 2 insertions, 493 deletions
diff --git a/DAnCE/dance/DAnCE_ArtifactInstallation.idl b/DAnCE/dance/DAnCE_ArtifactInstallation.idl
index a284d589e3c..999b8782b60 100644
--- a/DAnCE/dance/DAnCE_ArtifactInstallation.idl
+++ b/DAnCE/dance/DAnCE_ArtifactInstallation.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DANCE_ARTIFACT_INSTALLATION_IDL
#define DANCE_ARTIFACT_INSTALLATION_IDL
diff --git a/DAnCE/dance/DAnCE_Core.mpc b/DAnCE/dance/DAnCE_Core.mpc
index 5a73611c181..827536dba9a 100644
--- a/DAnCE/dance/DAnCE_Core.mpc
+++ b/DAnCE/dance/DAnCE_Core.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DAnCE_IDL) : dancelib_with_idl, dance_output, valuetype, gen_ostream, \
dance_deployment_stub, install {
custom_only = 1
diff --git a/DAnCE/dance/DAnCE_DeploymentInterceptors.idl b/DAnCE/dance/DAnCE_DeploymentInterceptors.idl
index ca17d6da8bb..1f61ce57032 100644
--- a/DAnCE/dance/DAnCE_DeploymentInterceptors.idl
+++ b/DAnCE/dance/DAnCE_DeploymentInterceptors.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DANCE_DEPLOYMENTINTERCEPTOR_IDL
#define DANCE_DEPLOYMENTINTERCEPTOR_IDL
diff --git a/DAnCE/dance/DAnCE_DeploymentInterceptors_Base_Impl.cpp b/DAnCE/dance/DAnCE_DeploymentInterceptors_Base_Impl.cpp
index ec81ef36016..4a31e06dfc9 100644
--- a/DAnCE/dance/DAnCE_DeploymentInterceptors_Base_Impl.cpp
+++ b/DAnCE/dance/DAnCE_DeploymentInterceptors_Base_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "DAnCE_DeploymentInterceptors_Base_Impl.h"
namespace DAnCE
diff --git a/DAnCE/dance/DAnCE_DeploymentInterceptors_Base_Impl.h b/DAnCE/dance/DAnCE_DeploymentInterceptors_Base_Impl.h
index eea4ef895e8..20533f11e44 100644
--- a/DAnCE/dance/DAnCE_DeploymentInterceptors_Base_Impl.h
+++ b/DAnCE/dance/DAnCE_DeploymentInterceptors_Base_Impl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file DAnCE_DeploymentInterceptors_Base_Impl.h
*
diff --git a/DAnCE/dance/DAnCE_LocalityManager.idl b/DAnCE/dance/DAnCE_LocalityManager.idl
index 5e371672033..79643252fd7 100644
--- a/DAnCE/dance/DAnCE_LocalityManager.idl
+++ b/DAnCE/dance/DAnCE_LocalityManager.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DANCE_LOCALITYMANAGER_IDL
#define DANCE_LOCALITYMANAGER_IDL
diff --git a/DAnCE/dance/DAnCE_Properties.mpc b/DAnCE/dance/DAnCE_Properties.mpc
index f8cf8570521..eb0d465241d 100644
--- a/DAnCE/dance/DAnCE_Properties.mpc
+++ b/DAnCE/dance/DAnCE_Properties.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(DAnCE_Properties_IDL) : install, dancelib_with_idl, dance_output {
custom_only = 1
diff --git a/DAnCE/dance/DAnCE_Utility.cpp b/DAnCE/dance/DAnCE_Utility.cpp
index 607ea5bca0e..cb2595e48a0 100644
--- a/DAnCE/dance/DAnCE_Utility.cpp
+++ b/DAnCE/dance/DAnCE_Utility.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DAnCE_Utility_CPP
#define DAnCE_Utility_CPP
diff --git a/DAnCE/dance/DAnCE_Utility.h b/DAnCE/dance/DAnCE_Utility.h
index 7b0963f8f3f..f5b7460c23a 100644
--- a/DAnCE/dance/DAnCE_Utility.h
+++ b/DAnCE/dance/DAnCE_Utility.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file DAnCE_Utility.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/Deployment/Deployment.idl b/DAnCE/dance/Deployment/Deployment.idl
index a2acad632f1..f697d699123 100644
--- a/DAnCE/dance/Deployment/Deployment.idl
+++ b/DAnCE/dance/Deployment/Deployment.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DEPLOYMENT_IDL
#define DEPLOYMENT_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_Application.idl b/DAnCE/dance/Deployment/Deployment_Application.idl
index 3813645d835..3bc5812b147 100644
--- a/DAnCE/dance/Deployment/Deployment_Application.idl
+++ b/DAnCE/dance/Deployment/Deployment_Application.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DEPLOYMENT_APPLICATION_IDL
#define DEPLOYMENT_APPLICATION_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_ApplicationManager.idl b/DAnCE/dance/Deployment/Deployment_ApplicationManager.idl
index b16aa58f5bc..8450e76dab5 100644
--- a/DAnCE/dance/Deployment/Deployment_ApplicationManager.idl
+++ b/DAnCE/dance/Deployment/Deployment_ApplicationManager.idl
@@ -1,4 +1,3 @@
-// $Id$
// Compliant with OMG 06-04-01 section 15
#ifndef DEPLOYMENT_APPLICATIONMANAGER_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_Connection.idl b/DAnCE/dance/Deployment/Deployment_Connection.idl
index c402b24f9c1..34df86b5b18 100644
--- a/DAnCE/dance/Deployment/Deployment_Connection.idl
+++ b/DAnCE/dance/Deployment/Deployment_Connection.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DEPLOYMENT_CONNECTION_IDL
#define DEPLOYMENT_CONNECTION_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_Core.mpc b/DAnCE/dance/Deployment/Deployment_Core.mpc
index b6a1e548aaa..2d7f7c6456b 100644
--- a/DAnCE/dance/Deployment/Deployment_Core.mpc
+++ b/DAnCE/dance/Deployment/Deployment_Core.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Deployment_IDL) : install, dancelib_with_idl, dance_output, valuetype, gen_ostream, ami, amh {
custom_only = 1
idlflags += -Wb,stub_export_macro=DEPLOYMENT_STUB_Export \
diff --git a/DAnCE/dance/Deployment/Deployment_Data.idl b/DAnCE/dance/Deployment/Deployment_Data.idl
index 5d3fba4ab7b..ff8a5728031 100644
--- a/DAnCE/dance/Deployment/Deployment_Data.idl
+++ b/DAnCE/dance/Deployment/Deployment_Data.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DEPLOYMENT_DATA_IDL
#define DEPLOYMENT_DATA_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_DeploymentPlan.idl b/DAnCE/dance/Deployment/Deployment_DeploymentPlan.idl
index 81cea143e02..078befb58ea 100644
--- a/DAnCE/dance/Deployment/Deployment_DeploymentPlan.idl
+++ b/DAnCE/dance/Deployment/Deployment_DeploymentPlan.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DEPLOYMENT_DEPLOYMENTPLAN_IDL
#define DEPLOYMENT_DEPLOYMENTPLAN_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_DomainApplication.idl b/DAnCE/dance/Deployment/Deployment_DomainApplication.idl
index 33ee72ce0bc..275c3bcbdc9 100644
--- a/DAnCE/dance/Deployment/Deployment_DomainApplication.idl
+++ b/DAnCE/dance/Deployment/Deployment_DomainApplication.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DEPLOYMENT_DOMAINAPPLICATION_IDL
#define DEPLOYMENT_DOMAINAPPLICATION_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_DomainApplicationManager.idl b/DAnCE/dance/Deployment/Deployment_DomainApplicationManager.idl
index b493ca5ad1d..d96f41622d9 100644
--- a/DAnCE/dance/Deployment/Deployment_DomainApplicationManager.idl
+++ b/DAnCE/dance/Deployment/Deployment_DomainApplicationManager.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DOMAINAPPLICATIONMANAGER_IDL
#define DOMAINAPPLICATIONMANAGER_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_ExecutionManager.idl b/DAnCE/dance/Deployment/Deployment_ExecutionManager.idl
index 1c60f42f13c..259b5e7ee9f 100644
--- a/DAnCE/dance/Deployment/Deployment_ExecutionManager.idl
+++ b/DAnCE/dance/Deployment/Deployment_ExecutionManager.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef EXECUTIONMANAGER_IDL
#define EXECUTIONMANAGER_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_InvalidComponentExecParameter.idl b/DAnCE/dance/Deployment/Deployment_InvalidComponentExecParameter.idl
index d8ba9724259..bd301adbcd4 100644
--- a/DAnCE/dance/Deployment/Deployment_InvalidComponentExecParameter.idl
+++ b/DAnCE/dance/Deployment/Deployment_InvalidComponentExecParameter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DEPLOYMENT_INVALIDCOMPONENTEXECPARAMETER_IDL
#define DEPLOYMENT_INVALIDCOMPONENTEXECPARAMETER_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_InvalidConnection.idl b/DAnCE/dance/Deployment/Deployment_InvalidConnection.idl
index 16b68012339..54fb295b6ff 100644
--- a/DAnCE/dance/Deployment/Deployment_InvalidConnection.idl
+++ b/DAnCE/dance/Deployment/Deployment_InvalidConnection.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DEPLOYMENT_INVALIDCONNECTION_IDL
#define DEPLOYMENT_INVALIDCONNECTION_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_InvalidNodeExecParameter.idl b/DAnCE/dance/Deployment/Deployment_InvalidNodeExecParameter.idl
index 255f5dbff21..d550bc1835f 100644
--- a/DAnCE/dance/Deployment/Deployment_InvalidNodeExecParameter.idl
+++ b/DAnCE/dance/Deployment/Deployment_InvalidNodeExecParameter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DEPLOYMENT_INVALIDNODEEXECPARAMETER_IDL
#define DEPLOYMENT_INVALIDNODEEXECPARAMETER_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_InvalidProperty.idl b/DAnCE/dance/Deployment/Deployment_InvalidProperty.idl
index c75adf9360c..765f55c902d 100644
--- a/DAnCE/dance/Deployment/Deployment_InvalidProperty.idl
+++ b/DAnCE/dance/Deployment/Deployment_InvalidProperty.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DEPLOYMENT_INVALIDPROPERTY_IDL
#define DEPLOYMENT_INVALIDPROPERTY_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_NodeApplication.idl b/DAnCE/dance/Deployment/Deployment_NodeApplication.idl
index e56c1589543..ada2a1c24b6 100644
--- a/DAnCE/dance/Deployment/Deployment_NodeApplication.idl
+++ b/DAnCE/dance/Deployment/Deployment_NodeApplication.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DEPLOYMENT_NODEAPPLICATION_IDL
#define DEPLOYMENT_NODEAPPLICATION_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_NodeApplicationManager.idl b/DAnCE/dance/Deployment/Deployment_NodeApplicationManager.idl
index 41abf31cae3..f30ebbfbb4c 100644
--- a/DAnCE/dance/Deployment/Deployment_NodeApplicationManager.idl
+++ b/DAnCE/dance/Deployment/Deployment_NodeApplicationManager.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef NODEAPPLICATIONMANAGER_IDL
#define NODEAPPLICATIONMANAGER_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_NodeManager.idl b/DAnCE/dance/Deployment/Deployment_NodeManager.idl
index 2c944e0b1ff..ad08858c289 100644
--- a/DAnCE/dance/Deployment/Deployment_NodeManager.idl
+++ b/DAnCE/dance/Deployment/Deployment_NodeManager.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DEPLOYMENT_NODEMANAGER_IDL
#define DEPLOYMENT_NODEMANAGER_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_Packaging_Data.idl b/DAnCE/dance/Deployment/Deployment_Packaging_Data.idl
index d973d486d9e..74b11b2f02b 100644
--- a/DAnCE/dance/Deployment/Deployment_Packaging_Data.idl
+++ b/DAnCE/dance/Deployment/Deployment_Packaging_Data.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PACKAGING_DATA_IDL
#define PACKAGING_DATA_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_PlanError.idl b/DAnCE/dance/Deployment/Deployment_PlanError.idl
index 806983d2a87..ff2d7d577a1 100644
--- a/DAnCE/dance/Deployment/Deployment_PlanError.idl
+++ b/DAnCE/dance/Deployment/Deployment_PlanError.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DEPLOYMENT_PLANERROR_IDL
#define DEPLOYMENT_PLANERROR_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_RepositoryManager.idl b/DAnCE/dance/Deployment/Deployment_RepositoryManager.idl
index b2f711b2521..2ffba296e61 100644
--- a/DAnCE/dance/Deployment/Deployment_RepositoryManager.idl
+++ b/DAnCE/dance/Deployment/Deployment_RepositoryManager.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef REPOSITORY_MANAGER_IDL
#define REPOSITORY_MANAGER_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_ResourceCommitmentManager.idl b/DAnCE/dance/Deployment/Deployment_ResourceCommitmentManager.idl
index a08154afc1b..6d8569c0741 100644
--- a/DAnCE/dance/Deployment/Deployment_ResourceCommitmentManager.idl
+++ b/DAnCE/dance/Deployment/Deployment_ResourceCommitmentManager.idl
@@ -1,4 +1,3 @@
-// $Id$
//
#ifndef RESOURCE_COMMITMENT_MANAGER_IDL
#define RESOURCE_COMMITMENT_MANAGER_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_ResourceNotAvailable.idl b/DAnCE/dance/Deployment/Deployment_ResourceNotAvailable.idl
index a98a47f122b..9ead9292713 100644
--- a/DAnCE/dance/Deployment/Deployment_ResourceNotAvailable.idl
+++ b/DAnCE/dance/Deployment/Deployment_ResourceNotAvailable.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DEPLOYMENT_RESOURCENOTAVAILABLE_IDL
#define DEPLOYMENT_RESOURCENOTAVAILABLE_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_StartError.idl b/DAnCE/dance/Deployment/Deployment_StartError.idl
index 9cf092f0796..d5d361a23ed 100644
--- a/DAnCE/dance/Deployment/Deployment_StartError.idl
+++ b/DAnCE/dance/Deployment/Deployment_StartError.idl
@@ -1,4 +1,3 @@
-// $Id$
// Compliant with OMG 06-04-01 section 15
#ifndef DEPLOYMENT_STARTERROR_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_StopError.idl b/DAnCE/dance/Deployment/Deployment_StopError.idl
index 67279680021..125e1a0152a 100644
--- a/DAnCE/dance/Deployment/Deployment_StopError.idl
+++ b/DAnCE/dance/Deployment/Deployment_StopError.idl
@@ -1,4 +1,3 @@
-// $Id$
// Compliant with OMG 06-04-01 section 15
#ifndef DEPLOYMENT_STOPERROR_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_TargetManager.idl b/DAnCE/dance/Deployment/Deployment_TargetManager.idl
index 9862e084bb3..bb72ec6fa5a 100644
--- a/DAnCE/dance/Deployment/Deployment_TargetManager.idl
+++ b/DAnCE/dance/Deployment/Deployment_TargetManager.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TARGETMANAGER_IDL
#define TARGETMANAGER_IDL
diff --git a/DAnCE/dance/DomainApplication/DomainApplication.mpc b/DAnCE/dance/DomainApplication/DomainApplication.mpc
index a8a690497c9..ecb330d65e7 100644
--- a/DAnCE/dance/DomainApplication/DomainApplication.mpc
+++ b/DAnCE/dance/DomainApplication/DomainApplication.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: install, dance_lib, dance_output, dance_domainapplication_skel, \
dance_nodeapplicationmanager_stub, \
dance_nodeapplicationmanager_skel, \
diff --git a/DAnCE/dance/DomainApplication/Domain_Application_Export.h b/DAnCE/dance/DomainApplication/Domain_Application_Export.h
index fe9b0133ebb..cf2d5459e9e 100644
--- a/DAnCE/dance/DomainApplication/Domain_Application_Export.h
+++ b/DAnCE/dance/DomainApplication/Domain_Application_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl Domain_Application
// ------------------------------
diff --git a/DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp b/DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp
index a5045184e8f..8ab09b797f1 100644
--- a/DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp
+++ b/DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Domain_Application_Impl.h"
#include "dance/Logger/Log_Macros.h"
#include <sstream>
diff --git a/DAnCE/dance/DomainApplication/Domain_Application_Impl.h b/DAnCE/dance/DomainApplication/Domain_Application_Impl.h
index 2ba077f1ee3..8938c89724c 100644
--- a/DAnCE/dance/DomainApplication/Domain_Application_Impl.h
+++ b/DAnCE/dance/DomainApplication/Domain_Application_Impl.h
@@ -1,4 +1,3 @@
-// $Id$
/**========================================================
*
* @file Domain_Application_Impl.h
diff --git a/DAnCE/dance/DomainApplicationManager/DomainApplicationManager.mpc b/DAnCE/dance/DomainApplicationManager/DomainApplicationManager.mpc
index 5af686859d7..229c1ba1589 100644
--- a/DAnCE/dance/DomainApplicationManager/DomainApplicationManager.mpc
+++ b/DAnCE/dance/DomainApplicationManager/DomainApplicationManager.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : install, dance_lib, dance_output, dance_domainapplicationmanager_skel, \
dance_domainapplication, dance_nodemanager_stub, \
dance_nodemanager_skel, naming, \
diff --git a/DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Export.h b/DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Export.h
index 31fa9b914b7..52b54c2f96c 100644
--- a/DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Export.h
+++ b/DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s DomainApplicationManager
// ------------------------------
diff --git a/DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index eb20507cf02..c3e18907d9f 100644
--- a/DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DomainApplicationManager_Impl.h"
#include "dance/Deployment/Deployment_ConnectionC.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/dance/DomainApplicationManager/Node_Locator.cpp b/DAnCE/dance/DomainApplicationManager/Node_Locator.cpp
index d5464526888..85e0f9f5f67 100644
--- a/DAnCE/dance/DomainApplicationManager/Node_Locator.cpp
+++ b/DAnCE/dance/DomainApplicationManager/Node_Locator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Node_Locator.h"
#include "ace/Read_Buffer.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/dance/ExecutionManager/ExecutionManager.mpc b/DAnCE/dance/ExecutionManager/ExecutionManager.mpc
index 15133557653..adb3b68e413 100644
--- a/DAnCE/dance/ExecutionManager/ExecutionManager.mpc
+++ b/DAnCE/dance/ExecutionManager/ExecutionManager.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Execution_Manager_Exec) : install, dance_exe, naming, \
dance_domainapplicationmanager, \
dance_executionmanager_skel, \
diff --git a/DAnCE/dance/ExecutionManager/ExecutionManager_Impl.cpp b/DAnCE/dance/ExecutionManager/ExecutionManager_Impl.cpp
index bbd7b5806fb..37fd5f18474 100644
--- a/DAnCE/dance/ExecutionManager/ExecutionManager_Impl.cpp
+++ b/DAnCE/dance/ExecutionManager/ExecutionManager_Impl.cpp
@@ -1,6 +1,4 @@
//--*C++*--
-// $Id$
-
#include "ExecutionManager_Impl.h"
#include "Config_Handlers/DnC_Dump.h"
diff --git a/DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp b/DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp
index d5da3e34d29..05696e1d2b8 100644
--- a/DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp
+++ b/DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "tao/StringSeqC.h"
diff --git a/DAnCE/dance/ExecutionManager/Execution_Manager.cpp b/DAnCE/dance/ExecutionManager/Execution_Manager.cpp
index 7bae9e8f47a..14eafe9429e 100644
--- a/DAnCE/dance/ExecutionManager/Execution_Manager.cpp
+++ b/DAnCE/dance/ExecutionManager/Execution_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Dynamic_Service.h"
#include "tao/ORB.h"
#include "tao/Object.h"
diff --git a/DAnCE/dance/LocalityManager/Configuration/CPU_Affinity.cpp b/DAnCE/dance/LocalityManager/Configuration/CPU_Affinity.cpp
index f20cb31be5d..72ec2f30d04 100644
--- a/DAnCE/dance/LocalityManager/Configuration/CPU_Affinity.cpp
+++ b/DAnCE/dance/LocalityManager/Configuration/CPU_Affinity.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "CPU_Affinity.h"
#include "dance/DAnCE_PropertiesC.h"
#include "dance/Deployment/Deployment_StartErrorC.h"
diff --git a/DAnCE/dance/LocalityManager/Configuration/CPU_Affinity.h b/DAnCE/dance/LocalityManager/Configuration/CPU_Affinity.h
index 265350cc25b..bcef3771485 100644
--- a/DAnCE/dance/LocalityManager/Configuration/CPU_Affinity.h
+++ b/DAnCE/dance/LocalityManager/Configuration/CPU_Affinity.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file CPU_Affinity.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/LocalityManager/Configuration/CPU_Affinity_export.h b/DAnCE/dance/LocalityManager/Configuration/CPU_Affinity_export.h
index acc5593b4c6..94d2f0cdaf8 100644
--- a/DAnCE/dance/LocalityManager/Configuration/CPU_Affinity_export.h
+++ b/DAnCE/dance/LocalityManager/Configuration/CPU_Affinity_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef CPU_AFFINITY_EXPORT_H
diff --git a/DAnCE/dance/LocalityManager/Configuration/Configuration.mpc b/DAnCE/dance/LocalityManager/Configuration/Configuration.mpc
index d1f920ef46e..82d1f63e759 100644
--- a/DAnCE/dance/LocalityManager/Configuration/Configuration.mpc
+++ b/DAnCE/dance/LocalityManager/Configuration/Configuration.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (DAnCE_LM_Config_Plugins) : install, dance_deployment_stub, dance_stub, dance_lib, dance_output {
dynamicflags += PROCESS_NAME_BUILD_DLL CPU_AFFINITY_BUILD_DLL PROCESS_PRIORITY_BUILD_DLL
diff --git a/DAnCE/dance/LocalityManager/Configuration/Process_Name.cpp b/DAnCE/dance/LocalityManager/Configuration/Process_Name.cpp
index 0f62623c249..c6cd4d5d63d 100644
--- a/DAnCE/dance/LocalityManager/Configuration/Process_Name.cpp
+++ b/DAnCE/dance/LocalityManager/Configuration/Process_Name.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Process_Name.h"
#include "dance/DAnCE_PropertiesC.h"
#include "dance/Deployment/Deployment_StartErrorC.h"
diff --git a/DAnCE/dance/LocalityManager/Configuration/Process_Name.h b/DAnCE/dance/LocalityManager/Configuration/Process_Name.h
index e57eae67211..9f234fa237f 100644
--- a/DAnCE/dance/LocalityManager/Configuration/Process_Name.h
+++ b/DAnCE/dance/LocalityManager/Configuration/Process_Name.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Process_Name.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/LocalityManager/Configuration/Process_Name_export.h b/DAnCE/dance/LocalityManager/Configuration/Process_Name_export.h
index 6951c6ef86c..cce0e07d339 100644
--- a/DAnCE/dance/LocalityManager/Configuration/Process_Name_export.h
+++ b/DAnCE/dance/LocalityManager/Configuration/Process_Name_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef PROCESS_NAME_EXPORT_H
diff --git a/DAnCE/dance/LocalityManager/Configuration/Process_Priority.cpp b/DAnCE/dance/LocalityManager/Configuration/Process_Priority.cpp
index 15c97e9f661..ec7e9a3b5e9 100644
--- a/DAnCE/dance/LocalityManager/Configuration/Process_Priority.cpp
+++ b/DAnCE/dance/LocalityManager/Configuration/Process_Priority.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Process_Priority.h"
#include "dance/DAnCE_PropertiesC.h"
#include "dance/Deployment/Deployment_StartErrorC.h"
diff --git a/DAnCE/dance/LocalityManager/Configuration/Process_Priority.h b/DAnCE/dance/LocalityManager/Configuration/Process_Priority.h
index 6c8519910ff..d4d63398747 100644
--- a/DAnCE/dance/LocalityManager/Configuration/Process_Priority.h
+++ b/DAnCE/dance/LocalityManager/Configuration/Process_Priority.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Process_Priority.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/LocalityManager/Configuration/Process_Priority_export.h b/DAnCE/dance/LocalityManager/Configuration/Process_Priority_export.h
index 81aa53e39c9..b9adc4dc66c 100644
--- a/DAnCE/dance/LocalityManager/Configuration/Process_Priority_export.h
+++ b/DAnCE/dance/LocalityManager/Configuration/Process_Priority_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef PROCESS_PRIORITY_EXPORT_H
diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc
index 35838b168cc..acd01fa7874 100644
--- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc
+++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DAnCE_LocalityManager_Impl) : dance_lib, dance_output, naming, \
dance_skel, dance_logger, dance_deployment_scheduler, dance_deployment_scheduler, \
install, dance_locality_handler {
diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp
index 4ebb93083aa..32942a7e661 100644
--- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp
+++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Locality_Manager_Impl.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.h b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.h
index 746fe6ab12f..9e41964691b 100644
--- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.h
+++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Locality_Manager_Impl.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl_Export.h b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl_Export.h
index 42f664a2c36..c5f3e726167 100644
--- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl_Export.h
+++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl Locality_Manager_Impl
// ------------------------------
diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.h b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.h
index 5be09905c78..3591129c84c 100644
--- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.h
+++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Locality_Manager_Task.h
* @author William R. Otte
diff --git a/DAnCE/dance/LocalityManager/Handler/Config_Handler_Impl.cpp b/DAnCE/dance/LocalityManager/Handler/Config_Handler_Impl.cpp
index a38499eed70..ba661da2c4a 100644
--- a/DAnCE/dance/LocalityManager/Handler/Config_Handler_Impl.cpp
+++ b/DAnCE/dance/LocalityManager/Handler/Config_Handler_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// TAO_IDL - Generated from
// be/be_codegen.cpp:1560
diff --git a/DAnCE/dance/LocalityManager/Handler/Config_Handler_Impl.h b/DAnCE/dance/LocalityManager/Handler/Config_Handler_Impl.h
index f9a6c2924c5..2a4b8ec73e3 100644
--- a/DAnCE/dance/LocalityManager/Handler/Config_Handler_Impl.h
+++ b/DAnCE/dance/LocalityManager/Handler/Config_Handler_Impl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Config_Handler_Impl.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/LocalityManager/Handler/DAnCE_Locality_Handler_export.h b/DAnCE/dance/LocalityManager/Handler/DAnCE_Locality_Handler_export.h
index 72f260ca76b..00813f7b390 100644
--- a/DAnCE/dance/LocalityManager/Handler/DAnCE_Locality_Handler_export.h
+++ b/DAnCE/dance/LocalityManager/Handler/DAnCE_Locality_Handler_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef DANCE_LOCALITY_HANDLER_EXPORT_H
diff --git a/DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.cpp b/DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.cpp
index 396f8f38848..bb853dfe9ac 100644
--- a/DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.cpp
+++ b/DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// TAO_IDL - Generated from
// be/be_codegen.cpp:1560
diff --git a/DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.h b/DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.h
index 8019eea2310..ca1a966205c 100644
--- a/DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.h
+++ b/DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Inst_Handler_Impl.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/LocalityManager/Handler/Interceptor_Handler_Impl.cpp b/DAnCE/dance/LocalityManager/Handler/Interceptor_Handler_Impl.cpp
index 2cd47d833ba..c636a03a3b4 100644
--- a/DAnCE/dance/LocalityManager/Handler/Interceptor_Handler_Impl.cpp
+++ b/DAnCE/dance/LocalityManager/Handler/Interceptor_Handler_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// TAO_IDL - Generated from
// be/be_codegen.cpp:1560
diff --git a/DAnCE/dance/LocalityManager/Handler/Interceptor_Handler_Impl.h b/DAnCE/dance/LocalityManager/Handler/Interceptor_Handler_Impl.h
index 42445858cb6..f3065575a49 100644
--- a/DAnCE/dance/LocalityManager/Handler/Interceptor_Handler_Impl.h
+++ b/DAnCE/dance/LocalityManager/Handler/Interceptor_Handler_Impl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Interceptor_Handler_Impl.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.cpp b/DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.cpp
index 32bda2e6b60..6203911a3f3 100644
--- a/DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.cpp
+++ b/DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LocalityActivator_Impl.h"
#include "ace/Log_Msg.h"
#include "ace/UUID.h"
diff --git a/DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.h b/DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.h
index af4a5def9ae..be0a18cbb83 100644
--- a/DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.h
+++ b/DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file LocalityActivator_Impl.h
* @author William R. Otte
diff --git a/DAnCE/dance/LocalityManager/Handler/LocalityHandler.mpc b/DAnCE/dance/LocalityManager/Handler/LocalityHandler.mpc
index 5a6ba385ed6..f1a0cca7dae 100644
--- a/DAnCE/dance/LocalityManager/Handler/LocalityHandler.mpc
+++ b/DAnCE/dance/LocalityManager/Handler/LocalityHandler.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(DAnCE_Locality_Handler) : dance_skel, dance_split_plan, dance_lib, dance_output, dance_logger, \
dance_deployment_scheduler, install {
diff --git a/DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp b/DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp
index bcc212dda45..2f30daa75e7 100644
--- a/DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp
+++ b/DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// TAO_IDL - Generated from
// be/be_codegen.cpp:1560
diff --git a/DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.h b/DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.h
index 4f98cb6d376..9e6269a43d4 100644
--- a/DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.h
+++ b/DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Locality_Manager_Handler_Impl.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/LocalityManager/Handler/Plugin_Conf.cpp b/DAnCE/dance/LocalityManager/Handler/Plugin_Conf.cpp
index 943d1791e17..55d2e7a3def 100644
--- a/DAnCE/dance/LocalityManager/Handler/Plugin_Conf.cpp
+++ b/DAnCE/dance/LocalityManager/Handler/Plugin_Conf.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Plugin_Conf.h"
#include "ace/Read_Buffer.h"
#include "ace/Tokenizer_T.h"
diff --git a/DAnCE/dance/LocalityManager/Handler/Plugin_Conf.h b/DAnCE/dance/LocalityManager/Handler/Plugin_Conf.h
index b33fe3ee42a..dbe635eafe8 100644
--- a/DAnCE/dance/LocalityManager/Handler/Plugin_Conf.h
+++ b/DAnCE/dance/LocalityManager/Handler/Plugin_Conf.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Plugin_Conf.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/LocalityManager/Interceptors/Best_Effort.cpp b/DAnCE/dance/LocalityManager/Interceptors/Best_Effort.cpp
index 5de00746710..72d93eb3abf 100644
--- a/DAnCE/dance/LocalityManager/Interceptors/Best_Effort.cpp
+++ b/DAnCE/dance/LocalityManager/Interceptors/Best_Effort.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Best_Effort.h"
#include "dance/Deployment/Deployment_StartErrorC.h"
#include "dance/DAnCE_PropertiesC.h"
diff --git a/DAnCE/dance/LocalityManager/Interceptors/Best_Effort.h b/DAnCE/dance/LocalityManager/Interceptors/Best_Effort.h
index 0b8b5333812..312f2b6a793 100644
--- a/DAnCE/dance/LocalityManager/Interceptors/Best_Effort.h
+++ b/DAnCE/dance/LocalityManager/Interceptors/Best_Effort.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Best_Effort.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/LocalityManager/Interceptors/DAnCE_Error_Interceptors_export.h b/DAnCE/dance/LocalityManager/Interceptors/DAnCE_Error_Interceptors_export.h
index 753ad8b48ed..cae217e604c 100644
--- a/DAnCE/dance/LocalityManager/Interceptors/DAnCE_Error_Interceptors_export.h
+++ b/DAnCE/dance/LocalityManager/Interceptors/DAnCE_Error_Interceptors_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef DANCE_ERROR_INTERCEPTORS_EXPORT_H
diff --git a/DAnCE/dance/LocalityManager/Interceptors/Error_Interceptors.mpc b/DAnCE/dance/LocalityManager/Interceptors/Error_Interceptors.mpc
index 9573e5c3501..e50daa473be 100644
--- a/DAnCE/dance/LocalityManager/Interceptors/Error_Interceptors.mpc
+++ b/DAnCE/dance/LocalityManager/Interceptors/Error_Interceptors.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DAnCE_Error_Interceptors) : install, dance_skel, dance_lib, dance_output, dance_logger {
dynamicflags += DANCE_ERROR_INTERCEPTORS_BUILD_DLL
diff --git a/DAnCE/dance/LocalityManager/Interceptors/Standard_Error.cpp b/DAnCE/dance/LocalityManager/Interceptors/Standard_Error.cpp
index 863591f3eb5..ac1e7c43115 100644
--- a/DAnCE/dance/LocalityManager/Interceptors/Standard_Error.cpp
+++ b/DAnCE/dance/LocalityManager/Interceptors/Standard_Error.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Standard_Error.h"
#include "dance/Deployment/Deployment_StartErrorC.h"
#include "dance/DAnCE_PropertiesC.h"
diff --git a/DAnCE/dance/LocalityManager/Interceptors/Standard_Error.h b/DAnCE/dance/LocalityManager/Interceptors/Standard_Error.h
index 8a74af2bd4b..7c3105b6ff3 100644
--- a/DAnCE/dance/LocalityManager/Interceptors/Standard_Error.h
+++ b/DAnCE/dance/LocalityManager/Interceptors/Standard_Error.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Standard_Error.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Dependency_Sorter.cpp b/DAnCE/dance/LocalityManager/Scheduler/Dependency_Sorter.cpp
index 1c356c7b261..a6cd5384c70 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Dependency_Sorter.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Dependency_Sorter.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Dependency_Sorter.h"
#include <algorithm>
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Dependency_Sorter.h b/DAnCE/dance/LocalityManager/Scheduler/Dependency_Sorter.h
index 078d59b9394..55b72aac4fb 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Dependency_Sorter.h
+++ b/DAnCE/dance/LocalityManager/Scheduler/Dependency_Sorter.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Dependency_Sorter.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Deployment_Completion.cpp b/DAnCE/dance/LocalityManager/Scheduler/Deployment_Completion.cpp
index aaa0d109964..40f8d80a236 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Deployment_Completion.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Deployment_Completion.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Deployment_Completion.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Deployment_Event.cpp b/DAnCE/dance/LocalityManager/Scheduler/Deployment_Event.cpp
index 989db584c63..229f447e122 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Deployment_Event.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Deployment_Event.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Deployment_Event.h"
#if !defined (__ACE_INLINE__)
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Deployment_Event.inl b/DAnCE/dance/LocalityManager/Scheduler/Deployment_Event.inl
index 70617c6475e..d29d6685e17 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Deployment_Event.inl
+++ b/DAnCE/dance/LocalityManager/Scheduler/Deployment_Event.inl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DEPLOYMENT_EVENT_INL
#define DEPLOYMENT_EVENT_INL
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler.cpp b/DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler.cpp
index 4c931689158..55af2c1d478 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Deployment_Scheduler.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler.inl b/DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler.inl
index 282acac27e7..32c36329c13 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler.inl
+++ b/DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler.inl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DEPLOYMENT_SCHEDULER_INL
#define DEPLOYMENT_SCHEDULER_INL
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler_export.h b/DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler_export.h
index c9b12cf967a..c7ce7e74189 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler_export.h
+++ b/DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef DEPLOYMENT_SCHEDULER_EXPORT_H
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp
index dd7c9f0c762..301bb0bcb69 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Action_Base.h"
#include "tao/AnyTypeCode/ExceptionA.h"
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Configured.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Configured.cpp
index e7f28fec5de..2122f67147c 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Events/Configured.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Configured.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Configured.h"
#include "tao/AnyTypeCode/ExceptionA.h"
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp
index 17adb9d9193..67444fe4831 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Connect.h"
#include "tao/AnyTypeCode/ExceptionA.h"
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Disconnect.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Disconnect.cpp
index 1ff90b9bfda..6e4ab74dd22 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Events/Disconnect.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Disconnect.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Disconnect.h"
#include "tao/AnyTypeCode/ExceptionA.h"
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Endpoint.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Endpoint.cpp
index f0ed6bcdcb8..2d6fb836902 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Events/Endpoint.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Endpoint.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Endpoint.h"
#include "tao/AnyTypeCode/ExceptionA.h"
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp
index 6ab0a40d0af..e35aa74c773 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Install.h"
#include "tao/AnyTypeCode/ExceptionA.h"
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Passivate.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Passivate.cpp
index aa575200acc..acf3a514006 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Events/Passivate.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Passivate.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Passivate.h"
#include "tao/AnyTypeCode/ExceptionA.h"
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Remove.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Remove.cpp
index 27a1f84e040..a27013ba3c1 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Events/Remove.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Remove.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Remove.h"
#include "tao/AnyTypeCode/ExceptionA.h"
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Start.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Start.cpp
index 47fe46d14c4..edd061ba1f1 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Events/Start.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Start.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Start.h"
#include "tao/AnyTypeCode/ExceptionA.h"
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp b/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp
index 68b73eef151..c62212271bf 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Plugin_Manager.h"
#include "dance/Logger/Log_Macros.h"
#include "dance/Deployment/Deployment_PlanErrorC.h"
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Scheduler.mpc b/DAnCE/dance/LocalityManager/Scheduler/Scheduler.mpc
index 78954178f25..7a451f52fc7 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Scheduler.mpc
+++ b/DAnCE/dance/LocalityManager/Scheduler/Scheduler.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DAnCE_Deployment_Scheduler) : dance_lib, dance_output, dance_skel, dance_logger, install {
dynamicflags += DEPLOYMENT_SCHEDULER_BUILD_DLL
diff --git a/DAnCE/dance/Logger/DAnCE_Logger_Export.h b/DAnCE/dance/Logger/DAnCE_Logger_Export.h
index e8e7cb3c81a..e2afcdd99ca 100644
--- a/DAnCE/dance/Logger/DAnCE_Logger_Export.h
+++ b/DAnCE/dance/Logger/DAnCE_Logger_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl DAnCE_Logger
// ------------------------------
diff --git a/DAnCE/dance/Logger/Log_Macros.cpp b/DAnCE/dance/Logger/Log_Macros.cpp
index ae4ff53b384..97bb2dd4dfe 100644
--- a/DAnCE/dance/Logger/Log_Macros.cpp
+++ b/DAnCE/dance/Logger/Log_Macros.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Log_Macros.h"
DAnCE_Logger_Export unsigned int DAnCE_debug_level = 1;
diff --git a/DAnCE/dance/Logger/Log_Macros.h b/DAnCE/dance/Logger/Log_Macros.h
index a9aacb3cfe4..eb7c96173e2 100644
--- a/DAnCE/dance/Logger/Log_Macros.h
+++ b/DAnCE/dance/Logger/Log_Macros.h
@@ -1,8 +1,7 @@
/**
* @file Log_Macros.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
- * // $Id$
- * Macros used for logging in DAnCE
+ * * Macros used for logging in DAnCE
*/
diff --git a/DAnCE/dance/Logger/Logger.mpc b/DAnCE/dance/Logger/Logger.mpc
index a94fbba90fe..a7131712a76 100644
--- a/DAnCE/dance/Logger/Logger.mpc
+++ b/DAnCE/dance/Logger/Logger.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(DAnCE_Logger): install, dance_lib, taolib, acelib {
sharedname = DAnCE_Logger
dynamicflags += DANCE_LOGGER_BUILD_DLL
diff --git a/DAnCE/dance/Logger/Logger_Service.cpp b/DAnCE/dance/Logger/Logger_Service.cpp
index 26258d0ea56..dcfb060613d 100644
--- a/DAnCE/dance/Logger/Logger_Service.cpp
+++ b/DAnCE/dance/Logger/Logger_Service.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Logger_Service.h"
#include "ace/Get_Opt.h"
#include "ace/Env_Value_T.h"
diff --git a/DAnCE/dance/Logger/Logger_Service.h b/DAnCE/dance/Logger/Logger_Service.h
index aa12248166a..ba3e1c5ea59 100644
--- a/DAnCE/dance/Logger/Logger_Service.h
+++ b/DAnCE/dance/Logger/Logger_Service.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef LOGGER_SERVICE_H_
#define LOGGER_SERVICE_H_
diff --git a/DAnCE/dance/NodeApplication/NodeApplication.mpc b/DAnCE/dance/NodeApplication/NodeApplication.mpc
index 0babea96795..48bd511a3ad 100644
--- a/DAnCE/dance/NodeApplication/NodeApplication.mpc
+++ b/DAnCE/dance/NodeApplication/NodeApplication.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(DAnCE_NodeApplication): install, dance_lib, \
dance_nodeapplication_skel, dance_deployment_scheduler, \
dance_logger, iortable, naming, dance_locality_handler, \
diff --git a/DAnCE/dance/NodeApplication/NodeApplication_Export.h b/DAnCE/dance/NodeApplication/NodeApplication_Export.h
index bf2c6d7a5cb..cae3b83c5ea 100644
--- a/DAnCE/dance/NodeApplication/NodeApplication_Export.h
+++ b/DAnCE/dance/NodeApplication/NodeApplication_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl NodeApplication
// ------------------------------
diff --git a/DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp b/DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp
index cbc2c3996d9..d0782d973a3 100644
--- a/DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp
+++ b/DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "NodeApplication_Impl.h"
#include "ace/OS_Memory.h"
diff --git a/DAnCE/dance/NodeApplicationManager/NodeApplicationManager.mpc b/DAnCE/dance/NodeApplicationManager/NodeApplicationManager.mpc
index 56f27881cde..907ba156020 100644
--- a/DAnCE/dance/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/DAnCE/dance/NodeApplicationManager/NodeApplicationManager.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (DAnCE_NodeApplicationManager) : install, dance_lib, naming, \
dance_nodeapplicationmanager_skel,dynamicinterface, \
dance_nodeapplication, dance_stub, avoids_ace_for_tao {
diff --git a/DAnCE/dance/NodeApplicationManager/NodeApplicationManager_Export.h b/DAnCE/dance/NodeApplicationManager/NodeApplicationManager_Export.h
index b86e93b49ab..7e77929daca 100644
--- a/DAnCE/dance/NodeApplicationManager/NodeApplicationManager_Export.h
+++ b/DAnCE/dance/NodeApplicationManager/NodeApplicationManager_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl NodeApplicationManager
// ------------------------------
diff --git a/DAnCE/dance/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/DAnCE/dance/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index fff358447ba..e162b1abf8b 100644
--- a/DAnCE/dance/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/DAnCE/dance/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/iosfwd.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/dance/NodeManager/NodeManager.mpc b/DAnCE/dance/NodeManager/NodeManager.mpc
index 9ee95aafc5e..6e5c9f83c04 100644
--- a/DAnCE/dance/NodeManager/NodeManager.mpc
+++ b/DAnCE/dance/NodeManager/NodeManager.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Node_Manager_Exec) : install, utils, dance_exe, naming, avoids_ace_for_tao, \
dance_nodeapplicationmanager, dance_nodemanager_skel, dance_skel, \
dance_artifact_installation, dance_installation_repository_manager, \
diff --git a/DAnCE/dance/NodeManager/NodeManager_Impl.cpp b/DAnCE/dance/NodeManager/NodeManager_Impl.cpp
index 961d75c6813..d32976c8c31 100644
--- a/DAnCE/dance/NodeManager/NodeManager_Impl.cpp
+++ b/DAnCE/dance/NodeManager/NodeManager_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NodeManager_Impl.h"
#include "ace/iosfwd.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/dance/NodeManager/Node_Manager.cpp b/DAnCE/dance/NodeManager/Node_Manager.cpp
index 296045ba286..eab3937851c 100644
--- a/DAnCE/dance/NodeManager/Node_Manager.cpp
+++ b/DAnCE/dance/NodeManager/Node_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Dynamic_Service.h"
#include "tao/ORB.h"
#include "tao/Object.h"
diff --git a/DAnCE/dance/NodeManager/Node_Manager_Module.cpp b/DAnCE/dance/NodeManager/Node_Manager_Module.cpp
index 043fe0646aa..6b0d280c519 100644
--- a/DAnCE/dance/NodeManager/Node_Manager_Module.cpp
+++ b/DAnCE/dance/NodeManager/Node_Manager_Module.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Env_Value_T.h"
diff --git a/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.cpp b/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.cpp
index 57055e49ceb..02d516018dd 100644
--- a/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.cpp
+++ b/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/Object.h"
#include "tao/Utils/ORB_Destroyer.h"
diff --git a/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.idl b/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.idl
index 5658dc08feb..0817cdbd77a 100644
--- a/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.idl
+++ b/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file PL_Daemon.idl
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.mpc b/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.mpc
index db8db838284..b82da19607c 100644
--- a/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.mpc
+++ b/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (DAnCE_PL_Daemon_idl) : install, dancelib_with_idl, dance_output, gen_ostream, \
valuetype, dance_deployment_stub {
custom_only = 1
diff --git a/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon_Impl.cpp b/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon_Impl.cpp
index b2087b7d919..96b57022196 100644
--- a/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon_Impl.cpp
+++ b/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// TAO_IDL - Generated from
// be/be_codegen.cpp:1756
diff --git a/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon_Impl.h b/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon_Impl.h
index 33f4da8089c..7a40dedac7b 100644
--- a/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon_Impl.h
+++ b/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon_Impl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// TAO_IDL - Generated from
// be/be_codegen.cpp:1698
diff --git a/DAnCE/dance/Plan_Launcher/EM_Launcher.cpp b/DAnCE/dance/Plan_Launcher/EM_Launcher.cpp
index 1af0d78880c..64861fc518a 100644
--- a/DAnCE/dance/Plan_Launcher/EM_Launcher.cpp
+++ b/DAnCE/dance/Plan_Launcher/EM_Launcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EM_Launcher.h"
namespace DAnCE
diff --git a/DAnCE/dance/Plan_Launcher/LM_Launcher.cpp b/DAnCE/dance/Plan_Launcher/LM_Launcher.cpp
index dce9f3a88be..454c269eae3 100644
--- a/DAnCE/dance/Plan_Launcher/LM_Launcher.cpp
+++ b/DAnCE/dance/Plan_Launcher/LM_Launcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LM_Launcher.h"
namespace DAnCE
diff --git a/DAnCE/dance/Plan_Launcher/NM_Launcher.cpp b/DAnCE/dance/Plan_Launcher/NM_Launcher.cpp
index 05515a3e049..80311d44698 100644
--- a/DAnCE/dance/Plan_Launcher/NM_Launcher.cpp
+++ b/DAnCE/dance/Plan_Launcher/NM_Launcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NM_Launcher.h"
namespace DAnCE
diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp b/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp
index 13a062b66ff..a7fd94b8cda 100644
--- a/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp
+++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_sys_time.h"
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_stdlib.h"
diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc b/DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc
index 9763dc7403d..7fdc53a1ba2 100644
--- a/DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc
+++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(DAnCE_Plan_Launcher_Impl) : install_lib, dance_lib, dance_logger, dance_convert_plan, \
dance_executionmanager_stub, \
dance_domainapplication_stub, \
diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp
index 8e24e856421..6f137bd8679 100644
--- a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp
+++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PLAN_LAUNCHER_BASE_IMPL_CPP
#define PLAN_LAUNCHER_BASE_IMPL_CPP
diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Export.h b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Export.h
index cd7e61e27c2..4bab4dc7136 100644
--- a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Export.h
+++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl DAnCE_Plan_Launcher
// ------------------------------
diff --git a/DAnCE/dance/RepositoryManager/PC_Updater.cpp b/DAnCE/dance/RepositoryManager/PC_Updater.cpp
index 36aaeedd686..ad4919b24a8 100644
--- a/DAnCE/dance/RepositoryManager/PC_Updater.cpp
+++ b/DAnCE/dance/RepositoryManager/PC_Updater.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dance/Logger/Log_Macros.h"
#include "dance/Deployment/Deployment_DataC.h"
#include "PC_Updater.h"
diff --git a/DAnCE/dance/RepositoryManager/PC_Updater_T.cpp b/DAnCE/dance/RepositoryManager/PC_Updater_T.cpp
index a5f5ec5fb2e..8f995de61f4 100644
--- a/DAnCE/dance/RepositoryManager/PC_Updater_T.cpp
+++ b/DAnCE/dance/RepositoryManager/PC_Updater_T.cpp
@@ -1,4 +1,3 @@
-// $Id$
#ifndef PC_UPDATER_T_C
#define PC_UPDATER_T_C
#include "PC_Updater.h"
diff --git a/DAnCE/dance/RepositoryManager/RM_Helper.cpp b/DAnCE/dance/RepositoryManager/RM_Helper.cpp
index 85ecfb7ee6a..2f7eee33cff 100644
--- a/DAnCE/dance/RepositoryManager/RM_Helper.cpp
+++ b/DAnCE/dance/RepositoryManager/RM_Helper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RM_Helper.h"
#include "ace/Auto_Ptr.h" //for Auto_Ptr
#include "ace/OS_NS_fcntl.h" //for open
diff --git a/DAnCE/dance/RepositoryManager/RepositoryManager.mpc b/DAnCE/dance/RepositoryManager/RepositoryManager.mpc
index 0128ce95579..e5e2cf72c5e 100644
--- a/DAnCE/dance/RepositoryManager/RepositoryManager.mpc
+++ b/DAnCE/dance/RepositoryManager/RepositoryManager.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (DAnCE_RepositoryManagerDaemon_IDL) : install, danceidldefaults {
custom_only = 1
IDL_Files {
diff --git a/DAnCE/dance/RepositoryManager/RepositoryManagerDaemon.idl b/DAnCE/dance/RepositoryManager/RepositoryManagerDaemon.idl
index 27863059bbd..0e820330a21 100644
--- a/DAnCE/dance/RepositoryManager/RepositoryManagerDaemon.idl
+++ b/DAnCE/dance/RepositoryManager/RepositoryManagerDaemon.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dance/Deployment/Deployment_RepositoryManager.idl"
module CIAO
diff --git a/DAnCE/dance/RepositoryManager/RepositoryManager_Impl.cpp b/DAnCE/dance/RepositoryManager/RepositoryManager_Impl.cpp
index 1f903106055..7116f099e44 100644
--- a/DAnCE/dance/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/DAnCE/dance/RepositoryManager/RepositoryManager_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//====================================================================
/**
* @file RepositoryManager_Impl.cpp
diff --git a/DAnCE/dance/RepositoryManager/Repository_Manager.cpp b/DAnCE/dance/RepositoryManager/Repository_Manager.cpp
index 74b9da6e69d..974b980b19c 100644
--- a/DAnCE/dance/RepositoryManager/Repository_Manager.cpp
+++ b/DAnCE/dance/RepositoryManager/Repository_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Dynamic_Service.h"
#include "tao/ORB.h"
#include "tao/Object.h"
diff --git a/DAnCE/dance/RepositoryManager/Repository_Manager_Module.cpp b/DAnCE/dance/RepositoryManager/Repository_Manager_Module.cpp
index e0822e2f97c..f30a9948aec 100644
--- a/DAnCE/dance/RepositoryManager/Repository_Manager_Module.cpp
+++ b/DAnCE/dance/RepositoryManager/Repository_Manager_Module.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Repository_Manager_Module.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/DAnCE/dance/RepositoryManager/URL_Parser.cpp b/DAnCE/dance/RepositoryManager/URL_Parser.cpp
index 78eab1e43ae..45231335298 100644
--- a/DAnCE/dance/RepositoryManager/URL_Parser.cpp
+++ b/DAnCE/dance/RepositoryManager/URL_Parser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/ARGV.h"
#include "URL_Parser.h"
diff --git a/DAnCE/dance/RepositoryManager/repository_manager_admin.cpp b/DAnCE/dance/RepositoryManager/repository_manager_admin.cpp
index 99f2732c7a4..754880c7240 100644
--- a/DAnCE/dance/RepositoryManager/repository_manager_admin.cpp
+++ b/DAnCE/dance/RepositoryManager/repository_manager_admin.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "repository_manager_admin.h"
#include "dance/Logger/Log_Macros.h"
#include "RepositoryManagerDaemonC.h"
diff --git a/DAnCE/dance/RepositoryManager/repository_manager_admin.h b/DAnCE/dance/RepositoryManager/repository_manager_admin.h
index 84bc78890f2..05dbf7c7fca 100644
--- a/DAnCE/dance/RepositoryManager/repository_manager_admin.h
+++ b/DAnCE/dance/RepositoryManager/repository_manager_admin.h
@@ -1,6 +1,4 @@
-// $Id$
-
/**
* @file repository_manager_admin.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>?
diff --git a/DAnCE/dance/RepositoryManager/repository_manager_admin_exec.cpp b/DAnCE/dance/RepositoryManager/repository_manager_admin_exec.cpp
index dcb70eef086..4b4c4f8a0c8 100644
--- a/DAnCE/dance/RepositoryManager/repository_manager_admin_exec.cpp
+++ b/DAnCE/dance/RepositoryManager/repository_manager_admin_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file repository_manager_admin_exec.cpp
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/TargetManager/DomainDataManager.cpp b/DAnCE/dance/TargetManager/DomainDataManager.cpp
index 81cd118251f..7f525d8f5bb 100644
--- a/DAnCE/dance/TargetManager/DomainDataManager.cpp
+++ b/DAnCE/dance/TargetManager/DomainDataManager.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DomainDataManager.h"
#include "dance/Deployment/Deployment_NodeManagerC.h"
diff --git a/DAnCE/dance/TargetManager/DomainDataManager.h b/DAnCE/dance/TargetManager/DomainDataManager.h
index 8a2ec3bea22..5c18d0afb0e 100644
--- a/DAnCE/dance/TargetManager/DomainDataManager.h
+++ b/DAnCE/dance/TargetManager/DomainDataManager.h
@@ -1,4 +1,3 @@
-// $Id$
//===============================================================
/**
* @file DomainDataManager.h
diff --git a/DAnCE/dance/TargetManager/ResourceCommitmentManager.cpp b/DAnCE/dance/TargetManager/ResourceCommitmentManager.cpp
index 7caa2ab616d..ddc28817a25 100644
--- a/DAnCE/dance/TargetManager/ResourceCommitmentManager.cpp
+++ b/DAnCE/dance/TargetManager/ResourceCommitmentManager.cpp
@@ -1,4 +1,3 @@
-// $Id$
//
#include "ResourceCommitmentManager.h"
#include "DomainDataManager.h"
diff --git a/DAnCE/dance/TargetManager/ResourceCommitmentManager.h b/DAnCE/dance/TargetManager/ResourceCommitmentManager.h
index 90543dc287f..ebb91c40a86 100644
--- a/DAnCE/dance/TargetManager/ResourceCommitmentManager.h
+++ b/DAnCE/dance/TargetManager/ResourceCommitmentManager.h
@@ -1,4 +1,3 @@
-// $Id$
//
/**
* @file ResourceCommitmentManager.h
diff --git a/DAnCE/dance/TargetManager/TargetManager.mpc b/DAnCE/dance/TargetManager/TargetManager.mpc
index 0b463a07526..9577c83eb73 100644
--- a/DAnCE/dance/TargetManager/TargetManager.mpc
+++ b/DAnCE/dance/TargetManager/TargetManager.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DAnCE_TargetManager_Exec) : install, iortable, utils, naming, dance_logger, \
dance_nodemanager_stub, dance_nodemanager_skel, dance_exe, \
dance_config_handlers, dance_targetmanager_skel {
diff --git a/DAnCE/dance/TargetManager/Target_Manager.cpp b/DAnCE/dance/TargetManager/Target_Manager.cpp
index b4ccca4ddd4..0366ee8b334 100644
--- a/DAnCE/dance/TargetManager/Target_Manager.cpp
+++ b/DAnCE/dance/TargetManager/Target_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Dynamic_Service.h"
#include "tao/ORB.h"
#include "tao/Object.h"
diff --git a/DAnCE/dance/TargetManager/Target_Manager_Module.cpp b/DAnCE/dance/TargetManager/Target_Manager_Module.cpp
index 2c8593b51b1..f3412a162f7 100644
--- a/DAnCE/dance/TargetManager/Target_Manager_Module.cpp
+++ b/DAnCE/dance/TargetManager/Target_Manager_Module.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Target_Manager_Module.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/DAnCE/dance/Version.h b/DAnCE/dance/Version.h
index a6637cf87ac..39972e6e87c 100644
--- a/DAnCE/dance/Version.h
+++ b/DAnCE/dance/Version.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// This is file was automatically generated by \$ACE_ROOT/bin/make_release.py
#define DAnCE_MAJOR_VERSION 1
diff --git a/DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp b/DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp
index ded7d07bff3..8f9de9e6e80 100644
--- a/DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp
+++ b/DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include <iostream>
#include "Deployment.hpp"
diff --git a/DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc b/DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc
index f0e282b129d..3c8d6d40b81 100644
--- a/DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc
+++ b/DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (XSC_DynAny_Test) : dance_config_handlers, ifr_client, danceidldefaults {
requires += dummy_label
exename = test
diff --git a/DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc
index 323338fe6f6..89756a00ae4 100644
--- a/DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+++ b/DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Package_Config_Handlers_Tests) : dance_deployment_stub, dance_config_handlers, ifr_client {
exename = test
macros += XML_USE_PTHREADS
diff --git a/DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp b/DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp
index a9a2ffc636b..9b9733764ca 100644
--- a/DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp
+++ b/DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include <iostream>
#include "Deployment.hpp"
diff --git a/DAnCE/tests/Config_Handlers/test.cpp b/DAnCE/tests/Config_Handlers/test.cpp
index 4cf54852e96..7e9ff0b0150 100644
--- a/DAnCE/tests/Config_Handlers/test.cpp
+++ b/DAnCE/tests/Config_Handlers/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include <iostream>
#include "Deployment.hpp"
diff --git a/DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc b/DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc
index 95cdde56b96..620c72afefa 100644
--- a/DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc
+++ b/DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc
@@ -1,4 +1,3 @@
-// $Id$
project : dance, taoexe, xerces, dance_config_handlers, dance_logger {
exename = DeploymentPlanDump
diff --git a/DAnCE/tests/DeploymentPlanDump/test.cpp b/DAnCE/tests/DeploymentPlanDump/test.cpp
index 6494225de35..d42f4c9fa42 100644
--- a/DAnCE/tests/DeploymentPlanDump/test.cpp
+++ b/DAnCE/tests/DeploymentPlanDump/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tools/Config_Handlers/DnC_Dump.h"
#include "tools/Config_Handlers/XML_File_Intf.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc b/DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc
index dbd8a175592..81a3634479c 100644
--- a/DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc
+++ b/DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc
@@ -1,4 +1,3 @@
-// $Id$
project : dance, taolib, xerces, dance_config_handlers, dance_logger {
exename = DeploymentPlanTestReferences
diff --git a/DAnCE/tests/DeploymentPlanTestReferences/test.cpp b/DAnCE/tests/DeploymentPlanTestReferences/test.cpp
index 2af41453894..aa4d276b378 100644
--- a/DAnCE/tests/DeploymentPlanTestReferences/test.cpp
+++ b/DAnCE/tests/DeploymentPlanTestReferences/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Auto_Ptr.h"
#include "tools/Config_Handlers/DnC_Dump.h"
#include "tools/Config_Handlers/XML_File_Intf.h"
diff --git a/DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc b/DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc
index 5c4422714db..b3d1f06837a 100644
--- a/DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc
+++ b/DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc
@@ -1,4 +1,3 @@
-// $Id$
project : dance, xerces, dance_config_handlers, dance_logger, dance_domainapplication_stub, dance_executionmanager_stub {
exename = DeploymentTest1
diff --git a/DAnCE/tests/DeploymentTest1/test.cpp b/DAnCE/tests/DeploymentTest1/test.cpp
index 5b340295ec3..e3bda0c4f87 100644
--- a/DAnCE/tests/DeploymentTest1/test.cpp
+++ b/DAnCE/tests/DeploymentTest1/test.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ace/Auto_Ptr.h"
#include "dance/Deployment/Deployment_DeploymentPlanC.h"
#include "dance/Deployment/Deployment_ExecutionManagerC.h"
diff --git a/DAnCE/tests/LocalityManager/CircularDependency/CircularDependency.mpc b/DAnCE/tests/LocalityManager/CircularDependency/CircularDependency.mpc
index a8d03a081b7..3d0dc86bc3e 100644
--- a/DAnCE/tests/LocalityManager/CircularDependency/CircularDependency.mpc
+++ b/DAnCE/tests/LocalityManager/CircularDependency/CircularDependency.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(CircularDependency) : dance_skel, dance_lib {
libout = .
dynamicflags += CIRCULARDEPENDENCY_BUILD_DLL
diff --git a/DAnCE/tests/LocalityManager/CircularDependency/Circular_Dependency_export.h b/DAnCE/tests/LocalityManager/CircularDependency/Circular_Dependency_export.h
index 43687299f9a..59b3e080e8a 100644
--- a/DAnCE/tests/LocalityManager/CircularDependency/Circular_Dependency_export.h
+++ b/DAnCE/tests/LocalityManager/CircularDependency/Circular_Dependency_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef CIRCULARDEPENDENCY_EXPORT_H
diff --git a/DAnCE/tests/LocalityManager/CircularDependency/Handler_A.cpp b/DAnCE/tests/LocalityManager/CircularDependency/Handler_A.cpp
index 901b538e506..2a0fab76cc1 100644
--- a/DAnCE/tests/LocalityManager/CircularDependency/Handler_A.cpp
+++ b/DAnCE/tests/LocalityManager/CircularDependency/Handler_A.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// TAO_IDL - Generated from
// be/be_codegen.cpp:1560
diff --git a/DAnCE/tests/LocalityManager/CircularDependency/Handler_A.h b/DAnCE/tests/LocalityManager/CircularDependency/Handler_A.h
index bf3e9a49e0f..2d84e73be51 100644
--- a/DAnCE/tests/LocalityManager/CircularDependency/Handler_A.h
+++ b/DAnCE/tests/LocalityManager/CircularDependency/Handler_A.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Handler_A.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/tests/LocalityManager/CircularDependency/Handler_B.cpp b/DAnCE/tests/LocalityManager/CircularDependency/Handler_B.cpp
index 5dcf04a41c3..f6352ee6bcc 100644
--- a/DAnCE/tests/LocalityManager/CircularDependency/Handler_B.cpp
+++ b/DAnCE/tests/LocalityManager/CircularDependency/Handler_B.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// TAO_IDL - Generated from
// be/be_codegen.cpp:1560
diff --git a/DAnCE/tests/LocalityManager/CircularDependency/Handler_B.h b/DAnCE/tests/LocalityManager/CircularDependency/Handler_B.h
index 0b3907f16d2..bb97ce800d5 100644
--- a/DAnCE/tests/LocalityManager/CircularDependency/Handler_B.h
+++ b/DAnCE/tests/LocalityManager/CircularDependency/Handler_B.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Handler_B.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/tests/LocalityManager/ExplicitExec/ExplicitExec.mpc b/DAnCE/tests/LocalityManager/ExplicitExec/ExplicitExec.mpc
index 1eb34f63318..48c96fae81e 100644
--- a/DAnCE/tests/LocalityManager/ExplicitExec/ExplicitExec.mpc
+++ b/DAnCE/tests/LocalityManager/ExplicitExec/ExplicitExec.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DAnCE_LocalityManager_ExplicitExec) : \
dance_locality_manager, dance_logger {
exename = explicit_exec
diff --git a/DAnCE/tests/NameServiceTest/Dummy.idl b/DAnCE/tests/NameServiceTest/Dummy.idl
index 1f0edee59cd..2f667c5fede 100644
--- a/DAnCE/tests/NameServiceTest/Dummy.idl
+++ b/DAnCE/tests/NameServiceTest/Dummy.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DUMMY_IDL
#define DUMMY_IDL
diff --git a/DAnCE/tests/NameServiceTest/DummyImpl.cpp b/DAnCE/tests/NameServiceTest/DummyImpl.cpp
index 4fe5dea9b16..7066f38cbc4 100644
--- a/DAnCE/tests/NameServiceTest/DummyImpl.cpp
+++ b/DAnCE/tests/NameServiceTest/DummyImpl.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DummyImpl.h"
namespace NameServiceTest
diff --git a/DAnCE/tests/NameServiceTest/DummyImpl.h b/DAnCE/tests/NameServiceTest/DummyImpl.h
index 7b54d8b1386..cca7e1de8f9 100644
--- a/DAnCE/tests/NameServiceTest/DummyImpl.h
+++ b/DAnCE/tests/NameServiceTest/DummyImpl.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DUMMYIMPL_H_
#define DUMMYIMPL_H_
diff --git a/DAnCE/tests/NameServiceTest/NameServiceTest.mpc b/DAnCE/tests/NameServiceTest/NameServiceTest.mpc
index a0755f351c4..1788bc60f10 100644
--- a/DAnCE/tests/NameServiceTest/NameServiceTest.mpc
+++ b/DAnCE/tests/NameServiceTest/NameServiceTest.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): danceidldefaults {
IDL_Files {
Dummy.idl
diff --git a/DAnCE/tests/NameServiceTest/RegistrationPath.h b/DAnCE/tests/NameServiceTest/RegistrationPath.h
index 4a6ea64c651..6ecf9197ad3 100644
--- a/DAnCE/tests/NameServiceTest/RegistrationPath.h
+++ b/DAnCE/tests/NameServiceTest/RegistrationPath.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef REGISTRATIONPATH_H_
#define REGISTRATIONPATH_H_
diff --git a/DAnCE/tests/NameServiceTest/clt_main.cpp b/DAnCE/tests/NameServiceTest/clt_main.cpp
index 429b9d15ba0..d1b2d38e282 100644
--- a/DAnCE/tests/NameServiceTest/clt_main.cpp
+++ b/DAnCE/tests/NameServiceTest/clt_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ace/String_Base.h"
#include <orbsvcs/CosNamingC.h>
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tests/NameServiceTest/srv_main.cpp b/DAnCE/tests/NameServiceTest/srv_main.cpp
index a6571317950..06b8dfe2444 100644
--- a/DAnCE/tests/NameServiceTest/srv_main.cpp
+++ b/DAnCE/tests/NameServiceTest/srv_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ace/OS_NS_stdio.h"
#include <orbsvcs/CosNamingC.h>
#include <orbsvcs/Naming/Naming_Loader.h>
diff --git a/DAnCE/tests/NodeApplicationManager-NodeApplication/NAM_NA.mpc b/DAnCE/tests/NodeApplicationManager-NodeApplication/NAM_NA.mpc
index e251d79392b..fba3e4308cd 100644
--- a/DAnCE/tests/NodeApplicationManager-NodeApplication/NAM_NA.mpc
+++ b/DAnCE/tests/NodeApplicationManager-NodeApplication/NAM_NA.mpc
@@ -1,4 +1,3 @@
-// $Id$
project : dance, dance_nodemanager_stub, dance_nodeapplication_stub, dance_logger {
exename = NodeApplicationManagerNodeApplicationTest
diff --git a/DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp b/DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp
index 6c1c69dad64..a3de6a3592c 100644
--- a/DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp
+++ b/DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "dance/Deployment/Deployment_NodeManagerC.h"
#include "dance/Deployment/Deployment_NodeApplicationC.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc b/DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc
index bc18cab6dd2..66186ad99c5 100644
--- a/DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc
+++ b/DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project : dance, dance_nodemanager_stub, dance_logger {
exename = NodeManagerNodeApplicationManagerTest
diff --git a/DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp b/DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp
index 2e626fea5ac..01b45eec27c 100644
--- a/DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp
+++ b/DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "dance/Deployment/Deployment_NodeManagerC.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tests/Parsing/Parsing.mpc b/DAnCE/tests/Parsing/Parsing.mpc
index 9f2c2ce521d..dd987027e67 100644
--- a/DAnCE/tests/Parsing/Parsing.mpc
+++ b/DAnCE/tests/Parsing/Parsing.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Parsing_Test) : dance, xerces, dance_config_handlers, dance_logger, dance_domainapplication_stub, dance_executionmanager_stub {
exename = Parsing
diff --git a/DAnCE/tests/Parsing/domain.cpp b/DAnCE/tests/Parsing/domain.cpp
index d454cde021b..5cdbd6564e8 100644
--- a/DAnCE/tests/Parsing/domain.cpp
+++ b/DAnCE/tests/Parsing/domain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Auto_Ptr.h"
#include "dance/Deployment/Deployment_TargetDataC.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tests/Parsing/test.cpp b/DAnCE/tests/Parsing/test.cpp
index b6b39c567d1..511530ecb8f 100644
--- a/DAnCE/tests/Parsing/test.cpp
+++ b/DAnCE/tests/Parsing/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Auto_Ptr.h"
#include "dance/Deployment/Deployment_DeploymentPlanC.h"
#include "dance/Deployment/Deployment_ExecutionManagerC.h"
diff --git a/DAnCE/tests/TargetManager/CmpClient.cpp b/DAnCE/tests/TargetManager/CmpClient.cpp
index e2d86b0292d..2d9b9ca1982 100644
--- a/DAnCE/tests/TargetManager/CmpClient.cpp
+++ b/DAnCE/tests/TargetManager/CmpClient.cpp
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file CmpClient.cpp
*
diff --git a/DAnCE/tests/TargetManager/TM_Client.mpc b/DAnCE/tests/TargetManager/TM_Client.mpc
index 7d60906dfc8..78572146688 100644
--- a/DAnCE/tests/TargetManager/TM_Client.mpc
+++ b/DAnCE/tests/TargetManager/TM_Client.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
// Client.mpc,v 1.6 2005/02/18 09:07:06 jwillemsen Exp
project(TMClient): dance_deployment_stub, dance_targetmanager_stub, dance_config_handlers {
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc b/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc
index 3e940e70c39..37267a6ef34 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (DAnCE_Artifact_Installation_IDL) : install, danceidldefaults {
custom_only = 1
IDL_Files {
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp
index 8bc15c3e468..a18b9edd71d 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Artifact_Installation_Handler_Svc.h"
#include "Artifact_Installation_Impl.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.h b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.h
index 87603c56f18..3b07d366a57 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.h
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Artifact_Installation_Handler_Svc.h
*
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_export.h b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_export.h
index 11343bf3358..f8692e1abf8 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_export.h
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef ARTIFACT_INSTALLATION_HANDLER_EXPORT_H
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp
index a5b6eb21bcc..b7e72723dec 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Artifact_Installation_Impl.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h
index 6e78ceb6023..659bf4186da 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Artifact_Installation_Impl.h
*
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp b/DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp
index 11c0804ad27..2a10af65fa3 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Dynamic_Service.h"
#include "ace/Get_Opt.h"
#include "ace/Auto_Ptr.h"
diff --git a/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.cpp b/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.cpp
index e6a2f50cd51..63b5a1f2d3a 100644
--- a/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.cpp
+++ b/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DAnCE_Artifact_Installation_Handler.h"
#if !defined (__ACE_INLINE__)
diff --git a/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.h b/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.h
index 57f075e5708..41aeb188a2c 100644
--- a/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.h
+++ b/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file DAnCE_Artifact_Installation_Handler.h
*
diff --git a/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl b/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl
index ec03afc241a..f6a25962ef4 100644
--- a/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl
+++ b/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DANCE_ARTIFACT_INSTALLATION_HANDLER_IDL
#define DANCE_ARTIFACT_INSTALLATION_HANDLER_IDL
diff --git a/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_export.h b/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_export.h
index cc8f1e2790c..b63f96e05bf 100644
--- a/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_export.h
+++ b/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef DANCE_ARTIFACT_INSTALLATION_EXPORT_H
diff --git a/DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp b/DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp
index 7eb97d66379..3f2de0bca57 100644
--- a/DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp
+++ b/DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "File_Installation_Handler.h"
#include "Installation_Repository_Manager.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Artifact_Installation/File_Installation_Handler.h b/DAnCE/tools/Artifact_Installation/File_Installation_Handler.h
index e7e2fe89025..697b3eac1df 100644
--- a/DAnCE/tools/Artifact_Installation/File_Installation_Handler.h
+++ b/DAnCE/tools/Artifact_Installation/File_Installation_Handler.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file File_Installation_Handler.h
*
diff --git a/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp b/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp
index d8d9cbbbf28..cc06b5548d2 100644
--- a/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp
+++ b/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Http_Installation_Handler.h"
#include "Installation_Repository_Manager.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.h b/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.h
index 74a4683b8e5..80496334795 100644
--- a/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.h
+++ b/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Http_Installation_Handler.h
*
diff --git a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp
index 0d93cc424af..48fb8e4a602 100644
--- a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp
+++ b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Installation_Repository_Manager.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.h b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.h
index d3cf8f577d9..8321b368a85 100644
--- a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.h
+++ b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Installation_Repository_Manager.h
*
diff --git a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp
index c83aa7e5770..cb2b344f343 100644
--- a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp
+++ b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Installation_Repository_Manager_Impl.h"
#include "dance/Logger/Log_Macros.h"
#include "ace/Service_Config.h"
diff --git a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.h b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.h
index 3795e4f3b73..bfab6b3d184 100644
--- a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.h
+++ b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Installation_Repository_Manager_Impl.h
*
diff --git a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_export.h b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_export.h
index db6946e96c0..3ae8e8074c9 100644
--- a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_export.h
+++ b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef INSTALLATION_REPOSITORY_MANAGER_EXPORT_H
diff --git a/DAnCE/tools/Config_Handlers/ADD_Handler.cpp b/DAnCE/tools/Config_Handlers/ADD_Handler.cpp
index a9cc9c3e8d8..6531da69191 100644
--- a/DAnCE/tools/Config_Handlers/ADD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/ADD_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ADD_Handler.h"
#include "cdp.hpp"
#include "dance/Deployment/Deployment_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/Any_Handler.cpp b/DAnCE/tools/Config_Handlers/Any_Handler.cpp
index 1b6ad2d6ca8..344b984f0e4 100644
--- a/DAnCE/tools/Config_Handlers/Any_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Any_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include /**/ "ace/pre.h"
#include "Any_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/CCD_Handler.cpp b/DAnCE/tools/Config_Handlers/CCD_Handler.cpp
index 2566b0d12c6..e1833b1ee41 100644
--- a/DAnCE/tools/Config_Handlers/CCD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/CCD_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Config_Handlers/CEPE_Handler.cpp b/DAnCE/tools/Config_Handlers/CEPE_Handler.cpp
index 581a2052044..90bd4975d19 100644
--- a/DAnCE/tools/Config_Handlers/CEPE_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/CEPE_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "CEPE_Handler.h"
#include "Basic_Deployment_Data.hpp"
#include "dance/Deployment/Deployment_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/CPD_Handler.cpp b/DAnCE/tools/Config_Handlers/CPD_Handler.cpp
index 1507fe102e4..7c2c95d0c81 100644
--- a/DAnCE/tools/Config_Handlers/CPD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/CPD_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "CPD_Handler.h"
#include "Basic_Deployment_Data.hpp"
#include "dance/Deployment/Deployment_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/CRDD_Handler.cpp b/DAnCE/tools/Config_Handlers/CRDD_Handler.cpp
index 1be516142f1..350f48d1ab2 100644
--- a/DAnCE/tools/Config_Handlers/CRDD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/CRDD_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "CRDD_Handler.h"
#include "Any_Handler.h"
#include "Basic_Deployment_Data.hpp"
diff --git a/DAnCE/tools/Config_Handlers/Common.h b/DAnCE/tools/Config_Handlers/Common.h
index ce359aeb81e..ca5e91ac9fe 100644
--- a/DAnCE/tools/Config_Handlers/Common.h
+++ b/DAnCE/tools/Config_Handlers/Common.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Common.h
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/tools/Config_Handlers/Config_Handlers_Common_Export.h b/DAnCE/tools/Config_Handlers/Config_Handlers_Common_Export.h
index f1583c7e71d..64cb487f0d3 100644
--- a/DAnCE/tools/Config_Handlers/Config_Handlers_Common_Export.h
+++ b/DAnCE/tools/Config_Handlers/Config_Handlers_Common_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s Config_Handlers_Common
// ------------------------------
diff --git a/DAnCE/tools/Config_Handlers/Config_Handlers_Export.h b/DAnCE/tools/Config_Handlers/Config_Handlers_Export.h
index 64dec8bdfa5..0f46f61fc94 100644
--- a/DAnCE/tools/Config_Handlers/Config_Handlers_Export.h
+++ b/DAnCE/tools/Config_Handlers/Config_Handlers_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s Config_Handlers
// ------------------------------
diff --git a/DAnCE/tools/Config_Handlers/DD_Handler.cpp b/DAnCE/tools/Config_Handlers/DD_Handler.cpp
index 58fed334e33..dd98e61a200 100644
--- a/DAnCE/tools/Config_Handlers/DD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DD_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/XML_Utils/XML_Typedefs.h"
#include "SatisfierProperty_Handler.h"
#include "DD_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/DD_Handler.h b/DAnCE/tools/Config_Handlers/DD_Handler.h
index d234531d749..d75df748fc2 100644
--- a/DAnCE/tools/Config_Handlers/DD_Handler.h
+++ b/DAnCE/tools/Config_Handlers/DD_Handler.h
@@ -1,4 +1,3 @@
-// $Id$
//======================================
/**
* @file DD_Handler.h
diff --git a/DAnCE/tools/Config_Handlers/DP_Handler.cpp b/DAnCE/tools/Config_Handlers/DP_Handler.cpp
index bfc6cb58418..92612198ba1 100644
--- a/DAnCE/tools/Config_Handlers/DP_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DP_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DP_Handler.h"
#include "ace/UUID.h"
#include "dance/Deployment/Deployment_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/DP_PCD_Handler.cpp b/DAnCE/tools/Config_Handlers/DP_PCD_Handler.cpp
index 1ee39b924b0..60f1861995d 100644
--- a/DAnCE/tools/Config_Handlers/DP_PCD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DP_PCD_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DP_PCD_Handler.h"
#include "CEPE_Handler.h"
#include "PSPE_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/DnC_Dump.cpp b/DAnCE/tools/Config_Handlers/DnC_Dump.cpp
index 32026c4d8c8..79d4413d813 100644
--- a/DAnCE/tools/Config_Handlers/DnC_Dump.cpp
+++ b/DAnCE/tools/Config_Handlers/DnC_Dump.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "tao/SystemException.h"
#include "dance/Deployment/Deployment_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/DnC_Dump_T.cpp b/DAnCE/tools/Config_Handlers/DnC_Dump_T.cpp
index 085a13c4c51..fdbb7594879 100644
--- a/DAnCE/tools/Config_Handlers/DnC_Dump_T.cpp
+++ b/DAnCE/tools/Config_Handlers/DnC_Dump_T.cpp
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DNC_DUMP_T_C
#define DNC_DUMP_T_C
diff --git a/DAnCE/tools/Config_Handlers/Dump_Obj.cpp b/DAnCE/tools/Config_Handlers/Dump_Obj.cpp
index 6e4319f8248..f33ce9c4913 100644
--- a/DAnCE/tools/Config_Handlers/Dump_Obj.cpp
+++ b/DAnCE/tools/Config_Handlers/Dump_Obj.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Dump_Obj.h"
#include "ace/Log_Msg.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp
index 8d21150145f..6a787098f14 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DynAlias_Handler.h"
#include "DynAny_Handler.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
index 98b95d9eefe..009ffcd82b9 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include /**/ "ace/pre.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc
index e6fa5186031..c46b0171322 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (XSC_DynAny_Handler) : install, xerces, dynamicany, typecodefactory, dance_deployment_stub, \
dance_config_handlers_base, dance_lib, dance, ifr_client {
after += XSC_XML_Handlers
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h
index 78a3ee57b77..ae164963aaf 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl DynAny_Handler
// ------------------------------
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp
index e5b01c6af81..23af73c1f5a 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DynArray_Handler.h"
#include "DynAny_Handler.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
index e9729a7828e..016bc4571ce 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DynEnum_Handler.h"
#include "DynAny_Handler.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp
index ef18ab43ea2..dfe486ffe39 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DynSequence_Handler.h"
#include "DynAny_Handler.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynString_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynString_Handler.cpp
index 31152506039..57d14ef4395 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynString_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynString_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DynString_Handler.h"
#include "DynAny_Handler.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp
index 8250b125880..5f92f94f67b 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DynStruct_Handler.h"
#include "DynAny_Handler.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Config_Handlers/ERE_Handler.cpp b/DAnCE/tools/Config_Handlers/ERE_Handler.cpp
index d92a3bade4d..e187304fc7f 100644
--- a/DAnCE/tools/Config_Handlers/ERE_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/ERE_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ERE_Handler.h"
#include "Basic_Deployment_Data.hpp"
#include "dance/Deployment/Deployment_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/ESD_Handler.cpp b/DAnCE/tools/Config_Handlers/ESD_Handler.cpp
index 66031020197..d5673abc444 100644
--- a/DAnCE/tools/Config_Handlers/ESD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/ESD_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ESD_Handler.h"
#include "Basic_Deployment_Data.hpp"
#include "dance/Deployment/Deployment_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/IDD_Handler.cpp b/DAnCE/tools/Config_Handlers/IDD_Handler.cpp
index 268643e80af..227c1313e08 100644
--- a/DAnCE/tools/Config_Handlers/IDD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/IDD_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/UUID.h"
#include "IDD_Handler.h"
#include "IRDD_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/IDREF_Base.cpp b/DAnCE/tools/Config_Handlers/IDREF_Base.cpp
index b6ee0c61478..ee923b99e2e 100644
--- a/DAnCE/tools/Config_Handlers/IDREF_Base.cpp
+++ b/DAnCE/tools/Config_Handlers/IDREF_Base.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef IDREF_BASE_CPP
#define IDREF_BASE_CPP
diff --git a/DAnCE/tools/Config_Handlers/ID_Handler.cpp b/DAnCE/tools/Config_Handlers/ID_Handler.cpp
index 3a6f11afa07..54afcc9a347 100644
--- a/DAnCE/tools/Config_Handlers/ID_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/ID_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ID_Handler.h"
#include "Basic_Deployment_Data.hpp"
#include "dance/Deployment/Deployment_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/IRDD_Handler.cpp b/DAnCE/tools/Config_Handlers/IRDD_Handler.cpp
index 4ea0b03d435..1248bb0ef1a 100644
--- a/DAnCE/tools/Config_Handlers/IRDD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/IRDD_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "IRDD_Handler.h"
#include "Basic_Deployment_Data.hpp"
#include "dance/Deployment/Deployment_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/MDD_Handler.cpp b/DAnCE/tools/Config_Handlers/MDD_Handler.cpp
index 8c6d4134fb7..bf53e46f909 100644
--- a/DAnCE/tools/Config_Handlers/MDD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/MDD_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MDD_Handler.h"
#include "Basic_Deployment_Data.hpp"
#include "dance/Deployment/Deployment_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/PCD_Handler.cpp b/DAnCE/tools/Config_Handlers/PCD_Handler.cpp
index ec9d57c9326..64a269a8ce5 100644
--- a/DAnCE/tools/Config_Handlers/PCD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/PCD_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PCD_Handler.h"
#include "Req_Handler.h"
#include "CEPE_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/PL_Handler.cpp b/DAnCE/tools/Config_Handlers/PL_Handler.cpp
index d77769d5b17..c5a42859e34 100644
--- a/DAnCE/tools/Config_Handlers/PL_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/PL_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PL_Handler.h"
#include "IDD_Handler.h"
#include "Basic_Deployment_Data.hpp"
diff --git a/DAnCE/tools/Config_Handlers/PL_Handler.h b/DAnCE/tools/Config_Handlers/PL_Handler.h
index 83e642573b8..3bd2375905e 100644
--- a/DAnCE/tools/Config_Handlers/PL_Handler.h
+++ b/DAnCE/tools/Config_Handlers/PL_Handler.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file PL_Handler.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
@@ -21,9 +19,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
namespace Deployment
-{// $Id$
-
- struct PlanLocality;
+{ struct PlanLocality;
class PlanLocalities;
}
diff --git a/DAnCE/tools/Config_Handlers/PSPE_Handler.cpp b/DAnCE/tools/Config_Handlers/PSPE_Handler.cpp
index 30d5cd6ef60..c9e449f758b 100644
--- a/DAnCE/tools/Config_Handlers/PSPE_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/PSPE_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PSPE_Handler.h"
#include "IDD_Handler.h"
#include "Basic_Deployment_Data.hpp"
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
index fcea69fd1be..eda5f8b6fea 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/AnyTypeCode/TypeCode.h"
#include "Package_Handlers/CAD_Handler.h"
#include "Basic_Deployment_Data.hpp"
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
index ea4830b3e23..5dabd86853e 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
#include "Package_Handlers/CID_Handler.h"
#include "Package_Handlers/CPD_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
index 285d1e0fda1..ae9b64afdc0 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
#include "Package_Handlers/CPD_Handler.h"
#include "Package_Handlers/CID_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
index d14cb3d07fc..b8914f9f8cc 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/AnyTypeCode/TypeCode.h"
#include "Comp_Intf_Descr_Handler.h"
#include "ace/XML_Utils/XML_Typedefs.h"
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
index 6d164422387..b2b960c7c88 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Package_Handlers/IAD_Handler.h"
#include "Package_Handlers/NIA_Handler.h"
#include "Basic_Deployment_Data.hpp"
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
index 2f1f4db4f27..7f98d31fbc0 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
#include "dance/Logger/Log_Macros.h"
#include "dance/Deployment/Deployment_Packaging_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
index fb22cdd1535..4640a03e7c3 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "STD_PC_Intf.h"
#include "Utils/XML_Helper.h"
#include "Deployment.hpp"
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/DAnCE/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
index 40e41d6b41f..e9bb2c2d93d 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Package_Config_Handlers) : install, acelib, dance_deployment_stub, dance_config_handlers_base, dance, typecodefactory, dance_output, ace_xml_utils {
sharedname = Package_Config_Handlers
dynamicflags += PACKAGING_HANDLERS_BUILD_DLL
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h b/DAnCE/tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h
index 86193a1a664..2a97d11233f 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl Packaging_Handlers
// ------------------------------
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
index 3d7711a18ee..9d2b0b8aede 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
#include "Package_Handlers/SID_Handler.h"
#include "cid.hpp"
diff --git a/DAnCE/tools/Config_Handlers/RDD_Handler.cpp b/DAnCE/tools/Config_Handlers/RDD_Handler.cpp
index 03a9c7165e1..397b4e1751c 100644
--- a/DAnCE/tools/Config_Handlers/RDD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/RDD_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RDD_Handler.h"
#include "Basic_Deployment_Data.hpp"
#include "dance/Deployment/Deployment_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/Req_Handler.cpp b/DAnCE/tools/Config_Handlers/Req_Handler.cpp
index f6f23763b02..ef647fb03be 100644
--- a/DAnCE/tools/Config_Handlers/Req_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Req_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Req_Handler.h"
#include "Property_Handler.h"
#include "dance/Deployment/Deployment_BaseC.h"
diff --git a/DAnCE/tools/Config_Handlers/STD_CID_Handler.cpp b/DAnCE/tools/Config_Handlers/STD_CID_Handler.cpp
index 01566e0b913..707f9a597b6 100644
--- a/DAnCE/tools/Config_Handlers/STD_CID_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/STD_CID_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "STD_CID_Handler.h"
#include "STD_CPD_Handler.h"
#include "STD_IAD_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/STD_CPD_Handler.cpp b/DAnCE/tools/Config_Handlers/STD_CPD_Handler.cpp
index 53ed48038f3..587029c8948 100644
--- a/DAnCE/tools/Config_Handlers/STD_CPD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/STD_CPD_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "STD_CPD_Handler.h"
#include "STD_CID_Handler.h"
#include "Basic_Deployment_Data.hpp"
diff --git a/DAnCE/tools/Config_Handlers/STD_IAD_Handler.cpp b/DAnCE/tools/Config_Handlers/STD_IAD_Handler.cpp
index 0485652e764..143f4a86430 100644
--- a/DAnCE/tools/Config_Handlers/STD_IAD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/STD_IAD_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "STD_IAD_Handler.h"
#include "Basic_Deployment_Data.hpp"
#include "ciao/Packaging_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/STD_PCD_Handler.cpp b/DAnCE/tools/Config_Handlers/STD_PCD_Handler.cpp
index 926632a0b78..ae8b94908cd 100644
--- a/DAnCE/tools/Config_Handlers/STD_PCD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/STD_PCD_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "STD_PCD_Handler.h"
#include "STD_CPD_Handler.h"
#include "Basic_Deployment_Data.hpp"
diff --git a/DAnCE/tools/Config_Handlers/STD_PC_Intf.cpp b/DAnCE/tools/Config_Handlers/STD_PC_Intf.cpp
index 9853bbeb2f8..5a5dd073a5f 100644
--- a/DAnCE/tools/Config_Handlers/STD_PC_Intf.cpp
+++ b/DAnCE/tools/Config_Handlers/STD_PC_Intf.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "STD_PC_Intf.h"
#include "Utils/XML_Typedefs.h"
#include "Deployment.hpp"
diff --git a/DAnCE/tools/Config_Handlers/Utils/Exceptions.h b/DAnCE/tools/Config_Handlers/Utils/Exceptions.h
index 90bbdeea048..1dfe8de59f2 100644
--- a/DAnCE/tools/Config_Handlers/Utils/Exceptions.h
+++ b/DAnCE/tools/Config_Handlers/Utils/Exceptions.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Exceptions.h
* @author William Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp b/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp
index 2fd41f856ea..ea6e1ee195b 100644
--- a/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp
+++ b/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "XML_File_Intf.h"
#include "ace/XML_Utils/XML_Typedefs.h"
#include "Deployment.hpp"
diff --git a/DAnCE/tools/Config_Handlers/XSC_XML_Handlers_Export.h b/DAnCE/tools/Config_Handlers/XSC_XML_Handlers_Export.h
index 82272eb6c05..f674c23d9b3 100644
--- a/DAnCE/tools/Config_Handlers/XSC_XML_Handlers_Export.h
+++ b/DAnCE/tools/Config_Handlers/XSC_XML_Handlers_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl XSC_XML_Handlers
// ------------------------------
diff --git a/DAnCE/tools/Convert_Plan/Convert_Plan.cpp b/DAnCE/tools/Convert_Plan/Convert_Plan.cpp
index d5ed7ea8c14..d3981e08526 100644
--- a/DAnCE/tools/Convert_Plan/Convert_Plan.cpp
+++ b/DAnCE/tools/Convert_Plan/Convert_Plan.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Dynamic_Service.h"
#include "ace/Get_Opt.h"
#include "ace/Auto_Ptr.h"
diff --git a/DAnCE/tools/Convert_Plan/Convert_Plan.mpc b/DAnCE/tools/Convert_Plan/Convert_Plan.mpc
index 2c731a9676e..d3ffcc950b0 100644
--- a/DAnCE/tools/Convert_Plan/Convert_Plan.mpc
+++ b/DAnCE/tools/Convert_Plan/Convert_Plan.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (DAnCE_Convert_Plan) : install, dance_lib, dance_output, \
dance_deployment_stub, dance_config_handlers {
diff --git a/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp b/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp
index f07551b294b..84ee5014a78 100644
--- a/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp
+++ b/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Convert_Plan_Impl.h"
#include "ace/OS_NS_stdio.h"
#include "tao/CDR.h"
diff --git a/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h b/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h
index 982048210b7..5c8373b21ab 100644
--- a/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h
+++ b/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Convert_Plan_Impl.h
*
diff --git a/DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h b/DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h
index 4ab9dd26e7f..fc77d2807bb 100644
--- a/DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h
+++ b/DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef DANCE_CONVERT_PLAN_EXPORT_H
diff --git a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc
index 7ccb9c8551a..eba77280cc0 100644
--- a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc
+++ b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(DAnCE_CORBA_Domain_Validator) : dance_config_handlers, dance_deployment_stub, \
dance_stub, dance_lib, dance_output, install, \
taolib {
diff --git a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h
index 2c451c09f95..7bdebac4a71 100644
--- a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h
+++ b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef CORBA_DOMAIN_VALIDATOR_EXPORT_H
diff --git a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp
index 29c625e777b..b56c2b06865 100644
--- a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp
+++ b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "CORBA_Domain_Validator_impl.h"
#include "tao/ORB_Core.h"
diff --git a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h
index fdc039983cf..f40336ec36b 100644
--- a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h
+++ b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file CORBA_Domain_Validator_impl.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/tools/Domain_Validator/Domain_Validator.idl b/DAnCE/tools/Domain_Validator/Domain_Validator.idl
index 4f0e9c1338f..8e2df41519d 100644
--- a/DAnCE/tools/Domain_Validator/Domain_Validator.idl
+++ b/DAnCE/tools/Domain_Validator/Domain_Validator.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Domain_Validator.idl
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/tools/Domain_Validator/Domain_Validator.mpc b/DAnCE/tools/Domain_Validator/Domain_Validator.mpc
index 94428bf16f2..c68c0cd6f61 100644
--- a/DAnCE/tools/Domain_Validator/Domain_Validator.mpc
+++ b/DAnCE/tools/Domain_Validator/Domain_Validator.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(DAnCE_Domain_Validator_Base) : dance_deployment_stub, dance_lib, dance_output, install, \
taolib_with_idl {
diff --git a/DAnCE/tools/Logger_Backend/ndds/DAnCE_NDDS_Log_Export.h b/DAnCE/tools/Logger_Backend/ndds/DAnCE_NDDS_Log_Export.h
index 2b6e6e417bc..2a95d0af1d9 100644
--- a/DAnCE/tools/Logger_Backend/ndds/DAnCE_NDDS_Log_Export.h
+++ b/DAnCE/tools/Logger_Backend/ndds/DAnCE_NDDS_Log_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl DAnCE_NDDS_Log
// ------------------------------
diff --git a/DAnCE/tools/Logger_Backend/ndds/Log_Backend.cpp b/DAnCE/tools/Logger_Backend/ndds/Log_Backend.cpp
index e0fceca8353..567a0e3603c 100644
--- a/DAnCE/tools/Logger_Backend/ndds/Log_Backend.cpp
+++ b/DAnCE/tools/Logger_Backend/ndds/Log_Backend.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Log_Backend.h"
#include "ace/Env_Value_T.h"
diff --git a/DAnCE/tools/Logger_Backend/ndds/Log_Backend.h b/DAnCE/tools/Logger_Backend/ndds/Log_Backend.h
index f8f1f6363ce..7f4972c029e 100644
--- a/DAnCE/tools/Logger_Backend/ndds/Log_Backend.h
+++ b/DAnCE/tools/Logger_Backend/ndds/Log_Backend.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Log_Backend.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/tools/Logger_Backend/ndds/Log_Record.idl b/DAnCE/tools/Logger_Backend/ndds/Log_Record.idl
index 27a35244efc..d49a0c7298c 100644
--- a/DAnCE/tools/Logger_Backend/ndds/Log_Record.idl
+++ b/DAnCE/tools/Logger_Backend/ndds/Log_Record.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Log_Record.idl
* @author William R. Otte
diff --git a/DAnCE/tools/Logger_Backend/ndds/Log_Server.cpp b/DAnCE/tools/Logger_Backend/ndds/Log_Server.cpp
index 6c60f9ee6e7..9a1fb6b02db 100644
--- a/DAnCE/tools/Logger_Backend/ndds/Log_Server.cpp
+++ b/DAnCE/tools/Logger_Backend/ndds/Log_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Log_Server.cpp
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/tools/Logger_Backend/ndds/NDDS_Logger.mpc b/DAnCE/tools/Logger_Backend/ndds/NDDS_Logger.mpc
index 3904912c94f..555b6ecca59 100644
--- a/DAnCE/tools/Logger_Backend/ndds/NDDS_Logger.mpc
+++ b/DAnCE/tools/Logger_Backend/ndds/NDDS_Logger.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DAnCE_NDDS_Logger) : ndds_cck_ts_defaults, nddslib, taolib_with_idl, dance_output, install {
dynamicflags += DANCE_NDDS_LOG_BUILD_DLL DAnCE_NDDS_Log_Stub_BUILD_DLL
diff --git a/DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h b/DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h
index cbfda5ecfee..5df63791e4d 100644
--- a/DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h
+++ b/DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef DANCE_SPLIT_PLAN_EXPORT_H
diff --git a/DAnCE/tools/Split_Plan/Locality_Splitter.cpp b/DAnCE/tools/Split_Plan/Locality_Splitter.cpp
index 139eb80b922..ee04fb7767b 100644
--- a/DAnCE/tools/Split_Plan/Locality_Splitter.cpp
+++ b/DAnCE/tools/Split_Plan/Locality_Splitter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Locality_Splitter.h"
#include "dance/Logger/Log_Macros.h"
#include "dance/DAnCE_PropertiesC.h"
diff --git a/DAnCE/tools/Split_Plan/Locality_Splitter.h b/DAnCE/tools/Split_Plan/Locality_Splitter.h
index 256bf409d0c..75bd9b000f7 100644
--- a/DAnCE/tools/Split_Plan/Locality_Splitter.h
+++ b/DAnCE/tools/Split_Plan/Locality_Splitter.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Locality_Splitter.h
*
diff --git a/DAnCE/tools/Split_Plan/Node_Splitter.cpp b/DAnCE/tools/Split_Plan/Node_Splitter.cpp
index 87ae7d5d7ab..8c7af3a1621 100644
--- a/DAnCE/tools/Split_Plan/Node_Splitter.cpp
+++ b/DAnCE/tools/Split_Plan/Node_Splitter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Node_Splitter.h"
#include "dance/Logger/Log_Macros.h"
diff --git a/DAnCE/tools/Split_Plan/Node_Splitter.h b/DAnCE/tools/Split_Plan/Node_Splitter.h
index 89311d61408..a11e488eb46 100644
--- a/DAnCE/tools/Split_Plan/Node_Splitter.h
+++ b/DAnCE/tools/Split_Plan/Node_Splitter.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Node_Splitter.h
*
diff --git a/DAnCE/tools/Split_Plan/Split_Plan.cpp b/DAnCE/tools/Split_Plan/Split_Plan.cpp
index 286ca28ecce..fb18fe35ffa 100644
--- a/DAnCE/tools/Split_Plan/Split_Plan.cpp
+++ b/DAnCE/tools/Split_Plan/Split_Plan.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DANCE_SPLIT_PLAN_CPP
#define DANCE_SPLIT_PLAN_CPP
diff --git a/DAnCE/tools/Split_Plan/Split_Plan.h b/DAnCE/tools/Split_Plan/Split_Plan.h
index 98b8b09ade8..a560abde45c 100644
--- a/DAnCE/tools/Split_Plan/Split_Plan.h
+++ b/DAnCE/tools/Split_Plan/Split_Plan.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Split_Plan.h
*
diff --git a/DAnCE/tools/Split_Plan/Split_Plan.mpc b/DAnCE/tools/Split_Plan/Split_Plan.mpc
index 7d7d632493c..d608c266f0b 100644
--- a/DAnCE/tools/Split_Plan/Split_Plan.mpc
+++ b/DAnCE/tools/Split_Plan/Split_Plan.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DAnCE_Split_Plan_Impl) : dance_lib, dance_stub, dance_deployment_stub, dance_output, dance_logger, install {
dynamicflags += DANCE_SPLIT_PLAN_BUILD_DLL
includes += $(DANCE_ROOT)/tools
diff --git a/DAnCE/tools/Split_Plan/Split_Plan_exec.cpp b/DAnCE/tools/Split_Plan/Split_Plan_exec.cpp
index ca76f63867c..61c954fb113 100644
--- a/DAnCE/tools/Split_Plan/Split_Plan_exec.cpp
+++ b/DAnCE/tools/Split_Plan/Split_Plan_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Dynamic_Service.h"
#include "ace/Get_Opt.h"
#include "ace/Auto_Ptr.h"
diff --git a/DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp b/DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp
index 19d7d13b289..0f538a19f52 100644
--- a/DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp
+++ b/DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sub_UUID_Generator.h"
#include <sstream>
diff --git a/DAnCE/tools/Split_Plan/Sub_UUID_Generator.h b/DAnCE/tools/Split_Plan/Sub_UUID_Generator.h
index 7e2b319e321..a2d9b0cf814 100644
--- a/DAnCE/tools/Split_Plan/Sub_UUID_Generator.h
+++ b/DAnCE/tools/Split_Plan/Sub_UUID_Generator.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Sub_UUID_Generator.h
*
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp b/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp
index be41df81fa3..3f7d6805fe9 100644
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp
+++ b/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/Object.h"
#include "tao/Utils/ORB_Destroyer.h"
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.idl b/DAnCE/tools/System_Health/Daemon/SHS_Daemon.idl
index d82bf4af3d5..c78746b093e 100644
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.idl
+++ b/DAnCE/tools/System_Health/Daemon/SHS_Daemon.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef System_Health_Daemon
#define System_Health_Daemon
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.mpc b/DAnCE/tools/System_Health/Daemon/SHS_Daemon.mpc
index 01d94d840ba..439c4dac37e 100644
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.mpc
+++ b/DAnCE/tools/System_Health/Daemon/SHS_Daemon.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (DAnCE_SHS_Daemon_idl) : install, dance_shs_stub, gen_ostream {
custom_only = 1
idlflags += -Wb,stub_export_macro=SHS_Daemon_STUB_Export \
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp b/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp
index 7104d696437..03ec916dc57 100644
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp
+++ b/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// TAO_IDL - Generated from
// be/be_codegen.cpp:1756
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h b/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h
index ccc0dce2547..45ef2911f28 100644
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h
+++ b/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// TAO_IDL - Generated from
// be/be_codegen.cpp:1698
diff --git a/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_CORBA_Transport_export.h b/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_CORBA_Transport_export.h
index f283b25c924..73c1e50435e 100644
--- a/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_CORBA_Transport_export.h
+++ b/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_CORBA_Transport_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef DANCE_SHS_CORBA_TRANSPORT_EXPORT_H
diff --git a/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_Interceptors_export.h b/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_Interceptors_export.h
index 437a92a480a..1838f2af118 100644
--- a/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_Interceptors_export.h
+++ b/DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_Interceptors_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef DANCE_SHS_INTERCEPTORS_EXPORT_H
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
index 6570ece265a..ed545410710 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SHS_CORBA_Transport.h"
#include "orbsvcs/CosNamingC.h"
#include "dance/DAnCE_PropertiesC.h"
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h
index a79ba95eee1..b27743735f5 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file SHS_CORBA_Transport.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
index ba6c804983b..b0ad48a1551 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SHS_Interceptor.h"
#include "dance/Deployment/Deployment_StartErrorC.h"
#include "dance/DAnCE_PropertiesC.h"
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h
index 64331e88f9f..a0e1bdcaf3c 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file SHS_Interceptor.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc
index 9a52ea1d7ca..c4529dc9bc5 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DAnCE_SHS_CORBA_Transport) : install, dance_lib, dance_output, dance_logger, \
dance_shs_daemon, naming, dance_deployment_scheduler {
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h b/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h
index 55e43dc0058..0afe322defa 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file SHS_Transport.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/tools/System_Health/SHS_DataModel.idl b/DAnCE/tools/System_Health/SHS_DataModel.idl
index 64b0815bff0..135cc491358 100644
--- a/DAnCE/tools/System_Health/SHS_DataModel.idl
+++ b/DAnCE/tools/System_Health/SHS_DataModel.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SHS_DataModel_IDL
#define SHS_DataModel_IDL
diff --git a/DAnCE/tools/System_Health/System_Health.mpc b/DAnCE/tools/System_Health/System_Health.mpc
index a120521d7ac..9ecc100ffa6 100644
--- a/DAnCE/tools/System_Health/System_Health.mpc
+++ b/DAnCE/tools/System_Health/System_Health.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (DAnCE_System_Health) : install, dance_deployment_stub, dance_output, gen_ostream {
custom_only = 1
idlflags += -Wb,stub_export_macro=SystemHealth_STUB_Export \