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

[ccmtools-cvs] ccmtools/test/IDLParser/constants Makefile, NONE, 1.1 ConstantExpression.idl, NONE, 1.1 ConstantGlobal.idl, NONE, 1.1

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

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

Added Files:
	Makefile ConstantExpression.idl ConstantGlobal.idl 
Log Message:
Refactored test directory

--- NEW FILE: ConstantGlobal.idl ---
#ifndef __CONSTANT_GLOBAL__IDL__
#define __CONSTANT_GLOBAL__IDL__

#include <enum/Color.idl>

const short 		SHORT_CONST = -3;

const long 		LONG_CONST = -7777;
const long long 	LONG_LONG_CONST = 7777777;
const unsigned short    USHORT_CONST = 7;
const unsigned long     ULONG_CONST = 7777;
const unsigned long long ULLONG_CONST = 7777777; 

const float 		FLOAT_CONST = 3.14;
const double 		DOUBLE_CONST = 3.1415926;
const long double	LDOUBLE_CONST = 3.1415926; 

const char 		CHAR_CONST = 'c';
const wchar 		WCHAR_CONST = L'c'; 
const string 		STRING_CONST = "1234567890";  
const string<5> 	BSTRING_CONST = "12345";  
const wstring 		WSTRING_CONST = L"1234567890";
const wstring<5>	BWSTRING_CONST = L"12345";

const boolean 		BOOLEAN_CONST = TRUE;
const octet 		OCTET_CONST = 255;

const Color		ENUM_CONST = red; 

#endif // __CONSTANT_GLOBAL__IDL__

--- NEW FILE: Makefile ---
INCLUDE= -I../

all: idl3

idl3: 
	ccmparser ${INCLUDE} ConstantGlobal.idl
	ccmparser ConstantExpression.idl

--- NEW FILE: ConstantExpression.idl ---
#ifndef __CONSTANT_EXPRESSION__IDL__
#define __CONSTANT_EXPRESSION__IDL__

/**
 * Arithmetic Operations
 */
 
const long LONG_ADD_CONST = 7 + 3;
const long LONG_SUB_CONST = 3 - 7;
const long LONG_MUL_CONST = 7 * 3;
const long LONG_DIV_CONST = 7 / 3;
const long LONG_MOD_CONST = 7 % 3;

const long LONG_RESULT = (LONG_ADD_CONST + LONG_SUB_CONST) * LONG_MUL_CONST / LONG_DIV_CONST;


const double DOUBLE_ADD_CONST = 7.71 + 3.32;
const double DOUBLE_SUB_CONST = 7.71 - 3.32;
const double DOUBLE_MUL_CONST = 7.71 * 3.32;
const double DOUBLE_DIV_CONST = 7.71 / 3.32;

const double DOUBLE_RESULT = (DOUBLE_ADD_CONST + DOUBLE_SUB_CONST) * DOUBLE_MUL_CONST / DOUBLE_DIV_CONST;

#endif // __CONSTANT_EXPRESSION__IDL__

[ccmtools-cvs] ccmtools/test/IDL3Parser/include/xxx/component Test.idl, 1.1, NONE

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

Update of /cvsroot/ccmtools/ccmtools/test/IDL3Parser/include/xxx/component
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/IDL3Parser/include/xxx/component

Removed Files:
	Test.idl 
Log Message:
Refactored test directory

--- Test.idl DELETED ---

[ccmtools-cvs] ccmtools/test/IDLParser/events EventtypeTest.idl, NONE, 1.1

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

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

Added Files:
	EventtypeTest.idl 
Log Message:
Refactored test directory

--- NEW FILE: EventtypeTest.idl ---
#ifndef __EVENTTYPE_TEST__IDL__
#define __EVENTTYPE_TEST__IDL__

eventtype Login
{
    public long id;
    public string name;
    private string password;
    
    boolean hasAccess();
};

eventtype NewLogin : Login
{
	public double time;
	
	void login();
};

abstract eventtype EventBase
{
};

#endif // __EVENTTYPE_TEST__IDL__

[ccmtools-cvs] ccmtools/test/IDLParser/sequence BasicTypeSequence.idl, NONE, 1.1 UserTypeSequence.idl, NONE, 1.1 Makefile, NONE, 1.1

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

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

