ccmtools-cvs — Notification of CVS commits for the CCM Tools

[ccmtools-cvs] ccmtools/test/IDLParser/exception - New directory

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/IDLParser/exception
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32546/test/IDLParser/exception

Log Message:
Directory /cvsroot/ccmtools/ccmtools/test/IDLParser/exception added to the repository

[ccmtools-cvs] ccmtools/test/IDLParser/constants - New directory

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/IDLParser/constants
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32546/test/IDLParser/constants

Log Message:
Directory /cvsroot/ccmtools/ccmtools/test/IDLParser/constants added to the repository

[ccmtools-cvs] ccmtools/test/IDLParser/enum/error - New directory

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/IDLParser/enum/error
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32546/test/IDLParser/enum/error

Log Message:
Directory /cvsroot/ccmtools/ccmtools/test/IDLParser/enum/error added to the repository

[ccmtools-cvs] ccmtools/test/IDLParser/include/idl3/component/world - New directory

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/IDLParser/include/idl3/component/world
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32546/test/IDLParser/include/idl3/component/world

Log Message:
Directory /cvsroot/ccmtools/ccmtools/test/IDLParser/include/idl3/component/world added to the repository

[ccmtools-cvs] ccmtools/doc/manual/LoginExample LocalCxxComponents.tex, 1.4, 1.5 MirrorComponents.tex, 1.5, 1.6 RemoteJavaComponents.tex, 1.4, 1.5 Introduction.tex, 1.4, 1.5 RemoteCxxComponents.tex, 1.5, 1.6 LocalJavaComponents.tex, 1.4, 1.5

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/doc/manual/LoginExample
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16354/doc/manual/LoginExample

Modified Files:
	LocalCxxComponents.tex MirrorComponents.tex 
	RemoteJavaComponents.tex Introduction.tex 
	RemoteCxxComponents.tex LocalJavaComponents.tex 
Log Message:
Changed manual to support new namespaces

Index: RemoteCxxComponents.tex
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/LoginExample/RemoteCxxComponents.tex,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RemoteCxxComponents.tex	16 Oct 2006 14:55:24 -0000	1.5
--- RemoteCxxComponents.tex	18 Jan 2007 09:31:54 -0000	1.6
***************
*** 1,3 ****
- % $Id$
  %==============================================================================
  \section{Use Case 2: Remote C++ Components}
--- 1,2 ----
***************
*** 44,58 ****
  \begin{verbatim}
  > ccmidl -idl2 -I../../idl3repo/interface -I../../idl3repo/component \
