Fri Dec 9 10:41:34 UTC 2011 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc:
          Generate svnt code as well.

        * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc:
        * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h:
        * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp:
          Removed these files since they can be generated.

5 files changed, 12 insertions, 246 deletions

diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH
index 8d0c0972e5a..d81adeecd0e 100644
--- a/CIAO/ChangeLog.BRANCH
+++ b/CIAO/ChangeLog.BRANCH
@@ -1,3 +1,13 @@
+Fri Dec  9 10:41:34 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc:
+          Generate svnt code as well.
+
+        * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc:
+        * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h:
+        * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp:
+          Removed these files since they can be generated.
+
 Fri Dec  9 10:17:37 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
         * bin/ciao_tests.lst:
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc
index 3da2e6a035a..0e8af15ad3c 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc
@@ -6,7 +6,7 @@ project(Single_Service_Common_idl_gen) : taoidldefaults {
               -Wb,stub_export_include=Single_Service_Common_stub_export.h \
               -Wb,skel_export_macro=SINGLE_SERVICE_COMMON_SKEL_Export \
               -Wb,skel_export_include=Single_Service_Common_skel_export.h \
-              -Gxhst -Gxhsk
+              -Gxhst -Gxhsk -Gsv
 
   IDL_Files {
     Single_Service_Common.idl
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
index 0f22cfd536b..f528d21d52b 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
@@ -9,7 +9,7 @@ project(Single_Service_idl_gen) : componentidldefaults   {
               -Wb,skel_export_include=Single_Service_svnt_export.h \
               -Wb,exec_export_macro=SINGLE_SERVICE_EXEC_Export \
               -Wb,exec_export_include=Single_Service_exec_export.h \
-              -Gxhex -Gxhsk -Gxhst -I.. -Glfa
+              -Gxhex -Gxhsk -Gxhst -I.. -Glfa -Gex
 
   IDL_Files {
     Single_Service.idl
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp
deleted file mode 100644
index 2e620612de3..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.7
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1277
-
-#include "Single_Service_exec.h"
-
-namespace CIAO_Single_Service_Impl
-{
-  //============================================================
-  // Facet Executor Implementation Class: Simple_Service_exec_i
-  //============================================================
-
-  Simple_Service_exec_i::Simple_Service_exec_i (void)
-  {
-  }
-
-  Simple_Service_exec_i::~Simple_Service_exec_i (void)
-  {
-  }
-
-  // Operations from ::Simple_Service
-
-  void
-  Simple_Service_exec_i::ping (void)
-  {
-    /* Your code here. */
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Single_Service_exec_i
-  //============================================================
-
-  Single_Service_exec_i::Single_Service_exec_i (void)
-  {
-  }
-
-  Single_Service_exec_i::~Single_Service_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::CCM_Simple_Service_ptr
-  Single_Service_exec_i::get_ping_port (void)
-  {
-    /* Your code here. */
-    return ::CCM_Simple_Service::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Single_Service_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CCM_Single_Service_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Single_Service_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Single_Service_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Single_Service_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Single_Service_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SINGLE_SERVICE_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Single_Service_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Single_Service_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h
deleted file mode 100644
index cbe4bd81665..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.7
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1216
-
-#ifndef CIAO_SINGLE_SERVICE_EXEC_AZRZEB_H_
-#define CIAO_SINGLE_SERVICE_EXEC_AZRZEB_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Single_ServiceEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Single_Service_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Single_Service_Impl
-{
-  // TAO_IDL - Generated from
-  // be/be_visitor_component/facet_exh.cpp:53
-
-  class SINGLE_SERVICE_EXEC_Export Simple_Service_exec_i
-    : public virtual ::CCM_Simple_Service,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Simple_Service_exec_i (void);
-    virtual ~Simple_Service_exec_i (void);
-
-    // Operations and attributes from Simple_Service
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:37
-
-    virtual void
-    ping (void);
-  };
-
-  class SINGLE_SERVICE_EXEC_Export Single_Service_exec_i
-    : public virtual Single_Service_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Single_Service_exec_i (void);
-    virtual ~Single_Service_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-
-    virtual ::CCM_Simple_Service_ptr
-    get_ping_port (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-
-  private:
-    ::CCM_Single_Service_Context_var context_;
-  };
-
-  extern "C" SINGLE_SERVICE_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Single_Service_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-