Added Files:
	BasicTypeSequence.idl UserTypeSequence.idl Makefile 
Log Message:
Refactored test directory

--- NEW FILE: UserTypeSequence.idl ---
#ifndef __USER_TYPE_SEQUENCE__IDL__
#define __USER_TYPE_SEQUENCE__IDL__

#include <typedef/BasicTypeTypedef.idl>
#include <enum/Color.idl>
#include <struct/Address.idl>
#include <array/BasicTypeArray.idl>

#include "BasicTypeSequence.idl"

/*
 * Here we define sequences of user type values
 */

typedef sequence<LongType> 		LongTypeSeq;	
typedef sequence<Color> 		EnumSeq;
typedef sequence<Address>   		StructSeq;
typedef sequence<LongArray>		ArraySeq;
typedef sequence<LongSeq>  		SequenceSeq;
typedef sequence<sequence<long> > AnonymousSequenceSeq;


/*
 * Here we define bounded sequences of user type values
 */

typedef sequence<LongType, 10> 		LongTypeBSeq;	
typedef sequence<Color, 10> 		EnumBSeq;
typedef sequence<Address, 10>   	StructBSeq;
typedef sequence<LongArray, 10>		ArrayBSeq;
typedef sequence<LongSeq, 10>  		SequenceBSeq;
typedef sequence<sequence<long>,10 >    AnonymousSequenceBSeq;


#endif // __USER_TYPE_SEQUENCE__IDL__

--- NEW FILE: Makefile ---
INCLUDE= -I../

all: idl3

idl3: 
	ccmprinter BasicTypeSequence.idl
	ccmprinter ${INCLUDE} UserTypeSequence.idl

--- NEW FILE: BasicTypeSequence.idl ---
#ifndef __BASIC_TYPE_SEQUENCE__IDL__
#define __BASIC_TYPE_SEQUENCE__IDL__

/*
 * Here we define sequences of basic type values
 */
 
typedef sequence<short>                 ShortSeq;	
typedef sequence<long> 		        LongSeq;
typedef sequence<long long> 	        LLongSeq;
typedef sequence<unsigned short>        UShortSeq;
typedef sequence<unsigned long>         ULongSeq;
typedef sequence<unsigned long long>    ULLongSeq; 
 
typedef sequence<float> 	        FloatSeq;
typedef sequence<double> 		DoubleSeq;
typedef sequence<long double>     	LDoubleSeq; 
 
typedef sequence<char> 			CharSeq;
typedef sequence<wchar>     		WCharSeq;
typedef sequence<string> 		StringSeq;
typedef sequence<wstring>		WStringSeq;
 
typedef sequence<boolean> 		BooleanSeq;
typedef sequence<octet> 		OctetSeq;	
typedef sequence<any> 			AnySeq;
typedef sequence<Object>		ObjectSeq;

typedef sequence<fixed<9,2> >      	FixedSeq;


/*
 * Here we define bounded sequences of basic type values
 */

typedef sequence<short,10> 		        ShortBSeq;	
typedef sequence<long,10> 		        LongBSeq;
typedef sequence<long long, 10> 	        LLongBSeq;
typedef sequence<unsigned short, 10> 	        UShortBSeq;
typedef sequence<unsigned long, 10> 		ULongBSeq;
typedef sequence<unsigned long long, 10> 	ULLongBSeq; 
 
typedef sequence<float, 10> 			FloatBSeq;
typedef sequence<double, 10> 			DoubleBSeq;
typedef sequence<long double, 10>     		LDoubleBSeq; 
 
typedef sequence<char, 10> 			CharBSeq;
typedef sequence<wchar, 10>     		WCharBSeq;
typedef sequence<string, 10> 			StringBSeq;
typedef sequence<wstring , 10>		        WStringBSeq;
 
typedef sequence<boolean, 10> 			BooleanBSeq;
typedef sequence<octet, 10> 			OctetBSeq;	
typedef sequence<any, 10> 			AnyBSeq;
typedef sequence<Object, 10>			ObjectBSeq;

typedef sequence<fixed<9,2>, 10>    		FixedBSeq;


#endif // __BASIC_TYPE_SEQUENCE__IDL__