!          -o src/component/Server/CCM_corba_stubs                     \  
           ../../idl3repo/interface/application/*.idl
  
  > ccmidl -idl2 -I../../idl3repo/interface -I../../idl3repo/component \
!          -o src/component/Server/CCM_corba_stubs                     \
           ../../idl3repo/component/application/Server*.idl
  \end{verbatim}
  \end{footnotesize}
  
! In this example, all generated IDL2 files are stored in a directory called {\tt
! CCM\_corba\_stubs}:
  \begin{footnotesize}
  \begin{verbatim}
--- 43,57 ----
  \begin{verbatim}
  > ccmidl -idl2 -I../../idl3repo/interface -I../../idl3repo/component \
!          -o src/component/Server/GEN_ccmtools_corba_stubs            \  
           ../../idl3repo/interface/application/*.idl
  
  > ccmidl -idl2 -I../../idl3repo/interface -I../../idl3repo/component \
!          -o src/component/Server/GEN_ccmtools_corba_stubs            \
           ../../idl3repo/component/application/Server*.idl
  \end{verbatim}
  \end{footnotesize}
  
! In this example, all generated IDL2 files are stored in a directory called 
! {\tt GEN\_ccmtools\_corba\_stubs}:
  \begin{footnotesize}
  \begin{verbatim}
***************
*** 60,73 ****
      |-- component
      |   `-- Server
!     |       |-- CCM_corba_stubs
  \end{verbatim}
  \end{footnotesize}
  
! In this {\tt CCM\_corba\_stubs} directory we call the IDL compiler for
  every single file (the CCM Tools provide a script that can do this
  in a single call):
  \begin{footnotesize}
  \begin{verbatim}
! > cd src/component/Server/CCM_corba_stubs
  > ccmtools-idl -mico -I${CCMTOOLS_HOME}/idl *.idl
  > cd ../../../../
--- 59,72 ----
      |-- component
      |   `-- Server
!     |       |-- GEN_ccmtools_corba_stubs
  \end{verbatim}
  \end{footnotesize}
  
! In this {\tt GEN\_ccmtools\_corba\_stubs} directory we call the IDL compiler for
  every single file (the CCM Tools provide a script that can do this
  in a single call):
  \begin{footnotesize}
  \begin{verbatim}
! > cd src/component/Server/GEN_ccmtools_corba_stubs
  > ccmtools-idl -mico -I${CCMTOOLS_HOME}/idl *.idl
  > cd ../../../../
***************
*** 94,98 ****
  \end{footnotesize}
  
! All generated source files are stored in {\tt CCM\_*\_remote\_*} directories:
  \begin{footnotesize}
  \begin{verbatim}
--- 93,97 ----
  \end{footnotesize}
  
! All generated source files are stored in the {\tt GEN\_ccmtools\_remote\_*} directory:
  \begin{footnotesize}
  \begin{verbatim}
***************
*** 101,107 ****
      |-- component
      |   `-- Server
!     |       |-- CCM_application_ccm_remote
!     |       |-- CCM_application_ccm_remote_corba_converter
!     |       `-- CCM_corba_stubs
  \end{verbatim}
  \end{footnotesize}
--- 100,105 ----
      |-- component
      |   `-- Server
!     |       |-- GEN_ccmtools_remote_application
!     |       `-- GEN_ccmtools_corba_stubs
  \end{verbatim}
  \end{footnotesize}
***************
*** 128,162 ****
  stand-alone CORBA server.
  To keep things simple, we implement this CORBA server in a single 
! {\tt \_check\_*.cc} file:
  \begin{footnotesize}
  \begin{lstlisting}[language=C++]
  #include <string>
! #include <wx/utils/debug.h>
! #include <CCM/CCMContainer.h>
  
  #include <CORBA.h>
  #include <coss/CosNaming.h>
  
! #include <application/ccm/remote/ServerHome_remote.h>
! #include <application_Server.h>
  
  using namespace std;
- using namespace wx::utils;
- 
  int main (int argc, char *argv[])
  {
!   char* argv_[] = { "", 
!                     "-ORBInitRef", 
!                     "NameService=corbaloc:iiop:1.2@localhost:5050/NameService"}; 
!   int   argc_ = 3;
    CORBA::ORB_var orb = CORBA::ORB_init(argc_, argv_);
  
    // Register all value type factories with the ORB  
!   CCM::register_all_factories(orb);
  
    // Deploy local and remote component homes	
    int error = 0;
!   error += deploy_application_ccm_local_ServerHome("ServerHome");
!   error += deploy_application_ccm_remote_ServerHome(orb, "ServerHome");
    if(!error) 
    {
--- 126,163 ----
  stand-alone CORBA server.
  To keep things simple, we implement this CORBA server in a single 
! {\tt \_check\_ccmtools\_remote\_application\_Server.cc} file:
  \begin{footnotesize}
  \begin{lstlisting}[language=C++]
+ #include <cstdlib> 
+ #include <iostream>
  #include <string>
! 
! #include <ccmtools/remote/CCMContainer.h>
  
  #include <CORBA.h>
  #include <coss/CosNaming.h>
  
! #include <ccmtools/remote/application/ServerHome_remote.h>
! #include <ccmtools_corba_application_Server.h>
  
  using namespace std;
  int main (int argc, char *argv[])
  {
!   int argc_ = 3;
!   char* argv_[] = 
!   { 
!     "", 
!     "-ORBInitRef", 
!     "NameService=corbaloc:iiop:1.2@localhost:5050/NameService"
!   }; 
    CORBA::ORB_var orb = CORBA::ORB_init(argc_, argv_);
  
    // 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_application_ServerHome("ServerHome");
!   error += deploy_ccmtools_remote_application_ServerHome(orb, "ServerHome");
    if(!error) 
    {
***************
*** 182,186 ****
      |   `-- Server
      |       `-- test
!     |           `-- _check_application_ccm_remote_Server.cc
  \end{verbatim}
  \end{footnotesize}
--- 183,187 ----
      |   `-- Server
      |       `-- test
!     |           `-- _check_ccmtools_remote_application_Server.cc
  \end{verbatim}
  \end{footnotesize}
***************
*** 228,236 ****
  \begin{verbatim}
  > ccmidl -idl2 -I../../idl3repo/interface -I../../idl3repo/component \
!          -o src/component/Server/CCM_corba_stubs                     \  
           ../../idl3repo/interface/application/*.idl
  
  > ccmidl -idl2 -I../../idl3repo/interface -I../../idl3repo/component \
!          -o src/component/Server/CCM_corba_stubs                     \
           ../../idl3repo/component/application/Server*.idl
  \end{verbatim}
--- 229,237 ----
  \begin{verbatim}
  > ccmidl -idl2 -I../../idl3repo/interface -I../../idl3repo/component \
!          -o src/component/Server/GEN_ccmtools_corba_stubs            \  
           ../../idl3repo/interface/application/*.idl
  
  > ccmidl -idl2 -I../../idl3repo/interface -I../../idl3repo/component \
!          -o src/component/Server/GEN_ccmtools_corba_stubs            \
           ../../idl3repo/component/application/Server*.idl
  \end{verbatim}
***************
*** 238,242 ****
  
  In addition to the generated stubs and skeletons, we store the remote test
! client in a file named {\tt \_check\_client.cc} in the following directory structure:
  \begin{footnotesize}
  \begin{verbatim}
--- 239,244 ----
  
  In addition to the generated stubs and skeletons, we store the remote test
! client in a file named {\tt \_check\_ccmtools\_remote\_client.cc} in the 
! following directory structure:
  \begin{footnotesize}
  \begin{verbatim}
***************
*** 245,251 ****
      |-- component
      |   `-- Server
!     |       `-- CCM_corba_stubs
      `-- test
!         `-- _check_client.cc
  \end{verbatim}
  \end{footnotesize}
--- 247,253 ----
      |-- component
      |   `-- Server
!     |       `-- GEN_ccmtools_corba_stubs
      `-- test
!         `-- _check_ccmtools_remote_client.cc
  \end{verbatim}
  \end{footnotesize}
***************
*** 256,291 ****
  \begin{footnotesize}
  \begin{lstlisting}[language=C++]
  #include <string>
- #include <wx/utils/debug.h>
- #include <CCM/CCMContainer.h>
  
  #include <CORBA.h>
  #include <coss/CosNaming.h>
  
! #include <application_Server.h>
! #include <application_ServerHome.h>
  
  using namespace std;
! using namespace wx::utils;
  
  int main (int argc, char *argv[])
  {
      int   argc_   = 3;
!     char* argv_[] = { "", 
!                     "-ORBInitRef", 
!                     "NameService=corbaloc:iiop:1.2@localhost:5050/NameService"};
!  
      CORBA::ORB_var orb = CORBA::ORB_init(argc_, argv_);
  
!     CORBA::Object_var obj = orb->resolve_initial_references("NameService");
!     CosNaming::NamingContextExt_var nc = CosNaming::NamingContextExt::_narrow(obj);
  
      // Find ComponentHomes in the Naming-Service
      obj = nc->resolve_str("ServerHome");
!     ::application::ServerHome_var home = ::application::ServerHome::_narrow(obj);
  
      // Create component instances
!     ::application::Server_var server = home->create();
!     ::application::Login_var login = server->provide_login();
      server->configuration_complete();
  
--- 258,297 ----
  \begin{footnotesize}
  \begin{lstlisting}[language=C++]
+ #include <cstdlib> 
+ #include <iostream>
  #include <string>
  
  #include <CORBA.h>
  #include <coss/CosNaming.h>
  
! #include <ccmtools/remote/CCMContainer.h>
! #include <ccmtools_corba_application_ServerHome.h>
  
  using namespace std;
! using namespace ccmtools::corba::application;
  
  int main (int argc, char *argv[])
  {
      int   argc_   = 3;
!     char* argv_[] = 
!     { 
!         "", 
!         "-ORBInitRef", 
!         "NameService=corbaloc:iiop:1.2@localhost:5050/NameService"
!     };
      CORBA::ORB_var orb = CORBA::ORB_init(argc_, argv_);
  
!     CORBA::Object_var obj = 
!         orb->resolve_initial_references("NameService");
!     CosNaming::NamingContextExt_var nc = 
!         CosNaming::NamingContextExt::_narrow(obj);
  
      // Find ComponentHomes in the Naming-Service
      obj = nc->resolve_str("ServerHome");
!     ServerHome_var home = ServerHome::_narrow(obj);
  
      // Create component instances
!     Server_var server = home->create();
!     Login_var login = server->provide_login();
      server->configuration_complete();
  
***************
*** 293,301 ****
      try 
      {
!       ::application::PersonData person;
        person.id = 277;
        person.name = CORBA::string_dup("eteinik");
        person.password = CORBA::string_dup("eteinik");   
!       person.group =  ::application::USER;       
        
        CORBA::Boolean result = login->isValidUser(person);
--- 299,307 ----
      try 
      {
!       PersonData person;
        person.id = 277;
        person.name = CORBA::string_dup("eteinik");
        person.password = CORBA::string_dup("eteinik");   
!       person.group = USER;       
        
        CORBA::Boolean result = login->isValidUser(person);
***************
*** 310,314 ****
        }
      }
!     catch(::application::InvalidPersonData& e)
      {
        cout << "Error: InvalidPersonData" << endl;	
--- 316,320 ----
        }
      }
!     catch(InvalidPersonData& e)
      {
        cout << "Error: InvalidPersonData" << endl;	
***************
*** 317,330 ****
      try 
      {
!       ::application::PersonData person;
        person.id = 0;
        person.name = CORBA::string_dup(""); // Here we create an error!!!
        person.password = CORBA::string_dup("");   
!       person.group =  ::application::USER;       
        
        login->isValidUser(person);
        assert(false); 
      }
!     catch(::application::InvalidPersonData& e)
      {
        cout << "OK, caught InvalidPersonData exception!" << endl;	
--- 323,336 ----
      try 
      {
!       PersonData person;
        person.id = 0;
        person.name = CORBA::string_dup(""); // Here we create an error!!!
        person.password = CORBA::string_dup("");   
!       person.group = USER;       
        
        login->isValidUser(person);
        assert(false); 
      }
!     catch(InvalidPersonData& e)
      {
        cout << "OK, caught InvalidPersonData exception!" << endl;	
***************
*** 353,357 ****
  Welcome eteinik
  OK, caught InvalidPersonData exception!
! PASS: login-remote-client__check_client
  ==================
  All 1 tests passed
--- 359,363 ----
  Welcome eteinik
  OK, caught InvalidPersonData exception!
! PASS: login-remote-client_test__check_ccmtools_remote_client
  ==================
  All 1 tests passed

Index: Introduction.tex
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/LoginExample/Introduction.tex,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Introduction.tex	7 Sep 2006 14:33:36 -0000	1.4
--- Introduction.tex	18 Jan 2007 09:31:54 -0000	1.5
***************
*** 1,3 ****
- % $Id$
  %==============================================================================
  \section{Introduction}
--- 1,2 ----
***************
*** 10,14 ****
  \begin{figure}[htbp]
      \begin{center}
!         \includegraphics [width=6cm,angle=0] {figures/LoginComponentExample}
          \caption{ A simple component example.}
          \label{figure:SimpleComponentExample}
--- 9,13 ----
  \begin{figure}[htbp]
      \begin{center}
!         \includegraphics [width=5cm,angle=0] {figures/LoginComponentExample}
          \caption{ A simple component example.}
          \label{figure:SimpleComponentExample}

Index: MirrorComponents.tex
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/LoginExample/MirrorComponents.tex,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MirrorComponents.tex	16 Oct 2006 14:55:24 -0000	1.5
--- MirrorComponents.tex	18 Jan 2007 09:31:54 -0000	1.6
***************
*** 1,3 ****
- % $Id$
  %==============================================================================
  \section{Use Case 5: Mirror Component Concept}
--- 1,2 ----
***************
*** 140,152 ****
      |   |-- Server
      |   `-- ServerMirror
!     |       |-- CCM_application_ccm_local
!     |       |-- CCM_application_ccm_local_share
      |       |-- ServerHomeMirror_impl.cc
      |       |-- ServerHomeMirror_impl.h
      |       |-- ServerMirror_impl.cc
      |       |-- ServerMirror_impl.h
!     |       |-- application_ccm_local_ServerHomeMirror_entry.h
      |       `-- test
!     |           `-- _check_application_ccm_local_Server.cc
  \end{verbatim}
  \end{footnotesize}
--- 139,151 ----
      |   |-- Server
      |   `-- ServerMirror
!     |       |-- GEN_ccmtools_local_application
!     |       |-- GEN_ccmtools_local_application_share
      |       |-- ServerHomeMirror_impl.cc
      |       |-- ServerHomeMirror_impl.h
      |       |-- ServerMirror_impl.cc
      |       |-- ServerMirror_impl.h
!     |       |-- application_ServerHomeMirror_entry.h
      |       `-- test
!     |           `-- _check_application_Server.cc
  \end{verbatim}
  \end{footnotesize}
***************
*** 166,170 ****
  void
  ServerMirror_impl::ccm_activate()
!     throw(::Components::ccm::local::CCMException)
  {
      try
--- 165,169 ----
  void
  ServerMirror_impl::ccm_activate()
!     throw(Components::CCMException)
  {
      try
***************
*** 208,212 ****
          }
      }
!     catch(::Components::ccm::local::Exception& e)
      {
          cerr << "ERROR: " << e.what() << endl;
--- 207,211 ----
          }
      }
!     catch(Components::Exception& e)
      {
          cerr << "ERROR: " << e.what() << endl;
***************
*** 236,240 ****
  Welcome eteinik
  OK, caught InvalidPersonData exception!
! PASS: login__check_application_ccm_local_Server
  ==================
  All 1 tests passed
--- 235,239 ----
  Welcome eteinik
  OK, caught InvalidPersonData exception!
! PASS: login_component_ServerMirror_test__check_application_Server
  ==================
  All 1 tests passed

Index: LocalCxxComponents.tex
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/LoginExample/LocalCxxComponents.tex,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LocalCxxComponents.tex	16 Oct 2006 14:55:24 -0000	1.4
--- LocalCxxComponents.tex	18 Jan 2007 09:31:54 -0000	1.5
***************
*** 1,3 ****
- % $Id$
  %==============================================================================
  \section{Use Case 1: Local C++ Components}
--- 1,2 ----
***************
*** 58,71 ****
      |-- component
      |   `-- Server
!     |       |-- CCM_application_ccm_local
!     |       |-- CCM_application_ccm_local_share
!     |       `-- application_ccm_local_ServerHome_entry.h
      `-- interface
!         |-- CCM_application_ccm_local
!         `-- CCM_application_ccm_local_adapter
  \end{verbatim}
  \end{footnotesize}
  
! Basically, all directories starting with '{\tt CCM\_}' contain component logic
  which is completely generated (so there is no need to check--in these directories
  into a CVS like system).
--- 57,70 ----
      |-- component
      |   `-- Server
!     |       |-- GEN_ccmtools_local_application
!     |       |-- GEN_ccmtools_local_application_share
!     |       `-- application_ServerHome_entry.h
      `-- interface
!         |-- GEN_application
!         `-- GEN_ccmtools_local_application
  \end{verbatim}
  \end{footnotesize}
  
! Basically, all directories starting with '{\tt GEN\_}' contain component logic
  which is completely generated (so there is no need to check--in these directories
  into a CVS like system).
***************
*** 118,122 ****
  	Additionally, the {\tt ServerHome\_impl.cc} file contains the implementation of
  	the global: \\
!     {\tt create\_application\_ccm\_local\_component\_Server\_ServerHome()} 
   	function which represents the business logic entry point used by the generated 
   	component logic. 
--- 117,121 ----
  	Additionally, the {\tt ServerHome\_impl.cc} file contains the implementation of
  	the global: \\
!     {\tt create\_application\_ServerHome()} 
   	function which represents the business logic entry point used by the generated 
   	component logic. 
***************
*** 148,158 ****
  \begin{lstlisting}[language=C++]
  bool
! Server_login_impl::isValidUser(
!     const application::ccm::local::PersonData& person)
!     throw(::Components::ccm::local::CCMException,
!           application::ccm::local::InvalidPersonData )
  {
      if(person.name.length() == 0)
!         throw application::ccm::local::InvalidPersonData();
  
      if(person.id == 277 
--- 147,155 ----
  \begin{lstlisting}[language=C++]
  bool
! Server_login_impl::isValidUser(const application::PersonData& person)
!     throw(Components::CCMException, application::InvalidPersonData )
  {
      if(person.name.length() == 0)
!         throw application::InvalidPersonData();
  
      if(person.id == 277 
***************
*** 201,231 ****
  \vspace{3mm}
  We create a {\tt src/component/Server/test} directory and store the following
! code in a file called {\tt \_check\_local\_component\_Server.cc}:
   
  \begin{footnotesize} 
  \begin{lstlisting}[language=C++]
! #include <cassert>
! #include <iostream>
! 
! #include <wx/utils/debug.h>
! #include <WX/Utils/smartptr.h>
! 
! #include <Components/ccm/local/CCM.h>
! #include <ccm/local/HomeFinder.h>
! 
! #include <application/ccm/local/Server_gen.h>
! #include <application/ccm/local/ServerHome_gen.h>
  
  using namespace std;
! using namespace wx::utils;
! using namespace ccm::local;
! using namespace application::ccm::local;
  
  int main(int argc, char *argv[])
  {
!   SmartPtr<Server> server;
!   SmartPtr<Login> login;
!   Components::ccm::local::HomeFinder* homeFinder = HomeFinder::Instance();
!   if(deploy_application_ccm_local_ServerHome("ServerHome")) 
    {
        cerr << "ERROR: Can't deploy component homes!" << endl;
--- 198,214 ----
  \vspace{3mm}
  We create a {\tt src/component/Server/test} directory and store the following
! code in a file called {\tt \_check\_application\_Server.cc}:
   
  \begin{footnotesize} 
  \begin{lstlisting}[language=C++]
! #include <Components/ccmtools.h>
! #include <application/ServerHome_gen.h>
  
  using namespace std;
! using namespace application;
  
  int main(int argc, char *argv[])
  {
!   if(deploy_application_ServerHome("ServerHome")) 
    {
        cerr << "ERROR: Can't deploy component homes!" << endl;
***************
*** 235,241 ****
    try 
    {
!       SmartPtr<ServerHome> serverHome(dynamic_cast<ServerHome*>
!           (homeFinder->find_home_by_name("ServerHome").ptr()));
  
        server = serverHome->create();
        login = server->provide_login();
--- 218,229 ----
    try 
    {
!       Components::HomeFinder* homeFinder = Components::HomeFinder::Instance();
! 
!       ServerHome::SmartPtr serverHome(dynamic_cast<ServerHome*>(
!           homeFinder->find_home_by_name("ServerHome").ptr()));
  
+       Server::SmartPtr server;
+       Login::SmatrPtr login;
+       
        server = serverHome->create();
        login = server->provide_login();
***************
*** 246,256 ****
        server->remove();
    } 
!   catch(::Components::ccm::local::Exception& e ) 
    {
!       cout << "ERROR: " << e.what() << endl;
        return -2;
    } 
  
!   if(undeploy_application_ccm_local_ServerHome("ServerHome")) 
    {
      cerr << "ERROR: Can't undeploy component home!" << endl;
--- 234,244 ----
        server->remove();
    } 
!   catch(Components::Exception& e ) 
    {
!       cerr << "ERROR: " << e.what() << endl;
        return -2;
    } 
  
!   if(undeploy_application_ServerHome("ServerHome")) 
    {
      cerr << "ERROR: Can't undeploy component home!" << endl;
***************
*** 357,361 ****
  Welcome eteinik
  OK, caught InvalidPersonData exception!
! PASS: login_component_Server_test__check_application_ccm_local_Server
  ==================
  All 1 tests passed
--- 345,349 ----
  Welcome eteinik
  OK, caught InvalidPersonData exception!
! PASS: login_component_Server_test__check_application_Server
  ==================
  All 1 tests passed

Index: RemoteJavaComponents.tex
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/LoginExample/RemoteJavaComponents.tex,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RemoteJavaComponents.tex	7 Sep 2006 14:33:36 -0000	1.4
--- RemoteJavaComponents.tex	18 Jan 2007 09:31:54 -0000	1.5
***************
*** 1,3 ****
- % $Id$
  %==============================================================================
  \section{Use Case 4: Remote Java Components}
--- 1,2 ----
***************
*** 105,109 ****
  \begin{lstlisting}[language=Java]
  import org.omg.CORBA.ORB;
! import ccm.local.ServiceLocator;
  
  public class Server
--- 104,108 ----
  \begin{lstlisting}[language=Java]
  import org.omg.CORBA.ORB;
! import ccmtools.local.ServiceLocator;
  
  public class Server
***************
*** 117,121 ****
              ServiceLocator.instance().setCorbaOrb(orb);
  
!             application.ccm.remote.ServerHomeDeployment.deploy("ServerHome");
              System.out.println("ServerHome server is running...");
              orb.run();
--- 116,120 ----
              ServiceLocator.instance().setCorbaOrb(orb);
  
!             ccmtools.remote.application.ServerHomeDeployment.deploy("ServerHome");
              System.out.println("ServerHome server is running...");
              orb.run();
***************
*** 211,215 ****
  \begin{footnotesize}
  \begin{verbatim}
! > ccmjava -iface -clientlib                                     \
            -I../../idl3repo/interface -I../../idl3repo/component \
            -o ./src-gen                                          \
--- 210,214 ----
  \begin{footnotesize}
  \begin{verbatim}
! > ccmjava -iface -clientlib -remote                             \
            -I../../idl3repo/interface -I../../idl3repo/component \
            -o ./src-gen                                          \
***************
*** 240,246 ****
  \begin{lstlisting}[language=Java]
  import org.omg.CORBA.ORB;
! import application.ccm.local.*;
! import Components.ccm.local.HomeFinder;
! import ccm.local.ServiceLocator;
  
  public class Client
--- 239,245 ----
  \begin{lstlisting}[language=Java]
  import org.omg.CORBA.ORB;
! import application.*;
! import Components.HomeFinder;
! import ccmtools.local.ServiceLocator;
  
  public class Client

Index: LocalJavaComponents.tex
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/LoginExample/LocalJavaComponents.tex,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LocalJavaComponents.tex	7 Sep 2006 14:33:36 -0000	1.4
--- LocalJavaComponents.tex	18 Jan 2007 09:31:54 -0000	1.5
***************
*** 1,3 ****
- % $Id$
  %==============================================================================
  \section{Use Case 3: Local Java Components}
--- 1,2 ----
***************
*** 56,61 ****
  `-- src-gen
      `-- application
-         `-- ccm
-             `-- local
  \end{verbatim}
  \end{footnotesize}
--- 55,58 ----
***************
*** 95,104 ****
  |-- src
  |   `-- application
! |       `-- ccm
! |           `-- local
! |               |-- ServerHomeFactory.java
! |               |-- ServerHomeImpl.java
! |               |-- ServerImpl.java
! |               `-- ServerloginImpl.java
  `-- src-gen
  \end{verbatim}
--- 92,99 ----
  |-- src
  |   `-- application
! |         |-- ServerHomeFactory.java
! |         |-- ServerHomeImpl.java
! |         |-- ServerImpl.java
! |         `-- ServerloginImpl.java
  `-- src-gen
  \end{verbatim}
***************
*** 131,135 ****
  re--generated files are stored with a '{\tt .new}' suffix.
  
!  \vspace{3mm}
  To implement the Login example's business logic, you can open the 
  {\tt ServerloginImpl.java} file and implement the following code snippet:
--- 126,130 ----
  re--generated files are stored with a '{\tt .new}' suffix.
  
! \vspace{3mm}
  To implement the Login example's business logic, you can open the 
  {\tt ServerloginImpl.java} file and implement the following code snippet:
***************
*** 224,230 ****
  \begin{footnotesize}
  \begin{lstlisting}[language=Java]
! import application.ccm.local.*;
! import Components.ccm.local.HomeFinder;
! import ccm.local.ServiceLocator;
  
  public class ClientLocal
--- 219,225 ----
  \begin{footnotesize}
  \begin{lstlisting}[language=Java]
! import application.*;
! import Components.HomeFinder;
! import ccmtools.local.ServiceLocator;
  
  public class ClientLocal
***************
*** 263,267 ****
  try
  {            
!     HomeFinder homeFinder = ccm.local.HomeFinder.instance();
      ServerHome home = (ServerHome) homeFinder.find_home_by_name("ServerHome");
      Server server = home.create();
--- 258,262 ----
  try
  {            
!     HomeFinder homeFinder = HomeFinder.instance();
      ServerHome home = (ServerHome) homeFinder.find_home_by_name("ServerHome");
      Server server = home.create();

[ccmtools-cvs] ccmtools/doc/manual Titlepage.tex, 1.4, 1.5 CcmtoolsManual.pdf, 1.13, 1.14

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/doc/manual
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16354/doc/manual

Modified Files:
	Titlepage.tex CcmtoolsManual.pdf 
Log Message:
Changed manual to support new namespaces

Index: CcmtoolsManual.pdf
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/CcmtoolsManual.pdf,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CcmtoolsManual.pdf	30 Nov 2006 08:04:47 -0000	1.13
--- CcmtoolsManual.pdf	18 Jan 2007 09:31:54 -0000	1.14
***************
*** 334,342 ****
  endobj
  229 0 obj <<
! /Length 311       
  /Filter /FlateDecode
  >>
  stream
! xÚMQËNÃ0¼ç+ö†-‘ßŽ-­R‘Â	q(!-MC“–ïgíPTÙmf73Úñ¬.ª¥Œ :§¡Þ€Ô£ó`½Ã ,Ô¯ìóÄ%;}ÜUUÓv‰ì{‚ýˆ„c*ÏAÓnR+•Û–

[ccmtools-cvs] ccmtools/doc/manual/HelloWorldExample .cvsignore, NONE, 1.1 HelloWorldExample.tex, 1.1, 1.2

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/doc/manual/HelloWorldExample
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16354/doc/manual/HelloWorldExample

Modified Files:
	HelloWorldExample.tex 
Added Files:
	.cvsignore 
Log Message:
Changed manual to support new namespaces

--- NEW FILE: .cvsignore ---
HelloWorldExample.dvi

Index: HelloWorldExample.tex
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/HelloWorldExample/HelloWorldExample.tex,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HelloWorldExample.tex	30 Nov 2006 08:04:48 -0000	1.1
--- HelloWorldExample.tex	18 Jan 2007 09:31:55 -0000	1.2
***************
*** 88,92 ****
  CCM Tools generate the following file structure which represents a local
  component's implementation.
! Code contained in the {\tt CCM\_*} directories establishes the component's
  structure (= {\it component logic}), while code stored in the {\tt Server} 
  directory represents the functional part of a component (= {\it business
--- 88,92 ----
  CCM Tools generate the following file structure which represents a local
  component's implementation.
! Code contained in the {\tt GEN\_*} directories establishes the component's
  structure (= {\it component logic}), while code stored in the {\tt Server} 
  directory represents the functional part of a component (= {\it business
***************
*** 99,104 ****
      |-- component
      |   `-- Server
!     |       |-- CCM_world_ccm_local
!     |       |-- CCM_world_ccm_local_share
      |       |-- ServerHome_impl.cc
      |       |-- ServerHome_impl.h
--- 99,104 ----
      |-- component
      |   `-- Server
!     |       |-- GEN_ccmtools_local_world
!     |       |-- GEN_ccmtools_local_world_share
      |       |-- ServerHome_impl.cc
      |       |-- ServerHome_impl.h
***************
*** 107,114 ****
      |       |-- Server_impl.cc
      |       |-- Server_impl.h
!     |       `-- world_ccm_local_ServerHome_entry.h
      `-- interface
!         |-- CCM_world_ccm_local
!         `-- CCM_world_ccm_local_adapter
  \end{verbatim}
  \end{small}
--- 107,114 ----
      |       |-- Server_impl.cc
      |       |-- Server_impl.h
!     |       `-- world_ServerHome_entry.h
      `-- interface
!         |-- GEN_ccmtools_local_world
!         `-- GEN_world
  \end{verbatim}
  \end{small}
***************
*** 124,128 ****
  std::string
  Server_hello_impl::sayHello()
!     throw(Components::ccm::local::CCMException)
  {
      // TODO : IMPLEMENT ME HERE !
--- 124,128 ----
  std::string
  Server_hello_impl::sayHello()
!     throw(Components::CCMException)
  {
      // TODO : IMPLEMENT ME HERE !
***************
*** 142,146 ****
     server/component/server
      |-- test
!     |   `-- _check_world_ccm_local_Server.cc
  \end{verbatim}
  \end{small}
--- 142,146 ----
     server/component/server
      |-- test
!     |   `-- _check_world_Server.cc
  \end{verbatim}
  \end{small}
***************
*** 148,152 ****
  \noindent
  The following client code snippets are stored in the 
! {\tt \_check\_world\_ccm\_local\_Server.cc} file:
  \begin{small}
  \begin{verbatim}
--- 148,152 ----
  \noindent
  The following client code snippets are stored in the 
! {\tt \_check\_world\_Server.cc} file:
  \begin{small}
  \begin{verbatim}
***************
*** 154,176 ****
  #include <iostream>
  
! #include <wx/utils/debug.h>
! #include <wx/utils/smartptr.h>
! 
! #include <Components/ccm/local/CCM.h>
! #include <ccm/local/HomeFinder.h>
! 
! #include <world/ccm/local/Server_gen.h>
! #include <world/ccm/local/ServerHome_gen.h>
  
  using namespace std;
! using namespace wx::utils;
! using namespace world::ccm::local;
  
  int main(int argc, char *argv[])
  {
!     int error = 0;
!     Components::ccm::local::HomeFinder* homeFinder = 
!         ccm::local::HomeFinder::Instance();
!     error = deploy_world_ccm_local_ServerHome("ServerHome");
      if(error)
      {
--- 154,166 ----
  #include <iostream>
  
! #include <Components/ccmtools.h>
! #include <world/ServerHome_gen.h>
  
  using namespace std;
! using namespace world;
  
  int main(int argc, char *argv[])
  {
!     int error = deploy_world_ServerHome("ServerHome");
      if(error)
      {
***************
*** 181,190 ****
      try
      {
!         SmartPtr<ServerHome> home(
!             dynamic_cast<ServerHome*>(
!                 homeFinder->find_home_by_name("ServerHome").ptr()));
  
!         SmartPtr<Server> component;
!         SmartPtr<Hello> hello;
  
          component = home->create();
--- 171,182 ----
      try
      {
!         Components::HomeFinder* homeFinder = 
!             Components::HomeFinder::Instance();
  
!         ServerHome::SmartPtr home(dynamic_cast<ServerHome*>(
!             homeFinder->find_home_by_name("ServerHome").ptr()));
! 
!         Server::SmartPtr component;
!         Hello::SmartPtr hello;
  
          component = home->create();
***************
*** 199,214 ****
          component->remove();
      }
!     catch(Components::ccm::local::Exception& e)
      {
!         cout << "CCMTOOLS ERROR: " << e.what() << endl;
          return -1;
      }
!     catch ( ... )
      {
!         cout << "UNKNOWN ERROR!" << endl;
          return -1;
      }
  
!     error = undeploy_world_ccm_local_ServerHome("ServerHome");
      if(error)
      {
--- 191,206 ----
          component->remove();
      }
!     catch(Components::Exception& e)
      {
!         cerr << "CCMTOOLS ERROR: " << e.what() << endl;
          return -1;
      }
!     catch(...)
      {
!         cerr << "UNKNOWN ERROR!" << endl;
          return -1;
      }
  
!     error = undeploy_world_ServerHome("ServerHome");
      if(error)
      {
***************
*** 217,221 ****
      }
  
!     ccm::local::HomeFinder::destroy();
  }
  \end{verbatim}
--- 209,213 ----
      }
  
!     Components::HomeFinder::destroy();
  }
  \end{verbatim}
***************
*** 248,252 ****
  \begin{verbatim}
  sayHello(): Hello from Server component!
! PASS: hello_world_component_Server_test__check_world_ccm_local_Server
  ==================
  All 1 tests passed
--- 240,244 ----
  \begin{verbatim}
  sayHello(): Hello from Server component!
! PASS: hello_world_component_Server_test__check_world_Server
  ==================
  All 1 tests passed

[ccmtools-cvs] ccmtools/src/ccmtools/metamodel CcmModelValidator.java, 1.5, 1.6

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/metamodel
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18519/src/ccmtools/metamodel

Modified Files:
	CcmModelValidator.java 
Log Message:
Bugfix: added '-' in the create_ComponentHome() operations used as the component's implementation enty point.
Allowed the 'oneway' keyword for ccmtools IDL

Index: CcmModelValidator.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/metamodel/CcmModelValidator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CcmModelValidator.java	27 Nov 2006 21:13:20 -0000	1.5
--- CcmModelValidator.java	17 Jan 2007 17:47:09 -0000	1.6
***************
*** 446,455 ****
  	{
          logger.fine("MOperationDef"); 
! 		if(in.isOneway())
! 		{
!             addError("'oneway' operations like " + 
!                     in.getDefinedIn().getIdentifier() + "::" +
!                     in.getIdentifier() + "()'");
! 		}
  		validate(in.getIdlType());
  		for(Iterator i = in.getParameters().iterator(); i.hasNext();)
--- 446,455 ----
  	{
          logger.fine("MOperationDef"); 
! //		if(in.isOneway())
! //		{
! //            addError("'oneway' operations like " + 
! //                    in.getDefinedIn().getIdentifier() + "::" +
! //                    in.getIdentifier() + "()'");
! //		}
  		validate(in.getIdlType());
  		for(Iterator i = in.getParameters().iterator(); i.hasNext();)

[ccmtools-cvs] ccmtools/src/templates/CppLocalTemplates MHomeDef, 1.23, 1.24

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18519/src/templates/CppLocalTemplates

Modified Files:
	MHomeDef 
Log Message:
Bugfix: added '-' in the create_ComponentHome() operations used as the component's implementation enty point.
Allowed the 'oneway' keyword for ccmtools IDL

Index: MHomeDef
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MHomeDef,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** MHomeDef	5 Jan 2007 14:17:25 -0000	1.23
--- MHomeDef	17 Jan 2007 17:47:09 -0000	1.24
***************
*** 146,150 ****
  {
      local_home = dynamic_cast< %(LocalNamespace)sCCM_%(Identifier)s*>(
!         create%(AbsoluteLocalHomeName)s());
      assembly_factory = ::Components::AssemblyFactory::SmartPtr();
  }
--- 146,150 ----
  {
      local_home = dynamic_cast< %(LocalNamespace)sCCM_%(Identifier)s*>(
!         create_%(AbsoluteLocalHomeName)s());
      assembly_factory = ::Components::AssemblyFactory::SmartPtr();
  }
***************
*** 154,158 ****
  {
      local_home = dynamic_cast< %(LocalNamespace)sCCM_%(Identifier)s*>(
!         create%(AbsoluteLocalHomeName)s());
  }
  
--- 154,158 ----
  {
      local_home = dynamic_cast< %(LocalNamespace)sCCM_%(Identifier)s*>(
!         create_%(AbsoluteLocalHomeName)s());
  }
  
***************
*** 341,345 ****
  
  ::Components::HomeExecutorBase* 
! create%(AbsoluteLocalHomeName)s();
  
  #endif // __HOME_%(PreprocIdentifier)s_ENTRY__H__
--- 341,345 ----
  
  ::Components::HomeExecutorBase* 
! create_%(AbsoluteLocalHomeName)s();
  
  #endif // __HOME_%(PreprocIdentifier)s_ENTRY__H__
***************
*** 449,453 ****
  
  Components::HomeExecutorBase*
! create%(AbsoluteLocalHomeName)s()
  {
      return dynamic_cast<Components::HomeExecutorBase*>(
--- 449,453 ----
  
  Components::HomeExecutorBase*
! create_%(AbsoluteLocalHomeName)s()
  {
      return dynamic_cast<Components::HomeExecutorBase*>(

[ccmtools-cvs] ccmtools/test/JavaRemoteComponents/facet_oneway/src Client.java, NONE, 1.1 Server.java, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_oneway/src
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17801/test/JavaRemoteComponents/facet_oneway/src

Added Files:
	Client.java Server.java 
Log Message:
Added oneway operation test case for remote Java components.

--- NEW FILE: Client.java ---
import org.omg.CORBA.ORB;
import org.omg.CORBA.StringHolder;
import org.omg.CosNaming.NamingContextExt;
import org.omg.CosNaming.NamingContextExtHelper;

import world.*;
import ccmtools.local.ServiceLocator;
import Components.HomeFinder;

import java.util.logging.*;

public class Client
{
    private static boolean isTest;

    public static void main(String[] args)
    {
        // Configure Logger
        Logger logger = Logger.getLogger("test");
        logger.setLevel(Level.FINER);
        Handler handler = new ConsoleHandler();
        handler.setLevel(Level.ALL);
        handler.setFormatter(new ccmtools.utils.SimpleFormatter());
        logger.addHandler(handler);
        ccmtools.local.ServiceLocator.instance().setLogger(logger);

	try
	{
	    // Setup client library component
            ORB orb = ORB.init(args, null);
            ServiceLocator.instance().setCorbaOrb(orb);
            TestHomeClientLibDeployment.deploy("TestHome");
	    

	    // Use client library component to access a corba component
            HomeFinder homeFinder = Components.HomeFinder.instance();
            TestHome home = (TestHome) homeFinder.find_home_by_name("TestHome");
            Test component = home.create();
            component.configuration_complete();

            IFace port = component.provide_port();
	    
	    System.out.println(">>> before foo()");
            port.foo("11111111111");
	    System.out.println(">>> after first foo()");
            port.foo("22222222222");
	    System.out.println(">>> after second foo()");

            component.remove();


	    // Tear down client library component
	    TestHomeClientLibDeployment.undeploy("TestHome");
            System.out.println("OK!");
        }
        catch (Exception e)
        {
            e.printStackTrace();
        }
        finally
        {
            // Tear down the ServiceLocator singleton
            ServiceLocator.instance().destroy();
        }
    }
}

--- NEW FILE: Server.java ---
import org.omg.CORBA.ORB;
import org.omg.CORBA.StringHolder;
import org.omg.CosNaming.NamingContextExt;
import org.omg.CosNaming.NamingContextExtHelper;

import world.*;
import ccmtools.local.ServiceLocator;
import Components.HomeFinder;

import java.util.logging.*;

public class Server
{
    private static boolean isTest;

    public static void main(String[] args)
    {
        // Configure Logger
        Logger logger = Logger.getLogger("test");
        logger.setLevel(Level.FINER);
        Handler handler = new ConsoleHandler();
        handler.setLevel(Level.ALL);
        handler.setFormatter(new ccmtools.utils.SimpleFormatter());
        logger.addHandler(handler);
        ccmtools.local.ServiceLocator.instance().setLogger(logger);
	
        try 
        {
	    // Setup CORBA component
	    ORB orb = ORB.init(args, null);
	    ServiceLocator.instance().setCorbaOrb(orb);		
	    ccmtools.remote.world.TestHomeDeployment.deploy("TestHome");
	    System.out.println("> Server is running...");
	    orb.run();
	    

	    // Tear down CORBA component
            ccmtools.remote.world.TestHomeDeployment.undeploy("TestHome");
            System.out.println("OK!");
        }
        catch (Exception e)
        {
            e.printStackTrace();
        }
        finally
        {
            // Tear down the ServiceLocator singleton
            ServiceLocator.instance().destroy();
        }
    }
}

[ccmtools-cvs] ccmtools/test/JavaRemoteComponents/facet_oneway/bin runClient, NONE, 1.1 runServer, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_oneway/bin
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17801/test/JavaRemoteComponents/facet_oneway/bin

Added Files:
	runClient runServer 
Log Message:
Added oneway operation test case for remote Java components.

--- NEW FILE: runClient ---
#!/bin/sh

if [ -z "$CCMTOOLS_HOME" ]; then
echo "ERROR!"
echo "Environment variable CCMTOOLS_HOME not found!"
exit
fi

CLASSPATH=$CCMTOOLS_HOME/lib/ccm-runtime.jar:./xxx/build:$CLASSPATH

$JAVA_HOME/bin/java -enableassertions -cp $CLASSPATH Client -ORBInitRef NameService=$CCM_NAME_SERVICE -ORBServerHost ${HOSTNAME}

# Note: If a Java application creates a CORBA object reference, we
# have to set -ORBServerHost ${HOSTNAME}. This ${HOSTNAME} will be
# part of the generated CORBA object reference (or IOR)!!
--- NEW FILE: runServer ---
#!/bin/sh

if [ -z "$CCMTOOLS_HOME" ]; then
echo "ERROR!"
echo "Environment variable CCMTOOLS_HOME not found!"
exit
fi

CLASSPATH=$CCMTOOLS_HOME/lib/ccm-runtime.jar:./xxx/build:$CLASSPATH

$JAVA_HOME/bin/java -enableassertions -cp $CLASSPATH Server -ORBInitRef NameService=$CCM_NAME_SERVICE -ORBServerHost ${HOSTNAME}

# Note: If a Java application creates a CORBA object reference, we
# have to set -ORBServerHost ${HOSTNAME}. This ${HOSTNAME} will be
# part of the generated CORBA object reference (or IOR)!!

[ccmtools-cvs] ccmtools/test/JavaRemoteComponents/facet_oneway Test.idl, NONE, 1.1 Makefile, NONE, 1.1 build.xml, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_oneway
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17801/test/JavaRemoteComponents/facet_oneway

Added Files:
	Test.idl Makefile build.xml 
Log Message:
Added oneway operation test case for remote Java components.

--- NEW FILE: Makefile ---
DEST_DIR = xxx
IDL3_DIR = ${DEST_DIR}/idl3
IDL2_DIR = ${DEST_DIR}/idl2
INCLUDE  = -I${IDL3_DIR}/interface -I${IDL3_DIR}/component

all: clientlib


idl3: Test.idl
	ccmmodel -validator Test.idl
	ccmidl -idl3 -o ${IDL3_DIR} Test.idl

local: idl3
	ccmjava -iface -local -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/interface/world/*.idl
	ccmjava -iface -local -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/component/world/Test*.idl
	ccmjava -app -o ${DEST_DIR}/src ${INCLUDE} ${IDL3_DIR}/component/world/Test*.idl

stubs: local
	ccmidl -idl2 -o ${IDL2_DIR} Test.idl
	ccmtools-idl -java -o ${DEST_DIR}/src-gen -I${CCMTOOLS_HOME}/idl -I${IDL2_DIR} ${IDL2_DIR}/*.idl

remote: stubs
	ccmjava -remote -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/interface/world/*.idl
	ccmjava -remote -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/component/world/Test*.idl

clientlib: remote
	ccmjava -clientlib -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/interface/world/*.idl
	ccmjava -clientlib -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/component/world/Test*.idl


server: 
	cp impl/TestImpl.java ${DEST_DIR}/src/world/
	cp impl/TestportImpl.java ${DEST_DIR}/src/world/
	ant -f ./build.xml
	bin/runServer

client:
	bin/runClient

clean: 
	rm -rf ${DEST_DIR}


--- NEW FILE: build.xml ---
<project name="JavaClientLibTest" default="compile">

  <property name="dest" location="xxx" />
  <property name="idl2" location="${dest}/idl2" />
  <property name="src-gen" location="${dest}/src-gen" />
  <property name="src-app" location="${dest}/src" />
  <property name="build" location="${dest}/build" />
  <property name="src" location="src" />
	
  <path id="compile.classpath">
      <pathelement path="${java.class.path}" />
  </path>


  <!-- Create the build directory-->
  <target name="init" description="" >
      <mkdir dir="${build}" />
  </target>
 

  <!-- Compile generated Java files-->
  <target name="compile" depends="init" description="" >
      <javac srcdir="${src-gen}:${src-app}:${src}" destdir="${build}" 
             debug="on" source="1.5" target="1.5">
          <classpath refid="compile.classpath" />  
      </javac>
  </target>


  <!-- Clean up -->
  <target name="clean" description="" >
      <delete dir="${build}" />
  </target>

</project>
--- NEW FILE: Test.idl ---

module world 
{

  interface IFace
  {
	/**
	 * Operations can be declared oneway if it is desirable for the caller to
	 * send a noncritical message to an object.
	 * Oneway operation invocations will use best-effort semantics!!!
	 * The caller will get an immediate return and cannot know for certain
	 * if the request has been invoked.
	 * 
	 * For obvious reasons there can be no "out" or "inout" parameters
	 * declared in oneway operatios. There must be no raises clause, and the
	 * operation must have a void return type.
	 */
    oneway void foo(in string str);
  };


  component Test
  {
    provides IFace port;
  };

  home TestHome manages Test
  {
  };

}; // /module world

