diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-16 17:46:18 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-16 17:46:18 +0000 |
| commit | 3d46f3d676cb4a33273fcd1b8f3b29e0df3ee98a (patch) | |
| tree | 76c7f3c3ba6316a36635b62b862506205681763e | |
| parent | 3d4c7e338ad4f92cefe991ece7d6851df10d984d (diff) | |
| download | ATCD-3d46f3d676cb4a33273fcd1b8f3b29e0df3ee98a.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/CIAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/CIAO/docs/ConfigValues.html | 7 | ||||
| -rw-r--r-- | TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp | 2 | ||||
| -rw-r--r-- | TAO/CIAO/tools/ComponentServer/ComponentServer.mpc | 15 | ||||
| -rw-r--r-- | TAO/CIAO/tools/Daemon/Daemon.mpc | 22 | ||||
| -rw-r--r-- | TAO/CIAO/tools/ServerActivator/ServerActivator.mpc | 15 | ||||
| -rw-r--r-- | TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc | 2 |
7 files changed, 74 insertions, 2 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index a9512d1e216..b494ffa1ae6 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,14 @@ +Sun Mar 16 11:43:20 2003 Nanbor Wang <nanbor@cs.wustl.edu> + + * docs/ConfigValues.html: + * docs/index.html: Updated the main document entry page. It is + grossly outdated. + + * tools/ComponentServer/ComponentServer.mpc: + * tools/Daemon/Daemon.mpc: + * tools/ServerActivator/ServerActivator.mpc: + * tools/XML_Helpers/XMLHelpers.mpc: Added more mpc files. + Sat Mar 15 11:43:34 2003 Nanbor Wang <nanbor@cs.wustl.edu> * ciao/Makefile: @@ -16,7 +27,7 @@ Sat Mar 15 11:43:34 2003 Nanbor Wang <nanbor@cs.wustl.edu> * ciao/Object_Set_T.cpp: * ciao/ServerActivator_Impl.h: Fixed Linux build errors. Some warnings are not fixed due to incomplete implementations and I - want to make sure they got addressed in some future point. + want to make sure they got addressed in some future point. Fri Mar 14 23:19:52 2003 Nanbor Wang <nanbor@cs.wustl.edu> diff --git a/TAO/CIAO/docs/ConfigValues.html b/TAO/CIAO/docs/ConfigValues.html index 04a68617520..5a45cfe5366 100644 --- a/TAO/CIAO/docs/ConfigValues.html +++ b/TAO/CIAO/docs/ConfigValues.html @@ -5,9 +5,14 @@ </head> <body> -<h1>Index of ConfigValues</h1> +<h1>Index of ConfigValues</h1> +<font size="+1" color="red">This page is currently a placeholder for +all the configuration values we will support when creating various CCM +deployment mechanisms, such as ComponentServers and Containers. The +ConfigValues listed here are currently only partially supported in +CIAO. </font> <h2>ComponentServer</h2> The <code>ConfigValues</code> for a <code>ComponentServer</code> are diff --git a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp index c2530718b32..7a2c05c3d4d 100644 --- a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp +++ b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp @@ -1006,6 +1006,8 @@ CORBA::Object_ptr ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); + // @@ Call ccm_activate here. + return ho._retn (); } diff --git a/TAO/CIAO/tools/ComponentServer/ComponentServer.mpc b/TAO/CIAO/tools/ComponentServer/ComponentServer.mpc new file mode 100644 index 00000000000..05a5f5c40f5 --- /dev/null +++ b/TAO/CIAO/tools/ComponentServer/ComponentServer.mpc @@ -0,0 +1,15 @@ +project(ComponentServer): ciao_server { + + libs += TAO_IORTable + libpaths += $(TAO_ROOT)/tao/IORTable + + Source_Files { + ComponentServer.cpp + } +} + +project(ComponentServer_test_client) : ciao_server { + Source_Files { + ComponentServer_test_client.cpp + } +} diff --git a/TAO/CIAO/tools/Daemon/Daemon.mpc b/TAO/CIAO/tools/Daemon/Daemon.mpc new file mode 100644 index 00000000000..dfb95f30b8c --- /dev/null +++ b/TAO/CIAO/tools/Daemon/Daemon.mpc @@ -0,0 +1,22 @@ +project(CIAO_Daemon): ciao_server { + + libs += TAO_IORTable + libpaths += $(TAO_ROOT)/tao/IORTable + + Source_Files { + CIAO_Daemon.cpp + } +} + +project(DaemonController) : ciao_server, acexml { + + Source_Files { + DaemonController.cpp + controller_i.cpp + Daemon_Commands.cpp + Softpkg_Commands.cpp + ../XML_Helpers/XML_Utils.cpp + ../XML_Helpers/Softpkg_Handlers.cpp + ../XML_Helpers/Cascadable_DocHandler.cpp + } +} diff --git a/TAO/CIAO/tools/ServerActivator/ServerActivator.mpc b/TAO/CIAO/tools/ServerActivator/ServerActivator.mpc new file mode 100644 index 00000000000..ebc7757da49 --- /dev/null +++ b/TAO/CIAO/tools/ServerActivator/ServerActivator.mpc @@ -0,0 +1,15 @@ +project(ServerActivator): ciao_server { + + libs += TAO_IORTable + libpaths += $(TAO_ROOT)/tao/IORTable + + Source_Files { + ServerActivator.cpp + } +} + +project(ServerActivator_test_client) : ciao_server { + Source_Files { + ServerActivator_test_client.cpp + } +} diff --git a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc new file mode 100644 index 00000000000..86038d1fb5b --- /dev/null +++ b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc @@ -0,0 +1,2 @@ +project(Helper_Test): aceexe, acexml { +} |