[ccmtools-cvs] ccmtools/test/IDL3Parser/import ImportTest.idl, 1.1, NONE

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

Update of /cvsroot/ccmtools/ccmtools/test/IDL3Parser/import
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/IDL3Parser/import

Removed Files:
	ImportTest.idl 
Log Message:
Refactored test directory

--- ImportTest.idl DELETED ---

[ccmtools-cvs] ccmtools/test/IDL3Parser/enum/error Empty.idl, 1.1, NONE

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

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

Removed Files:
	Empty.idl 
Log Message:
Refactored test directory

--- Empty.idl DELETED ---

[ccmtools-cvs] ccmtools/test/IDL3Parser .cvsignore,1.1.1.1,NONE

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

Update of /cvsroot/ccmtools/ccmtools/test/IDL3Parser
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/IDL3Parser

Removed Files:
	.cvsignore 
Log Message:
Refactored test directory

--- .cvsignore DELETED ---

[ccmtools-cvs] ccmtools/test/IDL3Parser/include/idl3/interface/world IFace.idl, 1.1, NONE

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

Update of /cvsroot/ccmtools/ccmtools/test/IDL3Parser/include/idl3/interface/world
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/IDL3Parser/include/idl3/interface/world

Removed Files:
	IFace.idl 
Log Message:
Refactored test directory

--- IFace.idl DELETED ---

[ccmtools-cvs] ccmtools/test/IDLParser/include/xxx/component Test.idl, NONE, 1.1

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

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

Added Files:
	Test.idl 
Log Message:
Refactored test directory

--- NEW FILE: Test.idl ---
/*
 * This file was automatically generated by CCM Tools version 0.8.0
 * <http://ccmtools.sourceforge.net>
 * DO NOT EDIT!
 */

#ifndef ___TEST__IDL__
#define ___TEST__IDL__

#include <world/IFace.idl>

 
component Test 

{

    provides ::world::IFace inPort;

    uses ::world::IFace singlePort;
    uses multiple ::world::IFace multiPort;

};

// This is a hack to make the CppGenerator happy !!!
#include <TestHome.idl>
 

#endif /* ___TEST__IDL__ */

[ccmtools-cvs] ccmtools/test/IDLParser/union UnionLongDiscriminator.idl, NONE, 1.1 Makefile, NONE, 1.1 UnionTest.idl, NONE, 1.1 .cvsignore, NONE, 1.1

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

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

Added Files:
	UnionLongDiscriminator.idl Makefile UnionTest.idl .cvsignore 
Log Message:
Refactored test directory

--- NEW FILE: UnionLongDiscriminator.idl ---
#ifndef __UNION_LONG_DISCRIMINATOR__IDL__
#define __UNION_LONG_DISCRIMINATOR__IDL__

union UnionLongSwitch switch(long) 
{
 case 17:   long a;
 case 3:  string b;
};

#endif // __UNION_LONG_DISCRIMINATOR__IDL

--- NEW FILE: .cvsignore ---
_CCM_UnionTest

--- NEW FILE: UnionTest.idl ---
#ifndef __UNION_TEST__IDL__
#define __UNION_TEST__IDL__


#include <enum/Color.idl>

union ColorCount switch(Color)
{
	case red:
	case green:
	case blue:
		unsigned long numInStock;
	case black:
		float discount;
	default:
		string orderDetail;		
};

#endif // __UNION_TEST__IDL__

--- NEW FILE: Makefile ---

all: idl3

idl3: UnionTest.idl
#	ccmparser UnionTest.idl

[ccmtools-cvs] ccmtools/test/manual/Login/c++/server/impl Makefile, NONE, 1.1 Server_login_impl.cc, NONE, 1.1 ServerMirror_impl.cc, NONE, 1.1 _check_ccmtools_remote_application_Server.cc, NONE, 1.1 _check_application_Server.cc, NONE, 1.1

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

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

Added Files:
	Makefile Server_login_impl.cc ServerMirror_impl.cc 
	_check_ccmtools_remote_application_Server.cc 
	_check_application_Server.cc 
Log Message:
Refactored test directory

--- NEW FILE: _check_ccmtools_remote_application_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 remote component test concept. 
 ***/