[ccmtools-cvs] ccmtools/test/JavaRemoteComponents/facet_oneway/impl TestImpl.java, NONE, 1.1 TestportImpl.java, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_oneway/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17801/test/JavaRemoteComponents/facet_oneway/impl

Added Files:
	TestImpl.java TestportImpl.java 
Log Message:
Added oneway operation test case for remote Java components.

--- NEW FILE: TestImpl.java ---
/**
 * This file was automatically generated by CCM Tools
 * <http://ccmtools.sourceforge.net>
 * 
 * CCM_Test component business logic.
 *
 * // TODO: WRITE YOUR DESCRIPTION HERE !
 *
 * @author
 * @version
 */

package world;
   
import Components.CCMException;     
import Components.SessionContext; 

/**
 * This class implements component equivalent and supported interfaces
 * as well as component attributes.
 * Additionally, session component callback methods must be implemented.
 *
 * // TODO: WRITE YOUR DESCRIPTION HERE !
 *
 * @author
 * @version
 */   
public class TestImpl 
    implements CCM_Test
{
    /** Supported interface attribute variables */
    
    

    /** Component attribute variables */
     

    public CCM_Test_Context ctx;
    
    
    public TestImpl()
    {
        // OPTIONAL: IMPLEMENT ME HERE !
    }


    /* 
     * Supported interface methods 
     */

    /** Supported interface attributes */
    
    
    
    /** Supported interface methods */
        


    /** Component attribute accessor methods */
    


    /** Facet implementation factory methods */
    

    public world.CCM_IFace get_port()
    {
        return new world.TestportImpl(this);
    }
    

    /** Component callback methods */
    
    public void set_session_context(SessionContext ctx) 
        throws CCMException
    {
        this.ctx = (CCM_Test_Context)ctx; 
    }

    public void ccm_activate() 
        throws CCMException
    {
        // OPTIONAL: IMPLEMENT ME HERE !
	System.out.println(">> ccm_activate()");

    }

    public void ccm_passivate() 
        throws CCMException
    {
        // OPTIONAL: IMPLEMENT ME HERE !
    }

    public void ccm_remove() 
        throws CCMException
    {
        // OPTIONAL: IMPLEMENT ME HERE !
	System.out.println(">> ccm_remove()");
    }
}

