Fri Jun 17 12:21:03 UTC 2011 Marcel Smit <msmit@remedy.nl>

        * examples/Hello/step-by-step.html:
          Describing ccm_noevent in default.features. Made an extra
          link to the description of "starter".

        * examples/Hello/descriptors/Domain.cdd:
        * examples/Hello/descriptors/Hello.pcd:
        * examples/Hello/descriptors/package.tpd:
        * examples/Hello/descriptors/svc_em.conf:
          Removed these files since they may confuse the user.

6 files changed, 18 insertions, 46 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 497d9b92d5f..b89059f7202 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Fri Jun 17 12:21:03 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/Hello/step-by-step.html:
+          Describing ccm_noevent in default.features. Made an extra
+          link to the description of "starter".
+
+        * examples/Hello/descriptors/Domain.cdd:
+        * examples/Hello/descriptors/Hello.pcd:
+        * examples/Hello/descriptors/package.tpd:
+        * examples/Hello/descriptors/svc_em.conf:
+          Removed these files since they may confuse the user.
+
 Fri Jun 17 11:52:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
         * examples/Hello/Hello_Base/Hello_Base.mpc:
diff --git a/CIAO/examples/Hello/descriptors/Domain.cdd b/CIAO/examples/Hello/descriptors/Domain.cdd
deleted file mode 100644
index 882b29724cd..00000000000
--- a/CIAO/examples/Hello/descriptors/Domain.cdd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Deployment:Domain
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-<label>Hello Domain</label>
-<UUID>effd4bd0-6db0-4c50-9bb7-db9decebae1c</UUID>
-<node>
-  <name>Sender</name>
-  <label>Sender's Node</label>
-</node>
-<node>
-  <name>Receiver</name>
-  <label>Receiver's Node</label>
-</node>
-</Deployment:Domain>
diff --git a/CIAO/examples/Hello/descriptors/Hello.pcd b/CIAO/examples/Hello/descriptors/Hello.pcd
deleted file mode 100644
index a0f5051444a..00000000000
--- a/CIAO/examples/Hello/descriptors/Hello.pcd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:PackageConfiguration
-xmlns:Deployment="http://www.omg.org/Deployment"
-xmlns:xmi="http://www.omg.org/XMI"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Hello Example Configuration for Unix machines</label>
-  <UUID>559d65e8-0407-48c0-a158-dafe21360fef</UUID>
-  <basePackage href="Hello.cpd"/>
-</Deployment:PackageConfiguration>
diff --git a/CIAO/examples/Hello/descriptors/package.tpd b/CIAO/examples/Hello/descriptors/package.tpd
deleted file mode 100644
index d447a2abb4a..00000000000
--- a/CIAO/examples/Hello/descriptors/package.tpd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:TopLevelPackageDescription
-xmlns:Deployment="http://www.omg.org/Deployment"
-xmlns:xmi="http://www.omg.org/XMI"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <package href="Hello.pcd"/>
-</Deployment:TopLevelPackageDescription>
diff --git a/CIAO/examples/Hello/descriptors/svc_em.conf b/CIAO/examples/Hello/descriptors/svc_em.conf
deleted file mode 100644
index eb5b4dd1e30..00000000000
--- a/CIAO/examples/Hello/descriptors/svc_em.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# $Id$
-#
-# Please see $TAO_ROOT/docs/Options.html for details on these options.
-#
-
-static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"
-static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"
-
diff --git a/CIAO/examples/Hello/step-by-step.html b/CIAO/examples/Hello/step-by-step.html
index e0211218733..0fcd3649d0a 100644
--- a/CIAO/examples/Hello/step-by-step.html
+++ b/CIAO/examples/Hello/step-by-step.html
@@ -60,6 +60,10 @@ The following code generators are use throughout this example:
   </li>
 </ul>
 All these generators will be handled throughout this tutorial.
+<br/><br/>
+If there's a ccm_noevent entry in your default.features (location
+<code>$ACE_ROOT/bin/MakeProjectCreator/config/</code>, make sure it's set to 0 (nil)!
+
 <hr>
 
 <h2>Step-By-Step</h2>
@@ -94,7 +98,7 @@ All these generators will be handled throughout this tutorial.
   <li>Execute : <br>
   <ul>
     <li><code>$CIAO_ROOT/bin/generate_component_mpc.pl -e -l ../lib -o ../lib -c starter -p Hello_Base Sender</code> in Sender directory.
-      The <code>-c</code> option will be handled later on in the step-by-step.
+      The <code>-c</code> option will be handled <a href="#entry_point">later</a> on in the step-by-step.
     </li>
     <li><code>$CIAO_ROOT/bin/generate_component_mpc.pl -e -l ../lib -o ../lib -p Hello_Base Receiver</code> in Receiver directory
     </li>
@@ -173,7 +177,7 @@ it should not take too much time before you can declare yourself as a CCM progra
 
 <hr>
 
-<h3>The Entry Point</h3>
+<a name="entry_point"><h3>The Entry Point</h3></a>
 
 After both components are implemented we still need a small program to
 initialize the process. In Sender.idl there is a Sender specific