#ifdef HAVE_CONFIG_H
#  include <config.h>
#endif 

#ifdef HAVE_MICO 

#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;

//==============================================================================
// Implementation of remote client test
//==============================================================================

int main (int argc, char *argv[])
{
    cout << "Enter C++ remote test client" << endl;

    // Initialize ORB 
    int   argc_   = 3;
    char* argv_[] = { "", "-ORBInitRef", "NameService=corbaloc:iiop:1.2@localhost:5050/NameService"}; 
    cout << "args = [" << argv_[1] << ", " << argv_[2] << "]" << endl;
    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_application_ServerHome("ServerHome");
    error += deploy_ccmtools_remote_application_ServerHome(orb, "ServerHome");
    if(!error) {
        cout << "ServerHome server is running..." << endl;
    }
    else {
        cerr << "ERROR: Can't deploy components!" << endl;
        return -1;
    }

    orb->run();

    // Un-Deployment
    cout << "Exit C++ remote test client" << endl; 	
}

#endif // HAVE_MICO


--- NEW FILE: Server_login_impl.cc ---

/**
 * This file was automatically generated by CCM Tools
 * <http://ccmtools.sourceforge.net/>
 *
 * application::Login facet class implementation. 
 *
 * // TODO: WRITE YOUR DESCRIPTION HERE! 
 *
 * @author
 * @version 
 **/

#include <cassert>
#include <iostream>

#include "Server_login_impl.h"


namespace application {

using namespace std;

Server_login_impl::Server_login_impl(application::Server_impl* component_impl)
  : component(component_impl)
{
    // OPTIONAL : IMPLEMENT ME HERE !
}

Server_login_impl::~Server_login_impl()
{
    // OPTIONAL : IMPLEMENT ME HERE !
}

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 
     && person.name == "eteinik"
     && person.group == USER) {
    return true;
  }
  else {
    return false;
  }
}

} // /namespace application

--- NEW FILE: Makefile ---

all: 
	ccmtools-idl -mico -I${CCMTOOLS_HOME}/idl *.idl

--- NEW FILE: _check_application_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 <application/ServerHome_gen.h>

using namespace std;
using namespace application;

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


    // Component bootstrap:
    // We get an instance of the local HomeFinder and register the deployed
    // component- and mirror component home.
    // Here we can also decide to use a Design by Contract component.  	
    int error = deploy_application_ServerHome("ServerHome");             
    if(error) 
    {
        cerr << "BOOTSTRAP ERROR: Can't deploy component homes!" << endl;
        return(error);
    }


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

      Server::SmartPtr server;
      Login::SmartPtr login;

      server = serverHome->create();
      login = server->provide_login();
      server->configuration_complete();

      try 
      {
	PersonData person;
	person.id = 0;
	person.name = "";
	person.password = "";
	person.group = USER;
	
	login->isValidUser(person);
	assert(false);
      }
      catch(InvalidPersonData& e) 
      {
	cout << "Caught InvalidPersonData exception!" << endl;
      }

      try 
      {
	PersonData person;
	person.id = 277;
	person.name = "eteinik";
	person.password = "eteinik";
	person.group = USER;
	
	bool result = login->isValidUser(person);
	if(result) 
	{
	  cout << "Welcome " << person.name << endl;
	}
	else 
	{
	  cout << "We don't know you !!!" << endl;
	}
      }
      catch(InvalidPersonData& e) 
      {
	cout << "Error: InvalidPersonData!!" << endl;
      }
      
      
      server->remove();
    } 
    catch(Components::HomeNotFound ) 
    {
      cerr << "TEARDOWN ERROR: can't find a home!" << endl;
      error = -1;
    } 
    catch(Components::NotImplemented& e ) 
    {
      cerr << "TEARDOWN 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 << "TEARDOWN ERROR: there is something wrong!" << endl;
      error = -1;
    }
    
    error += undeploy_application_ServerHome("ServerHome");
    if(error) 
    {
      cerr << "TEARDOWN ERROR: Can't undeploy component homes!" << endl;
      return error;
    }
    
    // Clean up HomeFinder singleton
    Components::HomeFinder::destroy();
    
    cout << ">>>> Stop Test Client: " << __FILE__ << endl;
}