--- NEW FILE: TestportImpl.java ---
/**
 * This file was automatically generated by CCM Tools version 0.6.6
 * <http://ccmtools.sourceforge.net>
 * 
 * CCM_IFaceImpl facet implementation.
 *
 * // TODO: WRITE YOUR DESCRIPTION HERE !
 * 
 * @author
 * @version
 */

package world;

import Components.CCMException;
   

/** 
 * This class implements a component facet's methods.
 *
 * // TODO: WRITE YOUR DESCRIPTION HERE !
 *
 * @author
 * @version
 */
public class TestportImpl 
    implements CCM_IFace
{
    /** Reference to the facet's component implementation */
    private TestImpl component;

    public TestportImpl(TestImpl component)
    {
        this.component = component;
    }
 
    /** Business logic implementations */

    public void foo(String str)
        throws CCMException
    {
	try 
	{
            System.out.println(">>> enter foo(\"" + str + "\")");
	    // wait to simulate an expensive operation
            Thread.sleep(10000);  
	    System.out.println(">>> leave foo(\"" + str + "\")");
	}
	catch(Exception e) 
        {
            e.printStackTrace();
        }
    }    

}

[ccmtools-cvs] ccmtools/test/JavaRemoteComponents/facet_oneway/impl - New directory

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_oneway/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17772/test/JavaRemoteComponents/facet_oneway/impl

