[ccmtools-cvs] ccmtools/test/CppRemoteGenerator/facet_inheritance/impl _check_ccm_remote_Test.cc, 1.6, 1.7

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/facet_inheritance/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24759/test/CppRemoteGenerator/facet_inheritance/impl

Modified Files:
	_check_ccm_remote_Test.cc 
Log Message:
C++: the local home adapter has no longer a dependency to the home's implementation

Index: _check_ccm_remote_Test.cc
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/facet_inheritance/impl/_check_ccm_remote_Test.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** _check_ccm_remote_Test.cc	5 Jan 2007 18:58:48 -0000	1.6
--- _check_ccm_remote_Test.cc	23 Mar 2007 14:15:07 -0000	1.7
***************
*** 1,18 ****
  /***
!  * CCM Tools Test Client 
   *
!  * This file was automatically generated by CCM Tools 
   *         <http://ccmtools.sourceforge.net/>
   *
!  * This test client is part of the remote component test concept. 
   ***/
  
  #ifdef HAVE_CONFIG_H
  #  include <config.h>
! #endif 
  
! #ifdef HAVE_MICO 
  
! #include <cstdlib> 
  #include <iostream>
  #include <string>
--- 1,18 ----
  /***
!  * CCM Tools Test Client
   *
!  * This file was automatically generated by CCM Tools
   *         <http://ccmtools.sourceforge.net/>
   *
!  * This test client is part of the remote component test concept.
   ***/
  
  #ifdef HAVE_CONFIG_H
  #  include <config.h>
! #endif
  
! #ifdef HAVE_MICO
  
! #include <cstdlib>
  #include <iostream>
  #include <string>
***************
*** 23,26 ****
--- 23,27 ----
  #include <coss/CosNaming.h>
  
+ #include <TestHome_entry.h>
  #include <ccmtools/remote/TestHome_remote.h>
  #include <ccmtools_corba_Test.h>
***************
*** 36,60 ****
      cout << "Enter C++ remote test client" << endl;
  
!     // Initialize ORB 
      int argc_ = 3;
!     char* argv_[] = { "", "-ORBInitRef", "NameService=corbaloc:iiop:1.2@localhost:5050/NameService" }; 
      CORBA::ORB_var orb = CORBA::ORB_init(argc_, argv_);
  
      /**
       * Server-side code
!      */ 
  
!     // Register all value type factories with the ORB  
      ::ccmtools::remote::register_all_factories(orb);
  
!     // Deploy local and remote component homes	
      int error = 0;
      error += deploy_TestHome("TestHome");
      error += deploy_ccmtools_remote_TestHome(orb, "TestHome");
!     if(!error) 
      {
          cout << "TestHome server is running..." << endl;
      }
!     else 
      {
          cerr << "ERROR: Can't deploy components!" << endl;
--- 37,61 ----
      cout << "Enter C++ remote test client" << endl;
  
!     // Initialize ORB
      int argc_ = 3;
!     char* argv_[] = { "", "-ORBInitRef", "NameService=corbaloc:iiop:1.2@localhost:5050/NameService" };
      CORBA::ORB_var orb = CORBA::ORB_init(argc_, argv_);
  
      /**
       * Server-side code
!      */
  
!     // Register all value type factories with the ORB
      ::ccmtools::remote::register_all_factories(orb);
  
!     // Deploy local and remote component homes
      int error = 0;
      error += deploy_TestHome("TestHome");
      error += deploy_ccmtools_remote_TestHome(orb, "TestHome");
!     if(!error)
      {
          cout << "TestHome server is running..." << endl;
      }
!     else
      {
          cerr << "ERROR: Can't deploy components!" << endl;
***************
*** 62,68 ****
      }
  
!     // For testing we use CORBA collocation	
      // orb->run();
! 	
  
      /**
--- 63,69 ----
      }
  
!     // For testing we use CORBA collocation
      // orb->run();
! 
  
      /**
***************
*** 72,76 ****
      CosNaming::NamingContextExt_var nc = CosNaming::NamingContextExt::_narrow(obj);
  
!     // Deployment 
  
      // Find ComponentHomes in the Naming-Service
--- 73,77 ----
      CosNaming::NamingContextExt_var nc = CosNaming::NamingContextExt::_narrow(obj);
  
!     // Deployment
  
      // Find ComponentHomes in the Naming-Service
***************
*** 81,91 ****
      ::ccmtools::corba::Test_var myTest = myTestHome->create();
  
!     // Provide facets   
      ::ccmtools::corba::SubType_var iface = myTest->provide_iface();
! 	
      myTest->configuration_complete();
  
      cout << "==== Begin Test Case ===================================" << endl;
!     
      {
        char* s = CORBA::string_dup("1234567890");
--- 82,92 ----
      ::ccmtools::corba::Test_var myTest = myTestHome->create();
  
!     // Provide facets
      ::ccmtools::corba::SubType_var iface = myTest->provide_iface();
! 
      myTest->configuration_complete();
  
      cout << "==== Begin Test Case ===================================" << endl;
! 
      {
        char* s = CORBA::string_dup("1234567890");
***************
*** 106,110 ****
      }
  
!     cout << "==== End Test Case =====================================" << endl; 
  
      // Destroy component instances
--- 107,111 ----
      }
  
!     cout << "==== End Test Case =====================================" << endl;
  
      // Destroy component instances
***************
*** 114,122 ****
      error  = undeploy_TestHome("TestHome");
      error += undeploy_ccmtools_remote_TestHome(orb, "TestHome");
!     if(!error) 
      {
! 	    cout << "Exit C++ remote test client" << endl; 	
      }
!     else 
      {
          cerr << "ERROR: Can't undeploy components!" << endl;
--- 115,123 ----
      error  = undeploy_TestHome("TestHome");
      error += undeploy_ccmtools_remote_TestHome(orb, "TestHome");
!     if(!error)
      {
! 	    cout << "Exit C++ remote test client" << endl;
      }
!     else
      {
          cerr << "ERROR: Can't undeploy components!" << endl;