--- NEW FILE: ServerMirror_impl.cc ---

/***
 * This file was automatically generated by CCM Tools 
 * <http://ccmtools.sourceforge.net/>
 *
 * ServerMirror component business logic implementation.
 * 
 * // TODO: WRITE YOUR DESCRIPTION HERE! 
 *
 * @author
 * @version 
 ***/

#include <cassert>
#include <iostream>

#include "ServerMirror_impl.h"

namespace application {

using namespace std;

//==============================================================================
// CCM_ServerMirror - component implementation
//==============================================================================

ServerMirror_impl::ServerMirror_impl()
{
    // OPTIONAL : IMPLEMENT ME HERE !
}

ServerMirror_impl::~ServerMirror_impl()
{
    // OPTIONAL : IMPLEMENT ME HERE !
}

void
ServerMirror_impl::set_session_context(Components::SessionContext* context)
    throw(Components::CCMException)
{
    ctx = dynamic_cast<CCM_ServerMirror_Context*>(context);
}

void
ServerMirror_impl::ccm_activate()
    throw(Components::CCMException)
{
      try
      {
          Login::SmartPtr login =  ctx->get_connection_login();

	  try 
	  {
	    PersonData person;
	    person.id = 277;
	    person.name = "eteinik";
	    person.password = "eteinik";
	    person.group = USER;

	    bool result = login->isValidUser(person);
	    if(result) 
	    {
	      cout << "Welcome " << person.name << endl;
	    }
	    else 
	    {
	      cout << "We don't know you !!!" << endl;
	    }
	  }
	  catch(InvalidPersonData& e) 
	  {
	    cout << "Error: InvalidPersonData!!" << endl;
	  }

	  try 
	  {
	       PersonData person;
	       person.id = 0;
	       person.name = "";
	       person.password = "";
	       person.group = USER;
	       
	       login->isValidUser(person);
	       assert(false);
	  }
	  catch(InvalidPersonData& e) 
	  {
	    cout << "OK, caught InvalidPersonData exception!" << endl;
	  }
      }
      catch(Components::Exception& e)
      {
	cerr << "ERROR: " << e.what() << endl;
      }
}

void
ServerMirror_impl::ccm_passivate()
    throw(Components::CCMException)
{
    // OPTIONAL : IMPLEMENT ME HERE !
}

void
ServerMirror_impl::ccm_remove()
    throw(Components::CCMException)
{
    // OPTIONAL : IMPLEMENT ME HERE !
}

} // /namespace application

[ccmtools-cvs] ccmtools/test/manual/Login/c++/client .cvsignore, NONE, 1.1 Makefile, NONE, 1.1

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

Update of /cvsroot/ccmtools/ccmtools/test/manual/Login/c++/client
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/manual/Login/c++/client

Added Files:
	.cvsignore Makefile 
Log Message:
Refactored test directory

--- NEW FILE: .cvsignore ---
src

--- NEW FILE: Makefile ---
IDL_SOURCE=../../Login.idl
DEST_DIR = src
IDL3_DIR = ../../idl3repo
IDL2_DIR = ${DEST_DIR}/idl2
INCLUDE  = -I${IDL3_DIR}/interface -I${IDL3_DIR}/component

all: stubs

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
	mkdir ${DEST_DIR}/test

run: 
	cp impl/_check_ccmtools_remote_client.cc ${DEST_DIR}/test
	ccmconfix -confix2 -o ${DEST_DIR} -pname "login-remote-client" -pversion "1.0.0" 
	confix2.py --packageroot=`pwd`/${DEST_DIR} --bootstrap --configure --make --targets=check

clean: 
	confix2.py --packageroot=`pwd`/${DEST_DIR} --make --targets=clean	
	rm -rf ${DEST_DIR}

[ccmtools-cvs] ccmtools/test/tutorial/Login/java/server build.xml, 1.1, NONE Makefile, 1.4, NONE .cvsignore, 1.1, NONE

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

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

Removed Files:
	build.xml Makefile .cvsignore 
Log Message:
Refactored test directory

--- .cvsignore DELETED ---

--- Makefile DELETED ---

--- build.xml DELETED ---