Log Message:
Directory /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_oneway/impl added to the repository

[ccmtools-cvs] ccmtools/test/JavaRemoteComponents/facet_oneway/bin - New directory

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_oneway/bin
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17772/test/JavaRemoteComponents/facet_oneway/bin

Log Message:
Directory /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_oneway/bin added to the repository

[ccmtools-cvs] ccmtools/test/JavaRemoteComponents/facet_oneway/src - New directory

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_oneway/src
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17772/test/JavaRemoteComponents/facet_oneway/src

Log Message:
Directory /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_oneway/src added to the repository

[ccmtools-cvs] ccmtools/test/tutorial/Login/java/server/impl ServerloginImpl.java, 1.1, 1.2 ClientLocal.java, 1.1, 1.2 Server.java, 1.1, 1.2

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/tutorial/Login/java/server/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/Login/java/server/impl

Modified Files:
	ServerloginImpl.java ClientLocal.java Server.java 
Log Message:
Changed manual examples to support the new namespaces.

Index: ClientLocal.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/tutorial/Login/java/server/impl/ClientLocal.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClientLocal.java	1 Sep 2006 11:52:11 -0000	1.1
--- ClientLocal.java	17 Jan 2007 17:44:13 -0000	1.2
***************
*** 6,17 ****
  import org.omg.CORBA.ORB;
  
! import application.ccm.local.Group;
! import application.ccm.local.Login;
! import application.ccm.local.PersonData;
! import application.ccm.local.InvalidPersonData;
! import application.ccm.local.Server;
! import application.ccm.local.ServerHome;
! import Components.ccm.local.HomeFinder;
! import ccm.local.ServiceLocator;
  
  public class ClientLocal
--- 6,17 ----
  import org.omg.CORBA.ORB;
  
! import application.Group;
! import application.Login;
! import application.PersonData;
! import application.InvalidPersonData;
! import application.Server;
! import application.ServerHome;
! import Components.HomeFinder;
! import ccmtools.local.ServiceLocator;
  
  public class ClientLocal
***************
*** 28,34 ****
          Handler handler = new ConsoleHandler();
          handler.setLevel(Level.ALL);
!         handler.setFormatter(new ccm.local.MinimalFormatter());
          logger.addHandler(handler);
!         ccm.local.ServiceLocator.instance().setLogger(logger);
  
          /**
--- 28,34 ----
          Handler handler = new ConsoleHandler();
          handler.setLevel(Level.ALL);
!         handler.setFormatter(new ccmtools.utils.SimpleFormatter());
          logger.addHandler(handler);
!         ServiceLocator.instance().setLogger(logger);
  
          /**
***************
*** 37,41 ****
          try
          {
!             application.ccm.local.ServerHomeDeployment.deploy(COMPONENT_HOME_NAME);
          }
          catch (Exception e)
--- 37,41 ----
          try
          {
!             application.ServerHomeDeployment.deploy(COMPONENT_HOME_NAME);
          }
          catch (Exception e)
***************
*** 50,54 ****
          try
          {            
!             HomeFinder homeFinder = ccm.local.HomeFinder.instance();
              ServerHome home = (ServerHome) homeFinder.find_home_by_name(COMPONENT_HOME_NAME);
              Server server = home.create();
--- 50,54 ----
          try
          {            
!             HomeFinder homeFinder = HomeFinder.instance();
              ServerHome home = (ServerHome) homeFinder.find_home_by_name(COMPONENT_HOME_NAME);
              Server server = home.create();
***************
*** 101,105 ****
          try
          {
!             application.ccm.local.ServerHomeDeployment.undeploy(COMPONENT_HOME_NAME);
          }
          catch (Exception e)
--- 101,105 ----
          try
          {
!             application.ServerHomeDeployment.undeploy(COMPONENT_HOME_NAME);
          }
          catch (Exception e)

Index: ServerloginImpl.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/tutorial/Login/java/server/impl/ServerloginImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ServerloginImpl.java	1 Sep 2006 11:52:11 -0000	1.1
--- ServerloginImpl.java	17 Jan 2007 17:44:12 -0000	1.2
***************
*** 1,4 ****
  /**
!  * This file was automatically generated by CCM Tools version 0.7.0
   * <http://ccmtools.sourceforge.net>
   * 
--- 1,4 ----
  /**
!  * This file was automatically generated by CCM Tools 
   * <http://ccmtools.sourceforge.net>
   * 
***************
*** 11,19 ****
   */
  