[ccmtools-cvs] ccmtools/test/manual/HelloWorld/impl Server_hello_impl.cc, NONE, 1.1 _check_world_Server.cc, NONE, 1.1

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

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

Added Files:
	Server_hello_impl.cc _check_world_Server.cc 
Log Message:
Refactored test directory

--- NEW FILE: Server_hello_impl.cc ---

/**
 * This file was automatically generated by CCM Tools
 * <http://ccmtools.sourceforge.net/>
 *
 * world::Hello facet class implementation. 
 *
 * // TODO: WRITE YOUR DESCRIPTION HERE! 
 *
 * @author
 * @version 
 **/

#include <cassert>
#include <iostream>

#include "Server_hello_impl.h"


namespace world {

Server_hello_impl::Server_hello_impl(Server_impl* component_impl)
  : component(component_impl)
{
    // OPTIONAL : IMPLEMENT ME HERE !
}

Server_hello_impl::~Server_hello_impl()
{
    // OPTIONAL : IMPLEMENT ME HERE !
}

std::string
Server_hello_impl::sayHello()
    throw(Components::CCMException)
{
   return "Hello from Server component!";
}

} // /namespace world

--- 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;
}

[ccmtools-cvs] ccmtools/test/IDLParser/typedef/error ReDefinition.idl, NONE, 1.1

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

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

Added Files:
	ReDefinition.idl 
Log Message:
Refactored test directory

--- NEW FILE: ReDefinition.idl ---
#ifndef __SIMPLE_TYPEDEF__IDL__
#define __SIMPLE_TYPEDEF__IDL__

typedef short ShortType;

module world
{
  typedef short ShortType; // OK: new scope for ShortType
};

typedef short Shorttype; // Error: re-definition of ShortType

#endif  //__SIMPLE_TYPEDEF__IDL__

[ccmtools-cvs] ccmtools/test/IDL3Parser/include/idl3/component/world Test.idl, 1.1, NONE TestHomeMirror.idl, 1.1, NONE TestHome.idl, 1.1, NONE

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

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

Removed Files:
	Test.idl TestHomeMirror.idl TestHome.idl 
Log Message:
Refactored test directory

--- TestHomeMirror.idl DELETED ---

--- TestHome.idl DELETED ---

--- Test.idl DELETED ---

[ccmtools-cvs] ccmtools/test/manual/Login/java/server/impl Makefile, NONE, 1.1 ClientLocal.java, NONE, 1.1 ServerloginImpl.java, NONE, 1.1 Server.java, NONE, 1.1

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

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

Added Files:
	Makefile ClientLocal.java ServerloginImpl.java Server.java 
Log Message:
Refactored test directory

--- NEW FILE: ClientLocal.java ---
import java.util.logging.ConsoleHandler;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;

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
{
    public static final String COMPONENT_HOME_NAME = "ServerHome";
    
    public static void main(String[] args)
    {
        System.out.println("Login Client");

        // 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);
        ServiceLocator.instance().setLogger(logger);

        /**
         * Setup code (Part 1)
         */
        try
        {
            application.ServerHomeDeployment.deploy(COMPONENT_HOME_NAME);
        }
        catch (Exception e)
        {
            e.printStackTrace();
        }

        
        /**
         * Business code
         */
        try
        {            
            HomeFinder homeFinder = HomeFinder.instance();
            ServerHome home = (ServerHome) homeFinder.find_home_by_name(COMPONENT_HOME_NAME);
            Server server = home.create();
            server.configuration_complete();
            Login login = server.provide_login();
            
            try
            {
                PersonData person = new PersonData(0, "", "", Group.USER);
                login.isValidUser(person);
                assert(false);
            }
            catch (InvalidPersonData e)
            {
                System.err.println("Caught InvalidPersonData exception!");
            }

            
            try
            {
                PersonData person = new PersonData(277, "eteinik", "eteinik", Group.USER);
                boolean result = login.isValidUser(person);

                if (result)
                {
                    System.out.println("Welcome " + person.getName());
                }
                else
                {
                    System.out.println("We don't know you...");
                }
            }
            catch (InvalidPersonData e)
            {
                System.err.println("Error: InvalidPersonData!");
            }
            
            System.out.println("OK!");
            server.remove();
        }
        catch (Exception e)
        {
            e.printStackTrace();
        }

        
        /**
         * Setup code (Part 2)
         */
        try
        {
            application.ServerHomeDeployment.undeploy(COMPONENT_HOME_NAME);
        }
        catch (Exception e)
        {
            e.printStackTrace();
        }
        finally
        {
            // Tear down the ServiceLocator singleton
            ServiceLocator.instance().destroy();
        }
    }
}