! package application.ccm.local; 
  
- import Components.ccm.local.CCMException;
     
- 
  /** 
   * This class implements a component facet's methods.
--- 11,17 ----
   */
  
! package application; 
  
     
  /** 
   * This class implements a component facet's methods.
***************
*** 34,49 ****
          this.component = component;
      }
-  
- 
  
      /** Business logic implementations */
  
-    
-     
-      
- 
      public boolean isValidUser(PersonData person)
!         throws CCMException,
!             InvalidPersonData
      {
          if(person.getName().length() == 0)
--- 32,40 ----
          this.component = component;
      }
  
      /** Business logic implementations */
  
      public boolean isValidUser(PersonData person)
!         throws Components.CCMException, InvalidPersonData
      {
          if(person.getName().length() == 0)
***************
*** 61,64 ****
          }
      }    
- 
  }
--- 52,54 ----

Index: Server.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/tutorial/Login/java/server/impl/Server.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Server.java	1 Sep 2006 11:52:11 -0000	1.1
--- Server.java	17 Jan 2007 17:44:13 -0000	1.2
***************
*** 6,10 ****
  import org.omg.CORBA.ORB;
  
! import ccm.local.ServiceLocator;
  
  public class Server
--- 6,10 ----
  import org.omg.CORBA.ORB;
  
! import ccmtools.local.ServiceLocator;
  
  public class Server
***************
*** 25,31 ****
          Handler handler = new ConsoleHandler();
          handler.setLevel(Level.ALL);
!         handler.setFormatter(new ccm.local.MinimalFormatter());
          logger.addHandler(handler);
!         ccm.local.ServiceLocator.instance().setLogger(logger);
  
          
--- 25,31 ----
          Handler handler = new ConsoleHandler();
          handler.setLevel(Level.ALL);
!         handler.setFormatter(new ccmtools.utils.SimpleFormatter());
          logger.addHandler(handler);
!         ServiceLocator.instance().setLogger(logger);
  
          
***************
*** 36,40 ****
              ServiceLocator.instance().setCorbaOrb(orb);
  
!             application.ccm.remote.ServerHomeDeployment.deploy(COMPONENT_HOME_NAME);
              System.out.println("> Server is running...");
              orb.run();
--- 36,40 ----
              ServiceLocator.instance().setCorbaOrb(orb);
  
!             ccmtools.remote.application.ServerHomeDeployment.deploy(COMPONENT_HOME_NAME);
              System.out.println("> Server is running...");
              orb.run();

[ccmtools-cvs] ccmtools/test/tutorial/Login/c++/server .cvsignore, 1.1, 1.2 Makefile, 1.4, 1.5

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/tutorial/Login/c++/server
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/Login/c++/server

Modified Files:
	.cvsignore Makefile 
Log Message:
Changed manual examples to support the new namespaces.

Index: .cvsignore
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/tutorial/Login/c++/server/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	1 Sep 2006 11:52:01 -0000	1.1
--- .cvsignore	17 Jan 2007 17:44:12 -0000	1.2
***************
*** 1 ****
--- 1,2 ----
  src-gen
+ src

Index: Makefile
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/tutorial/Login/c++/server/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	16 Oct 2006 14:55:25 -0000	1.4
--- Makefile	17 Jan 2007 17:44:12 -0000	1.5
***************
*** 14,18 ****
  	ccmtools c++local-test ${INCLUDE} -o ${DEST_DIR}/component/Server ${IDL3_DIR}/component/application/Server.idl
  	cp impl/Server_login_impl.cc ${DEST_DIR}/component/Server/
! 	cp impl/_check_application_ccm_local_Server.cc ${DEST_DIR}/component/Server/test/
  	ccmconfix -confix2 -o ${DEST_DIR} -pname "login" -pversion "1.0.0" 
  	confix2.py --packageroot=`pwd`/${DEST_DIR} --bootstrap --configure --make --targets=check
--- 14,18 ----
  	ccmtools c++local-test ${INCLUDE} -o ${DEST_DIR}/component/Server ${IDL3_DIR}/component/application/Server.idl
  	cp impl/Server_login_impl.cc ${DEST_DIR}/component/Server/
! 	cp impl/_check_application_Server.cc ${DEST_DIR}/component/Server/test/
  	ccmconfix -confix2 -o ${DEST_DIR} -pname "login" -pversion "1.0.0" 
  	confix2.py --packageroot=`pwd`/${DEST_DIR} --bootstrap --configure --make --targets=check