--- NEW FILE: Makefile ---

all: 
	ccmtools-idl -mico -I${CCMTOOLS_HOME}/idl *.idl

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

package application; 

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

    public ServerloginImpl(ServerImpl component)
    {
        this.component = component;
    }

    /** Business logic implementations */

    public boolean isValidUser(PersonData person)
        throws Components.CCMException, InvalidPersonData
    {
        if(person.getName().length() == 0)
            throw new InvalidPersonData();
        
        if(person.getId() == 277
                && person.getName().equals("eteinik")
                && person.getGroup() == Group.USER)
        {
            return true;
        }
        else
        {
            return false;
        }
    }    
}

--- NEW FILE: Server.java ---
import java.util.logging.ConsoleHandler;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;

import org.omg.CORBA.ORB;

import ccmtools.local.ServiceLocator;

public class Server
{
    public static final String COMPONENT_HOME_NAME = "ServerHome";

    public static void main(String[] args)
    {
        System.out.println("Login Server");
        for(int i = 0; i < args.length; i++)
        {
            System.out.println(args[i]);
        }
        
        // 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);
        ServiceLocator.instance().setLogger(logger);

        
        try
        {
            // Set up the ServiceLocator singleton
            ORB orb = ORB.init(args, null);
            ServiceLocator.instance().setCorbaOrb(orb);

            ccmtools.remote.application.ServerHomeDeployment.deploy(COMPONENT_HOME_NAME);
            System.out.println("> Server is running...");
            orb.run();
        }
        catch (Exception e)
        {
            e.printStackTrace();
        }
    }
}

[ccmtools-cvs] ccmtools/test/idl CosNaming.idl, 1.2, NONE operation-component.idl, 1.2, NONE random2.idl, 1.1.1.1, NONE random1.idl, 1.1.1.1, NONE

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

Update of /cvsroot/ccmtools/ccmtools/test/idl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/idl

Removed Files:
	CosNaming.idl operation-component.idl random2.idl random1.idl 
Log Message:
Refactored test directory

--- random2.idl DELETED ---

--- CosNaming.idl DELETED ---

--- random1.idl DELETED ---

--- operation-component.idl DELETED ---

[ccmtools-cvs] ccmtools/test/manual/Login/c++/client/impl Makefile, NONE, 1.1 _check_ccmtools_remote_client.cc, NONE, 1.1

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

Update of /cvsroot/ccmtools/ccmtools/test/manual/Login/c++/client/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/manual/Login/c++/client/impl

Added Files:
	Makefile _check_ccmtools_remote_client.cc 
Log Message:
Refactored test directory

--- NEW FILE: Makefile ---

all: 
	ccmtools-idl -mico -I${CCMTOOLS_HOME}/idl *.idl

--- NEW FILE: _check_ccmtools_remote_client.cc ---
#include <cstdlib> 
#include <iostream>
#include <string>

#include <ccmtools/remote/CCMContainer.h>

#include <CORBA.h>
#include <coss/CosNaming.h>

#include <ccmtools_corba_application_ServerHome.h>

using namespace std;
using namespace ccmtools::corba::application;

//==============================================================================
// Implementation of remote client test
//==============================================================================

int main (int argc, char *argv[])
{
    cout << "Login remote client (C++)" << endl;

    // Initialize ORB 
    //    ostringstream os;
    //    os << "NameService=" << NameServiceLocation;
    //    char* argv_[] = { "", "-ORBInitRef", (char*)os.str().c_str()}; 

    int   argc_   = 3;
    char* argv_[] = { "", 
                    "-ORBInitRef", 
                    "NameService=corbaloc:iiop:1.2@localhost:5050/NameService"};
    cout << "args = [" << argv_[1] << ", " << argv_[2] << "]" << endl;
    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);

    // Deployment 

    // 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();

    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 << "Caught InvalidPersonData exception!" << endl;	
    }

    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);
      
      if(result) {
	cout << "Welcome " << person.name << endl;
      }
      else {
	cout << "We don't know you !!!" << endl;
      }
    }
    catch(InvalidPersonData& e)
    {
      cout << "Error: InvalidPersonData" << endl;	
    }

    // Destroy component instances
    server->remove();

    // Un-Deployment
    cout << "OK!" << endl; 	
}

[ccmtools-cvs] ccmtools/test/IDLParser .cvsignore,NONE,1.1

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

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

Added Files:
	.cvsignore 
Log Message:
Refactored test directory

--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
classdist_check.stamp
Main.class
classdist_noinst.stamp

[ccmtools-cvs] ccmtools/test/IDL3Parser/module Makefile, 1.2, NONE ModuleReopened.idl, 1.2, NONE ModuleNested.idl, 1.2, NONE Names.idl, 1.1, NONE

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

Update of /cvsroot/ccmtools/ccmtools/test/IDL3Parser/module
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/IDL3Parser/module

Removed Files:
	Makefile ModuleReopened.idl ModuleNested.idl Names.idl 
Log Message:
Refactored test directory

--- Names.idl DELETED ---

--- Makefile DELETED ---

--- ModuleReopened.idl DELETED ---

--- ModuleNested.idl DELETED ---

[ccmtools-cvs] ccmtools/test/manual/Login/java/client/bin runClient, NONE, 1.1

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

Update of /cvsroot/ccmtools/ccmtools/test/manual/Login/java/client/bin
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/manual/Login/java/client/bin

Added Files:
	runClient 
Log Message:
Refactored test directory

--- 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:./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)!!

[ccmtools-cvs] ccmtools/test/IDLParser/enum Color.idl, NONE, 1.1 Makefile, NONE, 1.1 DayOfWeek.idl, NONE, 1.1 .cvsignore, NONE, 1.1

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

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

Added Files:
	Color.idl Makefile DayOfWeek.idl .cvsignore 
Log Message:
Refactored test directory

--- NEW FILE: .cvsignore ---
Color.idl.tmp
DayOfWeek.idl.tmp

--- NEW FILE: Color.idl ---
#ifndef __COLOR__IDL__
#define __COLOR__IDL__

enum Color  
{
    red,
    green,
    blue,
    black,
    orange
};

#endif // __COLOR__IDL__

--- NEW FILE: DayOfWeek.idl ---
#ifndef __DAY_OF_WEEK__IDL__
#define __DAY_OF_WEEK__IDL__

enum DayOfWeek
{
	Mon, 
	Tue,
	Wed,
	Thu,
	Fri,
	Sat,
	Sun
};

#endif // __DAY_OF_WEEK__IDL__

--- NEW FILE: Makefile ---

all: idl3

idl3: 
	ccmprinter DayOfWeek.idl
	ccmprinter Color.idl
	ccmprinter Empty.idl

[ccmtools-cvs] ccmtools/test/tutorial/Login/c++/server/impl ServerMirror_impl.cc, 1.3, NONE Makefile, 1.1, NONE _check_ccmtools_remote_application_Server.cc, 1.1, NONE _check_application_Server.cc, 1.1, NONE Server_login_impl.cc, 1.3, NONE

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

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

Removed Files:
	ServerMirror_impl.cc Makefile 
	_check_ccmtools_remote_application_Server.cc 
	_check_application_Server.cc Server_login_impl.cc 
Log Message:
Refactored test directory

--- _check_ccmtools_remote_application_Server.cc DELETED ---

--- Server_login_impl.cc DELETED ---

--- Makefile DELETED ---

--- _check_application_Server.cc DELETED ---

--- ServerMirror_impl.cc DELETED ---

[ccmtools-cvs] ccmtools/test/tutorial/Login/c++/client/impl _check_ccmtools_remote_client.cc, 1.1, NONE Makefile, 1.1, NONE

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

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

Removed Files:
	_check_ccmtools_remote_client.cc Makefile 
Log Message:
Refactored test directory

--- Makefile DELETED ---

--- _check_ccmtools_remote_client.cc DELETED ---