***************
*** 30,38 ****
  
  
! stubs: #local
! 	ccmidl -idl2 ${INCLUDE} -o ${DEST_DIR}/component/Server/CCM_corba_stubs ${IDL3_DIR}/interface/application/*.idl
! 	ccmidl -idl2 ${INCLUDE} -o ${DEST_DIR}/component/Server/CCM_corba_stubs ${IDL3_DIR}/component/application/Server*.idl
! 	cp impl/Makefile ${DEST_DIR}/component/Server/CCM_corba_stubs
! 	make -C ${DEST_DIR}/component/Server/CCM_corba_stubs 
  
  remote: stubs
--- 30,38 ----
  
  
! stubs: 
! 	ccmidl -idl2 ${INCLUDE} -o ${DEST_DIR}/component/Server/GEN_ccmtools_corba_stubs ${IDL3_DIR}/interface/application/*.idl
! 	ccmidl -idl2 ${INCLUDE} -o ${DEST_DIR}/component/Server/GEN_ccmtools_corba_stubs ${IDL3_DIR}/component/application/Server*.idl
! 	cp impl/Makefile ${DEST_DIR}/component/Server/GEN_ccmtools_corba_stubs
! 	make -C ${DEST_DIR}/component/Server/GEN_ccmtools_corba_stubs 
  
  remote: stubs
***************
*** 43,47 ****
  	ccmtools c++remote-test ${INCLUDE} -o ${DEST_DIR}/component/Server ${IDL3_DIR}/component/application/Server.idl 
  	cp impl/Server_login_impl.cc ${DEST_DIR}/component/Server/
! 	cp impl/_check_application_ccm_remote_Server.cc ${DEST_DIR}/component/Server/test/
  	ccmconfix -confix2 -o ${DEST_DIR} -pname "login" -pversion "1.0.0" 
  	confix2.py --packageroot=`pwd`/${DEST_DIR} --bootstrap --configure --make --targets=check
--- 43,47 ----
  	ccmtools c++remote-test ${INCLUDE} -o ${DEST_DIR}/component/Server ${IDL3_DIR}/component/application/Server.idl 
  	cp impl/Server_login_impl.cc ${DEST_DIR}/component/Server/
! 	cp impl/_check_ccmtools_remote_application_Server.cc ${DEST_DIR}/component/Server/test/
  	ccmconfix -confix2 -o ${DEST_DIR} -pname "login" -pversion "1.0.0" 
  	confix2.py --packageroot=`pwd`/${DEST_DIR} --bootstrap --configure --make --targets=check

[ccmtools-cvs] ccmtools/test/tutorial/CarRental .cvsignore, 1.3, NONE Makefile, 1.7, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/tutorial/CarRental
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/CarRental

Removed Files:
	.cvsignore Makefile 
Log Message:
Changed manual examples to support the new namespaces.

--- .cvsignore DELETED ---

--- Makefile DELETED ---

[ccmtools-cvs] ccmtools/test/tutorial/Login/java/client/src Client.java, 1.2, 1.3

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/tutorial/Login/java/client/src
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/Login/java/client/src

Modified Files:
	Client.java 
Log Message:
Changed manual examples to support the new namespaces.

Index: Client.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/tutorial/Login/java/client/src/Client.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Client.java	5 Sep 2006 15:20:48 -0000	1.2
--- Client.java	17 Jan 2007 17:44:14 -0000	1.3
***************
*** 6,18 ****
  import org.omg.CORBA.ORB;
  
! import application.ccm.local.Group;
! import application.ccm.local.Login;
! import application.ccm.local.PersonData;
! import application.ccm.local.InvalidPersonData;
! import application.ccm.local.Server;
! import application.ccm.local.ServerHome;
! import application.ccm.local.ServerHomeClientLibDeployment;
! import Components.ccm.local.HomeFinder;
! import ccm.local.ServiceLocator;
  
  public class Client
--- 6,18 ----
  import org.omg.CORBA.ORB;
  
! import application.Group;
! import application.Login;
! import application.PersonData;
! import application.InvalidPersonData;
! import application.Server;
! import application.ServerHome;
! import application.ServerHomeClientLibDeployment;
! import Components.HomeFinder;
! import ccmtools.local.ServiceLocator;
  
  public class Client
***************
*** 29,35 ****
          Handler handler = new ConsoleHandler();
          handler.setLevel(Level.ALL);
!         handler.setFormatter(new ccm.local.MinimalFormatter());
          logger.addHandler(handler);
!         ccm.local.ServiceLocator.instance().setLogger(logger);
  
          /**
--- 29,35 ----
          Handler handler = new ConsoleHandler();
          handler.setLevel(Level.ALL);
!         handler.setFormatter(new ccmtools.utils.SimpleFormatter());
          logger.addHandler(handler);
!         ServiceLocator.instance().setLogger(logger);
  
          /**
***************
*** 54,58 ****
          try
          {            
!             HomeFinder homeFinder = ccm.local.HomeFinder.instance();
              ServerHome home = (ServerHome) homeFinder.find_home_by_name(COMPONENT_HOME_NAME);
              Server server = home.create();
--- 54,58 ----
          try
          {            
!             HomeFinder homeFinder = HomeFinder.instance();
              ServerHome home = (ServerHome) homeFinder.find_home_by_name(COMPONENT_HOME_NAME);
              Server server = home.create();

[ccmtools-cvs] ccmtools/test/tutorial/CarRentalJavaClient/src Client.java, 1.2, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/tutorial/CarRentalJavaClient/src
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/CarRentalJavaClient/src

Removed Files:
	Client.java 
Log Message:
Changed manual examples to support the new namespaces.

--- Client.java DELETED ---

[ccmtools-cvs] ccmtools/test/tutorial/CarRental/impl/corba_client client.cc, 1.1, NONE Makefile.py, 1.1, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/tutorial/CarRental/impl/corba_client
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/CarRental/impl/corba_client

Removed Files:
	client.cc Makefile.py 
Log Message:
Changed manual examples to support the new namespaces.

--- Makefile.py DELETED ---

--- client.cc DELETED ---

[ccmtools-cvs] ccmtools/test/tutorial/CarRentalJavaClient build.xml, 1.1, NONE Makefile, 1.1, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/tutorial/CarRentalJavaClient
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/CarRentalJavaClient

Removed Files:
	build.xml Makefile 
Log Message:
Changed manual examples to support the new namespaces.

--- Makefile DELETED ---

--- build.xml DELETED ---

[ccmtools-cvs] ccmtools/test/tutorial/HelloWorld/impl _check_world_Server.cc, NONE, 1.1 Server_hello_impl.cc, 1.3, 1.4 _check_world_ccm_local_Server.cc, 1.1, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/tutorial/HelloWorld/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/HelloWorld/impl

Modified Files:
	Server_hello_impl.cc 
Added Files:
	_check_world_Server.cc 
Removed Files:
	_check_world_ccm_local_Server.cc 
Log Message:
Changed manual examples to support the new namespaces.

--- NEW FILE: _check_world_Server.cc ---
/***
 * CCM Tools Test Client 
 *
 * This file was automatically generated by CCM Tools 
 *         <http://ccmtools.sourceforge.net/>
 *
 * This test client is part of the mirror component test concept. For each
 * component a corresponding mirror component will be instantiated. 
 * All component ports will be connected to the mirror component's ports. 
 * Additionally, developers can add some testing code to validate supported
 * interfaces as well as component attribute access.
 ***/

#include <cassert>
#include <iostream>

#include <Components/ccmtools.h>

#include <world/ServerHome_gen.h>

using namespace std;
using namespace world;

int main(int argc, char *argv[])
{
    cout << ">>>> Start Test Client: " << __FILE__ << endl;

    int error = 0;
    error = deploy_world_ServerHome("ServerHome");
    if(error) 
    {
        cerr << "BOOTSTRAP ERROR: Can't deploy component homes!" << endl;
        return(error);
    }


    try 
    {
	    Components::HomeFinder* homeFinder = Components::HomeFinder::Instance();
    
        ServerHome::SmartPtr home(dynamic_cast<ServerHome*>(
            homeFinder->find_home_by_name("ServerHome").ptr()));

	    Server::SmartPtr component;
    		Hello::SmartPtr hello;
	    
        component = home->create();
        hello = component->provide_hello();
        component->configuration_complete();

	    string s = hello->sayHello();
    		cout << "sayHello(): " << s << endl;
        assert(s == "Hello from Server component!");

        component->remove();
    } 
    catch(Components::HomeNotFound& e) 
    {
        cerr << "DEPLOYMENT ERROR: can't find a home!" << endl;
        error = -1;
    } 
    catch(Components::NotImplemented& e) 
    {
        cerr << "DEPLOYMENT ERROR: function not implemented: " 
	     << e.what (  ) << endl;
        error = -1;
    }  
    catch(Components::InvalidName& e) 
    {
        cerr << "DEPLOYMENT ERROR: invalid name during connection: " 
             << e.what (  ) << endl;
        error = -1;
    }
    catch ( ... )  
    {
        cerr << "DEPLOYMENT ERROR: there is something wrong!" << endl;
        error = -1;
    }

    error += undeploy_world_ServerHome("ServerHome");
    if(error) 
    {
        cerr << "TEARDOWN ERROR: Can't undeploy component homes!" << endl;
        return error;
    }
        
    Components::HomeFinder::destroy();
    
    cout << ">>>> Stop Test Client: " << __FILE__ << endl;
}

Index: Server_hello_impl.cc
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/tutorial/HelloWorld/impl/Server_hello_impl.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Server_hello_impl.cc	27 Nov 2006 21:13:19 -0000	1.3
--- Server_hello_impl.cc	17 Jan 2007 17:44:14 -0000	1.4
***************
*** 1,8 ****
  
  /**
!  * This file was automatically generated by CCM Tools version 0.8.0
   * <http://ccmtools.sourceforge.net/>
   *
!  * world::ccm::local::CCM_Hello facet class implementation. 
   *
   * // TODO: WRITE YOUR DESCRIPTION HERE! 
--- 1,8 ----
  
  /**
!  * This file was automatically generated by CCM Tools
   * <http://ccmtools.sourceforge.net/>
   *
!  * world::Hello facet class implementation. 
   *
   * // TODO: WRITE YOUR DESCRIPTION HERE! 
***************
*** 14,27 ****
  #include <cassert>
  #include <iostream>
- #include <wx/utils/debug.h>
  
  #include "Server_hello_impl.h"
  
- using namespace std;
- using namespace wx::utils;
  
  namespace world {
- namespace ccm {
- namespace local {
  
  Server_hello_impl::Server_hello_impl(Server_impl* component_impl)
--- 14,22 ----
***************
*** 38,47 ****
  std::string
  Server_hello_impl::sayHello()
!     throw(::Components::ccm::local::CCMException)
  {
     return "Hello from Server component!";
  }
  
- } // /namespace local
- } // /namespace ccm
  } // /namespace world
--- 33,40 ----
  std::string
  Server_hello_impl::sayHello()
!     throw(Components::CCMException)
  {
     return "Hello from Server component!";
  }
  
  } // /namespace world

--- _check_world_ccm_local_Server.cc DELETED ---

[ccmtools-cvs] ccmtools/test/tutorial/CarRental/md CarRental.xml.zip, 1.1, NONE .cvsignore, 1.1, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/tutorial/CarRental/md
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/CarRental/md

Removed Files:
	CarRental.xml.zip .cvsignore 
Log Message:
Changed manual examples to support the new namespaces.

--- .cvsignore DELETED ---

--- CarRental.xml.zip DELETED ---