Menu
▾
▴
ccmtools-cvs — Notification of CVS commits for the CCM Tools
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(86) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(114) |
Feb
(254) |
Mar
(166) |
Apr
(122) |
May
(131) |
Jun
(59) |
Jul
(201) |
Aug
(85) |
Sep
(80) |
Oct
(64) |
Nov
(103) |
Dec
(36) |
| 2005 |
Jan
(231) |
Feb
(204) |
Mar
(71) |
Apr
(54) |
May
(50) |
Jun
(120) |
Jul
(17) |
Aug
(124) |
Sep
(75) |
Oct
(154) |
Nov
(37) |
Dec
(143) |
| 2006 |
Jan
(346) |
Feb
(170) |
Mar
|
Apr
|
May
(273) |
Jun
(113) |
Jul
(427) |
Aug
(570) |
Sep
(212) |
Oct
(550) |
Nov
(348) |
Dec
(314) |
| 2007 |
Jan
(709) |
Feb
(223) |
Mar
(104) |
Apr
(24) |
May
(11) |
Jun
(3) |
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Teiniker E. <tei...@us...> - 2007-01-17 17:44:19
|
Update of /cvsroot/ccmtools/ccmtools/test/tutorial/Login/java/server In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/Login/java/server Modified Files: Makefile Log Message: Changed manual examples to support the new namespaces. Index: Makefile =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/tutorial/Login/java/server/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 5 Sep 2006 15:20:47 -0000 1.3 --- Makefile 17 Jan 2007 17:44:14 -0000 1.4 *************** *** 15,23 **** check: cp impl/ClientLocal.java ${DEST_DIR}/src ! cp impl/ServerloginImpl.java ${DEST_DIR}/src/application/ccm/local/ ant -f ./build.xml bin/runClientLocal ! stubs: #local ccmidl -idl2 ${INCLUDE} -o ${IDL2_DIR} ${IDL3_DIR}/interface/application/*.idl ccmidl -idl2 ${INCLUDE} -o ${IDL2_DIR} ${IDL3_DIR}/component/application/Server*.idl --- 15,23 ---- check: cp impl/ClientLocal.java ${DEST_DIR}/src ! cp impl/ServerloginImpl.java ${DEST_DIR}/src/application/ ant -f ./build.xml bin/runClientLocal ! stubs: ccmidl -idl2 ${INCLUDE} -o ${IDL2_DIR} ${IDL3_DIR}/interface/application/*.idl ccmidl -idl2 ${INCLUDE} -o ${IDL2_DIR} ${IDL3_DIR}/component/application/Server*.idl *************** *** 30,34 **** run: cp impl/Server.java ${DEST_DIR}/src ! cp impl/ServerloginImpl.java ${DEST_DIR}/src/application/ccm/local/ ant -f ./build.xml bin/runServer --- 30,34 ---- run: cp impl/Server.java ${DEST_DIR}/src ! cp impl/ServerloginImpl.java ${DEST_DIR}/src/application/ ant -f ./build.xml bin/runServer |
|
From: Teiniker E. <tei...@us...> - 2007-01-17 17:44:17
|
Update of /cvsroot/ccmtools/ccmtools/test/tutorial/Login/c++/client In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/Login/c++/client Modified Files: Makefile Added Files: .cvsignore Log Message: Changed manual examples to support the new namespaces. --- NEW FILE: .cvsignore --- src Index: Makefile =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/tutorial/Login/c++/client/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 16 Oct 2006 14:55:25 -0000 1.3 --- Makefile 17 Jan 2007 17:44:14 -0000 1.4 *************** *** 8,19 **** stubs: ! 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 mkdir ${DEST_DIR}/test run: ! cp impl/_check_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 --- 8,19 ---- 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 |
|
From: Teiniker E. <tei...@us...> - 2007-01-17 17:44:17
|
Update of /cvsroot/ccmtools/ccmtools/test/tutorial/Login/c++/client/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/Login/c++/client/impl Added Files: _check_ccmtools_remote_client.cc Removed Files: _check_client.cc Log Message: Changed manual examples to support the new namespaces. --- _check_client.cc DELETED --- --- 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; } |
|
From: Teiniker E. <tei...@us...> - 2007-01-17 17:44:17
|
Update of /cvsroot/ccmtools/ccmtools/test/tutorial/Login/java/client In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/Login/java/client Modified Files: Makefile Log Message: Changed manual examples to support the new namespaces. Index: Makefile =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/tutorial/Login/java/client/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 1 Sep 2006 11:52:04 -0000 1.1 --- Makefile 17 Jan 2007 17:44:14 -0000 1.2 *************** *** 7,11 **** all: clientlib run - idl3: ${IDL_SOURCE} ccmidl -idl3 -o ${IDL3_DIR} ${IDL_SOURCE} --- 7,10 ---- *************** *** 18,22 **** ccmjava -iface -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/interface/application/*.idl ccmjava -iface -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/component/application/Server*.idl ! ccmjava -clientlib -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/interface/application/*.idl ccmjava -clientlib -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/component/application/Server*.idl --- 17,21 ---- ccmjava -iface -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/interface/application/*.idl ccmjava -iface -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/component/application/Server*.idl ! ccmjava -clientlib -remote -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/interface/application/*.idl ccmjava -clientlib -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/component/application/Server*.idl |
|
From: Teiniker E. <tei...@us...> - 2007-01-17 17:44:17
|
Update of /cvsroot/ccmtools/ccmtools/test/tutorial/CarRental/impl/corba_server In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/CarRental/impl/corba_server Removed Files: server.cc Makefile.py Log Message: Changed manual examples to support the new namespaces. --- Makefile.py DELETED --- --- server.cc DELETED --- |
|
From: Teiniker E. <tei...@us...> - 2007-01-17 17:44:16
|
Update of /cvsroot/ccmtools/ccmtools/test/tutorial/CarRental/impl/client In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/CarRental/impl/client Removed Files: Makefile.py client.cc Log Message: Changed manual examples to support the new namespaces. --- Makefile.py DELETED --- --- client.cc DELETED --- |
|
From: Teiniker E. <tei...@us...> - 2007-01-17 17:44:16
|
Update of /cvsroot/ccmtools/ccmtools/test/tutorial/Login/c++/server/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/Login/c++/server/impl Modified Files: ServerMirror_impl.cc Server_login_impl.cc Added Files: _check_ccmtools_remote_application_Server.cc _check_application_Server.cc Removed Files: _check_application_ccm_local_Server.cc _check_application_ccm_remote_Server.cc Log Message: Changed manual examples to support the new namespaces. --- 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 --- _check_application_ccm_local_Server.cc DELETED --- --- _check_application_ccm_remote_Server.cc DELETED --- --- 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; } Index: Server_login_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/tutorial/Login/c++/server/impl/Server_login_impl.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Server_login_impl.cc 16 Oct 2006 14:55:24 -0000 1.2 --- Server_login_impl.cc 17 Jan 2007 17:44:13 -0000 1.3 *************** *** 1,8 **** /** ! * This file was automatically generated by CCM Tools version 0.7.0 * <http://ccmtools.sourceforge.net/> * ! * application::ccm::local::CCM_Login facet class implementation. * * // TODO: WRITE YOUR DESCRIPTION HERE! --- 1,8 ---- /** ! * This file was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> * ! * application::Login facet class implementation. * * // TODO: WRITE YOUR DESCRIPTION HERE! *************** *** 14,29 **** #include <cassert> #include <iostream> - #include <wx/utils/debug.h> #include "Server_login_impl.h" - using namespace std; - using namespace wx::utils; namespace application { - namespace ccm { - namespace local { ! Server_login_impl::Server_login_impl(application::ccm::local::Server_impl* component_impl) : component(component_impl) { --- 14,26 ---- #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) { *************** *** 37,46 **** 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 --- 34,42 ---- 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 *************** *** 54,58 **** } - } // /namespace local - } // /namespace ccm } // /namespace application --- 50,52 ---- Index: ServerMirror_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/tutorial/Login/c++/server/impl/ServerMirror_impl.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ServerMirror_impl.cc 16 Oct 2006 14:55:24 -0000 1.2 --- ServerMirror_impl.cc 17 Jan 2007 17:44:13 -0000 1.3 *************** *** 1,5 **** /*** ! * This file was automatically generated by CCM Tools version 0.7.1 * <http://ccmtools.sourceforge.net/> * --- 1,5 ---- /*** ! * This file was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> * *************** *** 14,27 **** #include <cassert> #include <iostream> - #include <wx/utils/debug.h> #include "ServerMirror_impl.h" namespace application { - namespace ccm { - namespace local { using namespace std; - using namespace wx::utils; //============================================================================== --- 14,23 ---- *************** *** 40,45 **** void ! ServerMirror_impl::set_session_context(Components::ccm::local::SessionContext* context) ! throw(Components::ccm::local::CCMException) { ctx = dynamic_cast<CCM_ServerMirror_Context*>(context); --- 36,41 ---- void ! ServerMirror_impl::set_session_context(Components::SessionContext* context) ! throw(Components::CCMException) { ctx = dynamic_cast<CCM_ServerMirror_Context*>(context); *************** *** 48,56 **** void ServerMirror_impl::ccm_activate() ! throw(Components::ccm::local::CCMException) { try { ! SmartPtr<Login> login = ctx->get_connection_login(); try --- 44,52 ---- void ServerMirror_impl::ccm_activate() ! throw(Components::CCMException) { try { ! Login::SmartPtr login = ctx->get_connection_login(); try *************** *** 93,97 **** } } ! catch(Components::ccm::local::Exception& e) { cerr << "ERROR: " << e.what() << endl; --- 89,93 ---- } } ! catch(Components::Exception& e) { cerr << "ERROR: " << e.what() << endl; *************** *** 101,105 **** void ServerMirror_impl::ccm_passivate() ! throw(Components::ccm::local::CCMException) { // OPTIONAL : IMPLEMENT ME HERE ! --- 97,101 ---- void ServerMirror_impl::ccm_passivate() ! throw(Components::CCMException) { // OPTIONAL : IMPLEMENT ME HERE ! *************** *** 108,118 **** void ServerMirror_impl::ccm_remove() ! throw(Components::ccm::local::CCMException) { // OPTIONAL : IMPLEMENT ME HERE ! } - } // /namespace local - } // /namespace ccm } // /namespace application --- 104,112 ---- void ServerMirror_impl::ccm_remove() ! throw(Components::CCMException) { // OPTIONAL : IMPLEMENT ME HERE ! } } // /namespace application |
|
From: Teiniker E. <tei...@us...> - 2007-01-17 17:44:16
|
Update of /cvsroot/ccmtools/ccmtools/test/tutorial/CarRental/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/CarRental/impl Removed Files: Makefile.py _check_BigBusiness_ccm_remote_component_CarRental.cc CarRental_impl.h CarRental_mirror_impl.cc CarRental_maintenance_impl.cc CarRental_business_impl.cc Log Message: Changed manual examples to support the new namespaces. --- _check_BigBusiness_ccm_remote_component_CarRental.cc DELETED --- --- CarRental_business_impl.cc DELETED --- --- Makefile.py DELETED --- --- CarRental_maintenance_impl.cc DELETED --- --- CarRental_mirror_impl.cc DELETED --- --- CarRental_impl.h DELETED --- |
|
From: Teiniker E. <tei...@us...> - 2007-01-17 17:44:16
|
Update of /cvsroot/ccmtools/ccmtools/test/tutorial/HelloWorld In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/HelloWorld Modified Files: Makefile Log Message: Changed manual examples to support the new namespaces. Index: Makefile =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/tutorial/HelloWorld/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 27 Nov 2006 21:13:19 -0000 1.4 --- Makefile 17 Jan 2007 17:44:13 -0000 1.5 *************** *** 1,4 **** - APP_NAME = Hello CCMTOOLS_CMD = ccmtools DEST_DIR = xxx --- 1,3 ---- *************** *** 18,22 **** check: cp impl/Server_hello_impl.cc ${DEST_DIR}/component/Server/ ! cp impl/_check_world_ccm_local_Server.cc ${DEST_DIR}/component/Server/test/ ccmconfix -confix2 -o ${DEST_DIR} -pname "hello_world" -pversion "1.0.0" confix2.py --packageroot=`pwd`/${DEST_DIR} --bootstrap --configure --make --targets=check --- 17,21 ---- check: cp impl/Server_hello_impl.cc ${DEST_DIR}/component/Server/ ! cp impl/_check_world_Server.cc ${DEST_DIR}/component/Server/test/ ccmconfix -confix2 -o ${DEST_DIR} -pname "hello_world" -pversion "1.0.0" confix2.py --packageroot=`pwd`/${DEST_DIR} --bootstrap --configure --make --targets=check |
|
From: Teiniker E. <tei...@us...> - 2007-01-17 17:44:16
|
Update of /cvsroot/ccmtools/ccmtools/test/tutorial/CarRental/idl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/CarRental/idl Removed Files: CustomerBusiness.idl CarRental.idl CustomerMaintenance.idl Exceptions.idl Customer.idl Log Message: Changed manual examples to support the new namespaces. --- CustomerBusiness.idl DELETED --- --- CarRental.idl DELETED --- --- Customer.idl DELETED --- --- CustomerMaintenance.idl DELETED --- --- Exceptions.idl DELETED --- |
|
From: Teiniker E. <tei...@us...> - 2007-01-17 17:44:16
|
Update of /cvsroot/ccmtools/ccmtools/test/tutorial/CarRentalJavaClient/bin In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17273/test/tutorial/CarRentalJavaClient/bin Removed Files: runClient Log Message: Changed manual examples to support the new namespaces. --- runClient DELETED --- |
|
From: Teiniker E. <tei...@us...> - 2007-01-17 17:25:35
|
Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_oneway In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10410/test/JavaRemoteComponents/facet_oneway Log Message: Directory /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_oneway added to the repository |
|
From: Teiniker E. <tei...@us...> - 2007-01-16 13:34:58
|
Update of /cvsroot/ccmtools/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29152 Modified Files: ChangeLog Log Message: Bugfix: added absolute namespace to default any mappung to wamas::platform::utils::value Index: ChangeLog =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/ChangeLog,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** ChangeLog 16 Jan 2007 13:28:31 -0000 1.57 --- ChangeLog 16 Jan 2007 13:34:54 -0000 1.58 *************** *** 1,14 **** HEAD ============================================================================ - RELEASE-0.8.4 (January 16, 2007) - ---------------------------------------------------------------------------- - RELEASE-0.8.2 (January 8, 2007) RELEASE-0.8.1 (December 21, 2006) ---------------------------------------------------------------------------- *) Refactoring: Namespaces ! Changed generated namespaces of C++ components to support the same schema ! as used in the cpp-environment. + Removed ccm::local namespace from local interfaces. + Added ccmtools::corba to IDL2 artefacts. --- 1,21 ---- HEAD ============================================================================ + RELEASE-0.8.4 (January 16, 2007) + RELEASE-0.8.3 (January 10, 2007) RELEASE-0.8.2 (January 8, 2007) RELEASE-0.8.1 (December 21, 2006) ---------------------------------------------------------------------------- + *) Refactoring: Java generator - changed metamodel + + *) Refactoring: IDL generator - changed metamodel + + *) Bugfix: IDL Parser + Java facet impl files will be generated twice. + => Set SourceFile to ProvidesDef model element. + *) Refactoring: Namespaces ! Changed generated namespaces of C++ and Java components to support the ! same schema as used in the cpp- and java-environment. + Removed ccm::local namespace from local interfaces. + Added ccmtools::corba to IDL2 artefacts. |
|
From: Teiniker E. <tei...@us...> - 2007-01-16 13:28:39
|
Update of /cvsroot/ccmtools/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26527 Modified Files: ChangeLog Log Message: Bugfix: added absolute namespace to default any mappung to wamas::platform::utils::value Index: ChangeLog =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** ChangeLog 8 Jan 2007 10:18:04 -0000 1.56 --- ChangeLog 16 Jan 2007 13:28:31 -0000 1.57 *************** *** 1,4 **** --- 1,7 ---- HEAD ============================================================================ + RELEASE-0.8.4 (January 16, 2007) + ---------------------------------------------------------------------------- + RELEASE-0.8.2 (January 8, 2007) |
|
From: Teiniker E. <tei...@us...> - 2007-01-16 13:28:36
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26527/src/ccmtools/CppGenerator Modified Files: CppGenerator.java Log Message: Bugfix: added absolute namespace to default any mappung to wamas::platform::utils::value Index: CppGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppGenerator.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** CppGenerator.java 5 Jan 2007 14:17:26 -0000 1.36 --- CppGenerator.java 16 Jan 2007 13:28:32 -0000 1.37 *************** *** 90,94 **** private final static String[] _language = { ! "", "wamas::platform::utils::Value", // PK_ANY "bool", // PK_BOOLEAN "char", // PK_CHAR --- 90,94 ---- private final static String[] _language = { ! "", "::wamas::platform::utils::Value", // PK_ANY "bool", // PK_BOOLEAN "char", // PK_CHAR *************** *** 419,423 **** { // TODO: Use any plugin manager ! base_type = "wamas::platform::utils::SmartPtr< " + base_type + " >"; } else if(idl_type instanceof MInterfaceDef) --- 419,423 ---- { // TODO: Use any plugin manager ! base_type = "::wamas::platform::utils::SmartPtr< " + base_type + " >"; } else if(idl_type instanceof MInterfaceDef) |
|
From: Teiniker E. <tei...@us...> - 2007-01-16 13:28:36
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/plugin In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26527/src/ccmtools/CppGenerator/plugin Modified Files: DefaultAnyMapping.java PdlAnyMapping.java PdlAnyPlugin.java AnyMapping.java Log Message: Bugfix: added absolute namespace to default any mappung to wamas::platform::utils::value Index: PdlAnyMapping.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/plugin/PdlAnyMapping.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PdlAnyMapping.java 4 Dec 2006 15:48:32 -0000 1.4 --- PdlAnyMapping.java 16 Jan 2007 13:28:32 -0000 1.5 *************** *** 53,72 **** return code.toString(); } - - // public String getDebugCode(MAliasDef alias) - // { - // StringBuffer code = new StringBuffer(); - // code.append("#ifdef WXDEBUG\n"); - // code.append("inline\n"); - // code.append("std::string\n"); - // code.append("ccmDebug(const ").append(getPdlType().getPdlName()).append("& in, int indent = 0)\n"); - // code.append("{\n"); - // code.append(" std::ostringstream os;\n"); - // code.append(" os << \"").append(getPdlType().getPdlName()); - // code.append(" (alias ").append(getPdlType().getCName()).append(")\";\n"); - // code.append(" return os.str();\n"); - // code.append("}\n"); - // code.append("#endif // WXDEBUG\n"); - // return code.toString(); - // } } --- 53,55 ---- Index: PdlAnyPlugin.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/plugin/PdlAnyPlugin.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PdlAnyPlugin.java 18 Dec 2006 21:34:20 -0000 1.5 --- PdlAnyPlugin.java 16 Jan 2007 13:28:32 -0000 1.6 *************** *** 48,55 **** code = findMapping(identifier).getDefinitionCode(alias); } - // else if(tag.equals("TypedefDebug")) - // { - // code = findMapping(identifier).getDebugCode(alias); - // } else { --- 48,51 ---- Index: DefaultAnyMapping.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/plugin/DefaultAnyMapping.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DefaultAnyMapping.java 5 Jan 2007 14:17:28 -0000 1.8 --- DefaultAnyMapping.java 16 Jan 2007 13:28:32 -0000 1.9 *************** *** 14,23 **** implements AnyMapping { - public static final String DEFAULT_ANY_MAPPING = "wamas::platform::utils::Value"; - private static final String TAB = " "; - public String getIdlTypeName() { ! return DEFAULT_ANY_MAPPING; } --- 14,20 ---- implements AnyMapping { public String getIdlTypeName() { ! return "::wamas::platform::utils::Value"; } *************** *** 34,38 **** StringBuffer code = new StringBuffer(); code.append("typedef "); ! code.append("wamas::platform::utils::SmartPtr<wamas::platform::utils::Value>"); code.append(" "); code.append(typedef.getIdentifier()); --- 31,35 ---- StringBuffer code = new StringBuffer(); code.append("typedef "); ! code.append("::wamas::platform::utils::SmartPtr< ::wamas::platform::utils::Value >"); code.append(" "); code.append(typedef.getIdentifier()); Index: AnyMapping.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/plugin/AnyMapping.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AnyMapping.java 4 Dec 2006 15:48:32 -0000 1.6 --- AnyMapping.java 16 Jan 2007 13:28:32 -0000 1.7 *************** *** 21,24 **** String getIncludeCode(MAliasDef alias); String getDefinitionCode(MAliasDef alias); - // String getDebugCode(MAliasDef alias); } --- 21,23 ---- |
|
From: Teiniker E. <tei...@us...> - 2007-01-16 09:25:29
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/idl/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18835/src/ccmtools/generator/idl/metamodel Modified Files: ModelElement.java ComponentDef.java InterfaceDef.java HomeDef.java Log Message: Refactored IDL and Java metamodel elements Index: ModelElement.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/idl/metamodel/ModelElement.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ModelElement.java 19 Dec 2006 16:54:53 -0000 1.13 --- ModelElement.java 16 Jan 2007 09:25:23 -0000 1.14 *************** *** 14,18 **** public abstract class ModelElement ! implements Idl3GeneratorElement, Idl2GeneratorElement { /************************************************************************* --- 14,20 ---- public abstract class ModelElement ! implements ! Idl3GeneratorElement, ! Idl2GeneratorElement { /************************************************************************* Index: ComponentDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/idl/metamodel/ComponentDef.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ComponentDef.java 18 Dec 2006 21:34:18 -0000 1.9 --- ComponentDef.java 16 Jan 2007 09:25:23 -0000 1.10 *************** *** 15,20 **** public class ComponentDef ! extends InterfaceDef ! implements Type, Idl3MirrorGeneratorElement { /************************************************************************* --- 15,23 ---- public class ComponentDef ! extends ! InterfaceDef ! implements ! Type, ! Idl3MirrorGeneratorElement { /************************************************************************* Index: HomeDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/idl/metamodel/HomeDef.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** HomeDef.java 18 Dec 2006 21:34:18 -0000 1.9 --- HomeDef.java 16 Jan 2007 09:25:24 -0000 1.10 *************** *** 15,20 **** public class HomeDef ! extends InterfaceDef ! implements Idl3MirrorGeneratorElement { /************************************************************************* --- 15,22 ---- public class HomeDef ! extends ! InterfaceDef ! implements ! Idl3MirrorGeneratorElement { /************************************************************************* Index: InterfaceDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/idl/metamodel/InterfaceDef.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** InterfaceDef.java 11 Aug 2006 11:40:48 -0000 1.6 --- InterfaceDef.java 16 Jan 2007 09:25:24 -0000 1.7 *************** *** 12,17 **** public class InterfaceDef ! extends ModelElement ! implements Type { /************************************************************************* --- 12,19 ---- public class InterfaceDef ! extends ! ModelElement ! implements ! Type { /************************************************************************* |
|
From: Teiniker E. <tei...@us...> - 2007-01-16 09:25:28
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/idl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18835/src/ccmtools/generator/idl Modified Files: IdlGenerator.java Log Message: Refactored IDL and Java metamodel elements Index: IdlGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/idl/IdlGenerator.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** IdlGenerator.java 18 Dec 2006 21:34:19 -0000 1.15 --- IdlGenerator.java 16 Jan 2007 09:25:24 -0000 1.16 *************** *** 13,17 **** import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.ConfigurationLocator; - import ccmtools.utils.SourceFile; import ccmtools.utils.SourceFileHelper; --- 13,16 ---- *************** *** 80,103 **** try { ConfigurationLocator.getInstance().setIdlNamespaceExtension(new ArrayList<String>()); ! List<Idl3GeneratorElement> idl3ModelElements = new ArrayList<Idl3GeneratorElement>(); ! idl3ModelElements.addAll(idlModelRepo.findAllTypedefs()); ! idl3ModelElements.addAll(idlModelRepo.findAllEnums()); ! idl3ModelElements.addAll(idlModelRepo.findAllStructs()); ! idl3ModelElements.addAll(idlModelRepo.findAllGlobalConstants()); ! idl3ModelElements.addAll(idlModelRepo.findAllExceptions()); ! idl3ModelElements.addAll(idlModelRepo.findAllInterfaces()); ! idl3ModelElements.addAll(idlModelRepo.findAllComponents()); ! idl3ModelElements.addAll(idlModelRepo.findAllHomes()); ! List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); ! for(Idl3GeneratorElement idl3Element : idl3ModelElements) { ! sourceFileList.addAll(idl3Element.generateIdl3SourceFiles()); } - - // Save all source file objects - SourceFileHelper.writeSourceFiles(uiDriver, parameters.getOutDir(), sourceFileList); } catch (Exception e) --- 79,101 ---- try { + // IDL3 model elements don't have a namespace extension ConfigurationLocator.getInstance().setIdlNamespaceExtension(new ArrayList<String>()); ! List<Idl3GeneratorElement> generatorElements = new ArrayList<Idl3GeneratorElement>(); ! generatorElements.addAll(idlModelRepo.findAllTypedefs()); ! generatorElements.addAll(idlModelRepo.findAllEnums()); ! generatorElements.addAll(idlModelRepo.findAllStructs()); ! generatorElements.addAll(idlModelRepo.findAllGlobalConstants()); ! generatorElements.addAll(idlModelRepo.findAllExceptions()); ! generatorElements.addAll(idlModelRepo.findAllInterfaces()); ! generatorElements.addAll(idlModelRepo.findAllComponents()); ! generatorElements.addAll(idlModelRepo.findAllHomes()); ! // Save all source file objects ! for(Idl3GeneratorElement element : generatorElements) { ! SourceFileHelper.writeSourceFiles(uiDriver, parameters.getOutDir(), ! element.generateIdl3SourceFiles()); } } catch (Exception e) *************** *** 115,136 **** try { ConfigurationLocator.getInstance().setIdlNamespaceExtension(new ArrayList<String>()); ! List<Idl3MirrorGeneratorElement> idl3ModelElements = new ArrayList<Idl3MirrorGeneratorElement>(); ! idl3ModelElements.addAll(idlModelRepo.findAllComponents()); ! idl3ModelElements.addAll(idlModelRepo.findAllHomes()); ! List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); ! for(Idl3MirrorGeneratorElement idl3Element : idl3ModelElements) { ! sourceFileList.addAll(idl3Element.generateIdl3MirrorSourceFiles()); } - - // Save all source file objects - SourceFileHelper.writeSourceFiles(uiDriver, parameters.getOutDir(), sourceFileList); } catch (Exception e) { - e.printStackTrace(); throw new CcmtoolsException("[IDL3Mirror Generator] " + e.getMessage()); } --- 113,132 ---- try { + // IDL3Mirror model elements don't have a namespace extension ConfigurationLocator.getInstance().setIdlNamespaceExtension(new ArrayList<String>()); ! List<Idl3MirrorGeneratorElement> generatorElements = new ArrayList<Idl3MirrorGeneratorElement>(); ! generatorElements.addAll(idlModelRepo.findAllComponents()); ! generatorElements.addAll(idlModelRepo.findAllHomes()); ! // Save all source file objects ! for(Idl3MirrorGeneratorElement element : generatorElements) { ! SourceFileHelper.writeSourceFiles(uiDriver, parameters.getOutDir(), ! element.generateIdl3MirrorSourceFiles()); } } catch (Exception e) { throw new CcmtoolsException("[IDL3Mirror Generator] " + e.getMessage()); } *************** *** 145,173 **** try { List<String> idlNamespaceExtension = ConfigurationLocator.getInstance().getIdl2NamespaceExtension(); ConfigurationLocator.getInstance().setIdlNamespaceExtension(idlNamespaceExtension); ! List<Idl2GeneratorElement> idl2ModelElements = new ArrayList<Idl2GeneratorElement>(); ! idl2ModelElements.addAll(idlModelRepo.findAllTypedefs()); ! idl2ModelElements.addAll(idlModelRepo.findAllEnums()); ! idl2ModelElements.addAll(idlModelRepo.findAllStructs()); ! idl2ModelElements.addAll(idlModelRepo.findAllGlobalConstants()); ! idl2ModelElements.addAll(idlModelRepo.findAllExceptions()); ! idl2ModelElements.addAll(idlModelRepo.findAllInterfaces()); ! idl2ModelElements.addAll(idlModelRepo.findAllComponents()); ! idl2ModelElements.addAll(idlModelRepo.findAllHomes()); ! ! List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); ! for(Idl2GeneratorElement idl2Element : idl2ModelElements) ! { ! sourceFileList.addAll(idl2Element.generateIdl2SourceFiles()); ! } // Save all source file objects ! SourceFileHelper.writeSourceFiles(uiDriver, parameters.getOutDir(), sourceFileList); } catch (Exception e) { - e.printStackTrace(); throw new CcmtoolsException("[IDL2 Generator] " + e.getMessage()); } --- 141,167 ---- try { + // Inject a namespace extension for IDL2 model elements, e.g. "ccmtools::corba" List<String> idlNamespaceExtension = ConfigurationLocator.getInstance().getIdl2NamespaceExtension(); ConfigurationLocator.getInstance().setIdlNamespaceExtension(idlNamespaceExtension); ! List<Idl2GeneratorElement> generatorElements = new ArrayList<Idl2GeneratorElement>(); ! generatorElements.addAll(idlModelRepo.findAllTypedefs()); ! generatorElements.addAll(idlModelRepo.findAllEnums()); ! generatorElements.addAll(idlModelRepo.findAllStructs()); ! generatorElements.addAll(idlModelRepo.findAllGlobalConstants()); ! generatorElements.addAll(idlModelRepo.findAllExceptions()); ! generatorElements.addAll(idlModelRepo.findAllInterfaces()); ! generatorElements.addAll(idlModelRepo.findAllComponents()); ! generatorElements.addAll(idlModelRepo.findAllHomes()); // Save all source file objects ! for(Idl2GeneratorElement element : generatorElements) ! { ! SourceFileHelper.writeSourceFiles(uiDriver, parameters.getOutDir(), ! element.generateIdl2SourceFiles()); ! } } catch (Exception e) { throw new CcmtoolsException("[IDL2 Generator] " + e.getMessage()); } |
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6247/src/ccmtools/generator/java/metamodel Modified Files: ComponentDef.java ModelElement.java StructDef.java ArrayDef.java ConstantDef.java HomeDef.java SequenceDef.java ProvidesDef.java InterfaceDef.java EnumDef.java ExceptionDef.java Added Files: JavaLocalInterfaceGeneratorElement.java JavaCorbaAdapterGeneratorElement.java JavaLocalAdapterGeneratorElement.java JavaApplicationGeneratorElement.java JavaClientLibGeneratorElement.java Log Message: Added generator element interfaces to the java generator. --- NEW FILE: JavaLocalInterfaceGeneratorElement.java --- package ccmtools.generator.java.metamodel; import java.util.List; import ccmtools.utils.SourceFile; public interface JavaLocalInterfaceGeneratorElement { List<SourceFile> generateLocalInterfaceSourceFiles(); } --- NEW FILE: JavaCorbaAdapterGeneratorElement.java --- package ccmtools.generator.java.metamodel; import java.util.List; import ccmtools.utils.SourceFile; public interface JavaCorbaAdapterGeneratorElement { List<SourceFile> generateCorbaAdapterSourceFiles(); } Index: SequenceDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/SequenceDef.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** SequenceDef.java 26 Jul 2006 14:36:17 -0000 1.14 --- SequenceDef.java 15 Jan 2007 16:42:22 -0000 1.15 *************** *** 11,16 **** public class SequenceDef ! extends ModelElement ! implements Type { private long bound; --- 11,19 ---- public class SequenceDef ! extends ! ModelElement ! implements ! Type, ! JavaCorbaAdapterGeneratorElement { private long bound; *************** *** 162,166 **** // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaComponentSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- 165,169 ---- // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaAdapterSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); Index: HomeDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/HomeDef.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** HomeDef.java 26 Jul 2006 14:36:17 -0000 1.9 --- HomeDef.java 15 Jan 2007 16:42:22 -0000 1.10 *************** *** 25,29 **** public class HomeDef ! extends ModelElement { private ComponentDef component; --- 25,36 ---- public class HomeDef ! extends ! ModelElement ! implements ! JavaLocalInterfaceGeneratorElement, ! JavaLocalAdapterGeneratorElement, ! JavaClientLibGeneratorElement, ! JavaCorbaAdapterGeneratorElement, ! JavaApplicationGeneratorElement { private ComponentDef component; *************** *** 143,147 **** // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateLocalComponentSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- 150,154 ---- // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateLocalAdapterSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); *************** *** 191,194 **** --- 198,204 ---- // Generate SourceFile objects -------------------------------------------- + /* (non-Javadoc) + * @see ccmtools.generator.java.metamodel.JavaApplicationGeneratorElement#generateApplicationSourceFiles() + */ public List<SourceFile> generateApplicationSourceFiles() { *************** *** 226,230 **** // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateClientLibComponentSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- 236,240 ---- // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateClientLibSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); *************** *** 261,265 **** // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaComponentSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- 271,275 ---- // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaAdapterSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); Index: InterfaceDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/InterfaceDef.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** InterfaceDef.java 26 Jul 2006 14:36:17 -0000 1.12 --- InterfaceDef.java 15 Jan 2007 16:42:22 -0000 1.13 *************** *** 16,20 **** public class InterfaceDef ! extends ModelElement { private List<InterfaceDef> baseInterfaces = new ArrayList<InterfaceDef>(); --- 16,25 ---- public class InterfaceDef ! extends ! ModelElement ! implements ! JavaLocalInterfaceGeneratorElement, ! JavaLocalAdapterGeneratorElement, ! JavaCorbaAdapterGeneratorElement { private List<InterfaceDef> baseInterfaces = new ArrayList<InterfaceDef>(); *************** *** 175,179 **** // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateLocalComponentSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- 180,184 ---- // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateLocalAdapterSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); *************** *** 211,215 **** // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaComponentSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- 216,220 ---- // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaAdapterSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); Index: ComponentDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ComponentDef.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ComponentDef.java 26 Jul 2006 14:36:17 -0000 1.14 --- ComponentDef.java 15 Jan 2007 16:42:21 -0000 1.15 *************** *** 19,23 **** public class ComponentDef ! extends ModelElement { private List<AttributeDef> attributes = new ArrayList<AttributeDef>(); --- 19,30 ---- public class ComponentDef ! extends ! ModelElement ! implements ! JavaLocalInterfaceGeneratorElement, ! JavaLocalAdapterGeneratorElement, ! JavaClientLibGeneratorElement, ! JavaCorbaAdapterGeneratorElement, ! JavaApplicationGeneratorElement { private List<AttributeDef> attributes = new ArrayList<AttributeDef>(); *************** *** 25,29 **** private List<UsesDef> receptacle = new ArrayList<UsesDef>(); private List<SupportsDef> supports = new ArrayList<SupportsDef>(); ! private HomeDef home; --- 32,36 ---- private List<UsesDef> receptacle = new ArrayList<UsesDef>(); private List<SupportsDef> supports = new ArrayList<SupportsDef>(); ! private JavaApplicationGeneratorElement home; *************** *** 55,64 **** ! public HomeDef getHome() { return home; } ! public void setHome(HomeDef home) { this.home = home; --- 62,71 ---- ! public JavaApplicationGeneratorElement getHome() { return home; } ! public void setHome(JavaApplicationGeneratorElement home) { this.home = home; *************** *** 180,184 **** // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateLocalComponentSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- 187,191 ---- // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateLocalAdapterSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); *************** *** 246,250 **** // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateClientLibComponentSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- 253,257 ---- // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateClientLibSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); *************** *** 272,276 **** // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaComponentSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- 279,283 ---- // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaAdapterSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- NEW FILE: JavaClientLibGeneratorElement.java --- package ccmtools.generator.java.metamodel; import java.util.List; import ccmtools.utils.SourceFile; public interface JavaClientLibGeneratorElement { List<SourceFile> generateClientLibSourceFiles(); } --- NEW FILE: JavaLocalAdapterGeneratorElement.java --- package ccmtools.generator.java.metamodel; import java.util.List; import ccmtools.utils.SourceFile; public interface JavaLocalAdapterGeneratorElement { List<SourceFile> generateLocalAdapterSourceFiles(); } Index: ExceptionDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ExceptionDef.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ExceptionDef.java 26 Jul 2006 14:36:17 -0000 1.11 --- ExceptionDef.java 15 Jan 2007 16:42:23 -0000 1.12 *************** *** 16,20 **** public class ExceptionDef ! extends ModelElement { private List<FieldDef> fields = new ArrayList<FieldDef>(); --- 16,24 ---- public class ExceptionDef ! extends ! ModelElement ! implements ! JavaLocalInterfaceGeneratorElement, ! JavaCorbaAdapterGeneratorElement { private List<FieldDef> fields = new ArrayList<FieldDef>(); *************** *** 147,151 **** // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaComponentSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- 151,155 ---- // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaAdapterSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); Index: ArrayDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ArrayDef.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ArrayDef.java 26 Jul 2006 14:36:17 -0000 1.13 --- ArrayDef.java 15 Jan 2007 16:42:21 -0000 1.14 *************** *** 11,16 **** public class ArrayDef ! extends ModelElement ! implements Type { /** Array type which is the same for all elements staored in an array. */ --- 11,19 ---- public class ArrayDef ! extends ! ModelElement ! implements ! Type, ! JavaCorbaAdapterGeneratorElement { /** Array type which is the same for all elements staored in an array. */ *************** *** 185,189 **** // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaComponentSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- 188,192 ---- // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaAdapterSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); Index: StructDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/StructDef.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** StructDef.java 26 Jul 2006 14:36:17 -0000 1.14 --- StructDef.java 15 Jan 2007 16:42:21 -0000 1.15 *************** *** 15,20 **** public class StructDef ! extends ModelElement ! implements Type { private List<FieldDef> fields = new ArrayList<FieldDef>(); --- 15,24 ---- public class StructDef ! extends ! ModelElement ! implements ! Type, ! JavaLocalInterfaceGeneratorElement, ! JavaCorbaAdapterGeneratorElement { private List<FieldDef> fields = new ArrayList<FieldDef>(); *************** *** 187,191 **** // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaComponentSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- 191,195 ---- // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaAdapterSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); Index: ConstantDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ConstantDef.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ConstantDef.java 26 Jul 2006 14:36:17 -0000 1.5 --- ConstantDef.java 15 Jan 2007 16:42:22 -0000 1.6 *************** *** 12,15 **** --- 12,16 ---- public class ConstantDef extends ModelElement + implements JavaLocalInterfaceGeneratorElement { private Type type; --- NEW FILE: JavaApplicationGeneratorElement.java --- package ccmtools.generator.java.metamodel; import java.util.List; import ccmtools.utils.SourceFile; public interface JavaApplicationGeneratorElement { List<SourceFile> generateApplicationSourceFiles(); } Index: ModelElement.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ModelElement.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ModelElement.java 10 Jan 2007 16:19:21 -0000 1.12 --- ModelElement.java 15 Jan 2007 16:42:21 -0000 1.13 *************** *** 71,76 **** javaNamespaceList = new ArrayList<String>(); javaNamespaceList.addAll(namespace); - // getJavaNamespaceList().add("ccm"); - // getJavaNamespaceList().add("local"); } --- 71,74 ---- *************** *** 94,99 **** javaRemoteNamespaceList.addAll(ConfigurationLocator.getInstance().getJavaRemoteNamespaceExtension()); javaRemoteNamespaceList.addAll(namespace); - // getJavaRemoteNamespaceList().add("ccm"); - // getJavaRemoteNamespaceList().add("remote"); } --- 92,95 ---- Index: EnumDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/EnumDef.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** EnumDef.java 26 Jul 2006 14:36:17 -0000 1.14 --- EnumDef.java 15 Jan 2007 16:42:23 -0000 1.15 *************** *** 13,18 **** public class EnumDef ! extends ModelElement ! implements Type { private List<String> members = new ArrayList<String>(); --- 13,22 ---- public class EnumDef ! extends ! ModelElement ! implements ! Type, ! JavaLocalInterfaceGeneratorElement, ! JavaCorbaAdapterGeneratorElement { private List<String> members = new ArrayList<String>(); *************** *** 187,191 **** // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaComponentSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); --- 191,195 ---- // Generate SourceFile objects -------------------------------------------- ! public List<SourceFile> generateCorbaAdapterSourceFiles() { List<SourceFile> sourceFileList = new ArrayList<SourceFile>(); Index: ProvidesDef.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ProvidesDef.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ProvidesDef.java 10 Jan 2007 16:19:21 -0000 1.14 --- ProvidesDef.java 15 Jan 2007 16:42:22 -0000 1.15 *************** *** 18,22 **** public class ProvidesDef ! extends ModelElement { private ComponentDef component; --- 18,23 ---- public class ProvidesDef ! extends ModelElement ! implements JavaApplicationGeneratorElement { private ComponentDef component; |
|
From: Teiniker E. <tei...@us...> - 2007-01-15 16:42:31
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6247/src/ccmtools/generator/java Modified Files: Main.java Added Files: JavaComponentGenerator.java Removed Files: ComponentGenerator.java Log Message: Added generator element interfaces to the java generator. --- NEW FILE: JavaComponentGenerator.java --- package ccmtools.generator.java; import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; import ccmtools.CcmtoolsException; import ccmtools.Constants; import ccmtools.generator.java.metamodel.JavaApplicationGeneratorElement; import ccmtools.generator.java.metamodel.JavaClientLibGeneratorElement; import ccmtools.generator.java.metamodel.JavaCorbaAdapterGeneratorElement; import ccmtools.generator.java.metamodel.JavaLocalAdapterGeneratorElement; import ccmtools.generator.java.metamodel.JavaLocalInterfaceGeneratorElement; import ccmtools.generator.java.metamodel.ModelRepository; import ccmtools.ui.UserInterfaceDriver; import ccmtools.utils.SourceFileHelper; public class JavaComponentGenerator { /** String constants used for generator selection */ public static final String INTERFACE_GENERATOR_ID = "iface"; public static final String APPLICATION_GENERATOR_ID = "app"; public static final String LOCAL_COMPONENT_GENERATOR_ID = "local"; public static final String CLIENT_LIB_GENERATOR_ID = "clientlib"; public static final String CORBA_COMPONENT_GENERATOR_ID = "remote"; /** UI driver for generator messages */ protected UserInterfaceDriver uiDriver; /** Command line parameters */ protected CommandLineParameters parameters; /** Java standard logger object */ protected Logger logger; public JavaComponentGenerator(CommandLineParameters parameters, UserInterfaceDriver uiDriver) { this.uiDriver = uiDriver; this.parameters = (CommandLineParameters)parameters; logger = Logger.getLogger("ccm.generator.java"); logger.fine(""); printVersion(uiDriver); } public static void printVersion(UserInterfaceDriver uiDriver) { uiDriver.println("+"); uiDriver.println("+ Java Component Generator, " + Constants.CCMTOOLS_VERSION_TEXT); uiDriver.println("+"); uiDriver.println("+"); uiDriver.println(Constants.CCMTOOLS_COPYRIGHT_TEXT); } public void generate(ModelRepository javaModel) throws CcmtoolsException { logger.fine("enter"); for (String generatorId : parameters.getGeneratorIds()) { if (generatorId.equals(INTERFACE_GENERATOR_ID)) { generateInterface(javaModel); } else if (generatorId.equals(LOCAL_COMPONENT_GENERATOR_ID)) { generateLocalComponent(javaModel); } else if (generatorId.equals(CLIENT_LIB_GENERATOR_ID)) { generateClientLibComponent(javaModel); } else if (generatorId.equals(CORBA_COMPONENT_GENERATOR_ID)) { generateCorbaComponent(javaModel); } else if (generatorId.equals(APPLICATION_GENERATOR_ID)) { generateApplication(javaModel); } } logger.fine("leave"); } public void generateInterface(ModelRepository javaModelRepo) throws CcmtoolsException { logger.fine("enter"); try { List<JavaLocalInterfaceGeneratorElement> generatorElements = new ArrayList<JavaLocalInterfaceGeneratorElement>(); generatorElements.addAll(javaModelRepo.findAllInterfaces()); generatorElements.addAll(javaModelRepo.findAllComponents()); generatorElements.addAll(javaModelRepo.findAllHomes()); generatorElements.addAll(javaModelRepo.findAllGlobalConstants()); generatorElements.addAll(javaModelRepo.findAllEnums()); generatorElements.addAll(javaModelRepo.findAllStructs()); generatorElements.addAll(javaModelRepo.findAllExceptions()); // Save all source file objects for(JavaLocalInterfaceGeneratorElement element : generatorElements) { SourceFileHelper.writeSourceFiles(uiDriver, parameters.getOutDir(), element.generateLocalInterfaceSourceFiles()); } } catch (Exception e) { e.printStackTrace(); throw new CcmtoolsException("[Java Interface Generator] " + e.getMessage()); } logger.fine("leave"); } public void generateLocalComponent(ModelRepository javaModelRepo) throws CcmtoolsException { logger.fine("enter"); try { List<JavaLocalAdapterGeneratorElement> generatorElements = new ArrayList<JavaLocalAdapterGeneratorElement>(); generatorElements.addAll(javaModelRepo.findAllInterfaces()); generatorElements.addAll(javaModelRepo.findAllComponents()); generatorElements.addAll(javaModelRepo.findAllHomes()); // Save all source file objects for(JavaLocalAdapterGeneratorElement element : generatorElements) { SourceFileHelper.writeSourceFiles(uiDriver, parameters.getOutDir(), element.generateLocalAdapterSourceFiles()); } } catch (Exception e) { throw new CcmtoolsException("[Java Local Component Generator] " + e.getMessage()); } logger.fine("leave"); } public void generateApplication(ModelRepository javaModelRepo) throws CcmtoolsException { logger.fine("enter"); try { List<JavaApplicationGeneratorElement> generatorElements = new ArrayList<JavaApplicationGeneratorElement>(); generatorElements.addAll(javaModelRepo.findAllProvides()); generatorElements.addAll(javaModelRepo.findAllComponents()); generatorElements.addAll(javaModelRepo.findAllHomes()); // Save all source file objects for(JavaApplicationGeneratorElement element : generatorElements) { SourceFileHelper.writeApplicationFiles(uiDriver, parameters.getOutDir(), element.generateApplicationSourceFiles()); } } catch (Exception e) { throw new CcmtoolsException("[Java Application Skeleton Generator] " + e.getMessage()); } logger.fine("leave"); } public void generateClientLibComponent(ModelRepository javaModelRepo) throws CcmtoolsException { logger.fine("enter"); try { List<JavaClientLibGeneratorElement> generatorElements = new ArrayList<JavaClientLibGeneratorElement>(); generatorElements.addAll(javaModelRepo.findAllComponents()); generatorElements.addAll(javaModelRepo.findAllHomes()); // Save all source file objects for(JavaClientLibGeneratorElement element : generatorElements) { SourceFileHelper.writeSourceFiles(uiDriver, parameters.getOutDir(), element.generateClientLibSourceFiles()); } logger.fine("leave"); } catch (Exception e) { throw new CcmtoolsException("[Java Client Library Generator] " + e.getMessage()); } } public void generateCorbaComponent(ModelRepository javaModelRepo) throws CcmtoolsException { logger.fine("enter"); try { List<JavaCorbaAdapterGeneratorElement> generatorElements = new ArrayList<JavaCorbaAdapterGeneratorElement>(); generatorElements.addAll(javaModelRepo.findAllComponents()); generatorElements.addAll(javaModelRepo.findAllHomes()); generatorElements.addAll(javaModelRepo.findAllInterfaces()); generatorElements.addAll(javaModelRepo.findAllEnums()); generatorElements.addAll(javaModelRepo.findAllStructs()); generatorElements.addAll(javaModelRepo.findAllExceptions()); generatorElements.addAll(javaModelRepo.findAllSequences()); generatorElements.addAll(javaModelRepo.findAllArrays()); // Save all source file objects for(JavaCorbaAdapterGeneratorElement element : generatorElements) { SourceFileHelper.writeSourceFiles(uiDriver, parameters.getOutDir(), element.generateCorbaAdapterSourceFiles()); } logger.fine("leave"); } catch (Exception e) { throw new CcmtoolsException("[Java CORBA Component Generator] " + e.getMessage()); } } } Index: Main.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/Main.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Main.java 15 Jan 2007 15:00:14 -0000 1.6 --- Main.java 15 Jan 2007 16:42:24 -0000 1.7 *************** *** 59,63 **** parameters.validate(); setCcmtoolsProperties(); ! ComponentGenerator generator = new ComponentGenerator(parameters, uiDriver); for (Iterator i = parameters.getIdlFiles().iterator(); i.hasNext();) --- 59,63 ---- parameters.validate(); setCcmtoolsProperties(); ! JavaComponentGenerator generator = new JavaComponentGenerator(parameters, uiDriver); for (Iterator i = parameters.getIdlFiles().iterator(); i.hasNext();) *************** *** 128,140 **** options.addOption("h", "help", false,"Display this help"); options.addOption("V", "version", false, "Display CCM Tools version information"); ! options.addOption(ComponentGenerator.CLIENT_LIB_GENERATOR_ID, false, "Run the Java client library generator"); ! options.addOption(ComponentGenerator.LOCAL_COMPONENT_GENERATOR_ID, false, "Run the Java local component generator"); ! options.addOption(ComponentGenerator.APPLICATION_GENERATOR_ID, false, "Run the Java application stubs generator"); ! options.addOption(ComponentGenerator.INTERFACE_GENERATOR_ID, false, "Run the Java interface generator"); ! options.addOption(ComponentGenerator.CORBA_COMPONENT_GENERATOR_ID, false, "Run the Java CORBA component generator"); options.addOption("noexit", false, "Don't exit Java VM with error status"); --- 128,140 ---- options.addOption("h", "help", false,"Display this help"); options.addOption("V", "version", false, "Display CCM Tools version information"); ! options.addOption(JavaComponentGenerator.CLIENT_LIB_GENERATOR_ID, false, "Run the Java client library generator"); ! options.addOption(JavaComponentGenerator.LOCAL_COMPONENT_GENERATOR_ID, false, "Run the Java local component generator"); ! options.addOption(JavaComponentGenerator.APPLICATION_GENERATOR_ID, false, "Run the Java application stubs generator"); ! options.addOption(JavaComponentGenerator.INTERFACE_GENERATOR_ID, false, "Run the Java interface generator"); ! options.addOption(JavaComponentGenerator.CORBA_COMPONENT_GENERATOR_ID, false, "Run the Java CORBA component generator"); options.addOption("noexit", false, "Don't exit Java VM with error status"); *************** *** 178,208 **** if(cmd.hasOption("V")) { ! ComponentGenerator.printVersion(uiDriver); return false; // don't continue program execution } ! if (cmd.hasOption(ComponentGenerator.CLIENT_LIB_GENERATOR_ID)) { ! parameters.getGeneratorIds().add(ComponentGenerator.CLIENT_LIB_GENERATOR_ID); } ! if (cmd.hasOption(ComponentGenerator.LOCAL_COMPONENT_GENERATOR_ID)) { ! parameters.getGeneratorIds().add(ComponentGenerator.LOCAL_COMPONENT_GENERATOR_ID); } ! if (cmd.hasOption(ComponentGenerator.APPLICATION_GENERATOR_ID)) { ! parameters.getGeneratorIds().add(ComponentGenerator.APPLICATION_GENERATOR_ID); } ! if (cmd.hasOption(ComponentGenerator.INTERFACE_GENERATOR_ID)) { ! parameters.getGeneratorIds().add(ComponentGenerator.INTERFACE_GENERATOR_ID); } ! if (cmd.hasOption(ComponentGenerator.CORBA_COMPONENT_GENERATOR_ID)) { ! parameters.getGeneratorIds().add(ComponentGenerator.CORBA_COMPONENT_GENERATOR_ID); } --- 178,208 ---- if(cmd.hasOption("V")) { ! JavaComponentGenerator.printVersion(uiDriver); return false; // don't continue program execution } ! if (cmd.hasOption(JavaComponentGenerator.CLIENT_LIB_GENERATOR_ID)) { ! parameters.getGeneratorIds().add(JavaComponentGenerator.CLIENT_LIB_GENERATOR_ID); } ! if (cmd.hasOption(JavaComponentGenerator.LOCAL_COMPONENT_GENERATOR_ID)) { ! parameters.getGeneratorIds().add(JavaComponentGenerator.LOCAL_COMPONENT_GENERATOR_ID); } ! if (cmd.hasOption(JavaComponentGenerator.APPLICATION_GENERATOR_ID)) { ! parameters.getGeneratorIds().add(JavaComponentGenerator.APPLICATION_GENERATOR_ID); } ! if (cmd.hasOption(JavaComponentGenerator.INTERFACE_GENERATOR_ID)) { ! parameters.getGeneratorIds().add(JavaComponentGenerator.INTERFACE_GENERATOR_ID); } ! if (cmd.hasOption(JavaComponentGenerator.CORBA_COMPONENT_GENERATOR_ID)) { ! parameters.getGeneratorIds().add(JavaComponentGenerator.CORBA_COMPONENT_GENERATOR_ID); } --- ComponentGenerator.java DELETED --- |
|
From: Teiniker E. <tei...@us...> - 2007-01-15 15:01:53
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/local In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31827/ccm/local Modified Files: Confix2.pkg Log Message: Changed version to 0.8.4 Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/local/Confix2.pkg,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Confix2.pkg 8 Jan 2007 11:23:03 -0000 1.5 --- Confix2.pkg 15 Jan 2007 15:01:46 -0000 1.6 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime-local') ! PACKAGE_VERSION('0.8.3') --- 1,2 ---- PACKAGE_NAME('ccm-runtime-local') ! PACKAGE_VERSION('0.8.4') |
|
From: Teiniker E. <tei...@us...> - 2007-01-15 15:01:50
|
Update of /cvsroot/ccmtools/cpp-environment/ccm In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31827/ccm Modified Files: Confix2.pkg Log Message: Changed version to 0.8.4 Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/Confix2.pkg,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Confix2.pkg 8 Jan 2007 11:23:07 -0000 1.5 --- Confix2.pkg 15 Jan 2007 15:01:46 -0000 1.6 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime') ! PACKAGE_VERSION('0.8.3') --- 1,2 ---- PACKAGE_NAME('ccm-runtime') ! PACKAGE_VERSION('0.8.4') |
|
From: Teiniker E. <tei...@us...> - 2007-01-15 15:01:50
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/remote In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31827/ccm/remote Modified Files: Confix2.pkg Log Message: Changed version to 0.8.4 Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/remote/Confix2.pkg,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Confix2.pkg 8 Jan 2007 11:23:07 -0000 1.5 --- Confix2.pkg 15 Jan 2007 15:01:46 -0000 1.6 *************** *** 1,2 **** PACKAGE_NAME('ccm-remote-runtime') ! PACKAGE_VERSION('0.8.3') --- 1,2 ---- PACKAGE_NAME('ccm-remote-runtime') ! PACKAGE_VERSION('0.8.4') |
|
From: Teiniker E. <tei...@us...> - 2007-01-15 15:00:28
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31224/src/ccmtools/generator/java/metamodel Modified Files: ModelRepository.java Log Message: Fixed bug in the IDL parser which leads to redundant generation of Java impl files for facets. Index: ModelRepository.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/metamodel/ModelRepository.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ModelRepository.java 26 Jul 2006 14:36:16 -0000 1.9 --- ModelRepository.java 15 Jan 2007 15:00:15 -0000 1.10 *************** *** 28,34 **** public void addHome(HomeDef home) { ! homeList.add(home); ! } ! public List<HomeDef> findAllHomes() { --- 28,34 ---- public void addHome(HomeDef home) { ! if(!homeList.contains(home)) ! homeList.add(home); ! } public List<HomeDef> findAllHomes() { *************** *** 39,45 **** public void addComponent(ComponentDef component) { ! componentList.add(component); } - public List<ComponentDef> findAllComponents() { --- 39,45 ---- public void addComponent(ComponentDef component) { ! if(!componentList.contains(component)) ! componentList.add(component); } public List<ComponentDef> findAllComponents() { *************** *** 50,56 **** public void addInterface(InterfaceDef iface) { ! interfaceList.add(iface); } - public List<InterfaceDef> findAllInterfaces() { --- 50,56 ---- public void addInterface(InterfaceDef iface) { ! if(!interfaceList.contains(iface)) ! interfaceList.add(iface); } public List<InterfaceDef> findAllInterfaces() { *************** *** 61,67 **** public void addProvides(ProvidesDef provides) { ! providesList.add(provides); ! } ! public List<ProvidesDef> findAllProvides() { --- 61,67 ---- public void addProvides(ProvidesDef provides) { ! if(!providesList.contains(provides)) ! providesList.add(provides); ! } public List<ProvidesDef> findAllProvides() { *************** *** 72,78 **** public void addUses(UsesDef uses) { ! usesList.add(uses); ! } ! public List<UsesDef> findAllUses() { --- 72,78 ---- public void addUses(UsesDef uses) { ! if(!usesList.contains(uses)) ! usesList.add(uses); ! } public List<UsesDef> findAllUses() { *************** *** 83,89 **** public void addGlobalConstant(ConstantDef value) { ! constantList.add(value); } - public List<ConstantDef> findAllGlobalConstants() { --- 83,89 ---- public void addGlobalConstant(ConstantDef value) { ! if(!constantList.contains(value)) ! constantList.add(value); } public List<ConstantDef> findAllGlobalConstants() { *************** *** 94,100 **** public void addEnum(EnumDef value) { ! enumList.add(value); } - public List<EnumDef> findAllEnums() { --- 94,100 ---- public void addEnum(EnumDef value) { ! if(!enumList.contains(value)) ! enumList.add(value); } public List<EnumDef> findAllEnums() { *************** *** 105,111 **** public void addStruct(StructDef value) { ! structList.add(value); } - public List<StructDef> findAllStructs() { --- 105,111 ---- public void addStruct(StructDef value) { ! if(!structList.contains(value)) ! structList.add(value); } public List<StructDef> findAllStructs() { *************** *** 116,122 **** public void addException(ExceptionDef value) { ! exceptionList.add(value); } - public List<ExceptionDef> findAllExceptions() { --- 116,122 ---- public void addException(ExceptionDef value) { ! if(!exceptionList.contains(value)) ! exceptionList.add(value); } public List<ExceptionDef> findAllExceptions() { *************** *** 127,133 **** public void addSequence(SequenceDef value) { ! sequenceList.add(value); } - public List<SequenceDef> findAllSequences() { --- 127,133 ---- public void addSequence(SequenceDef value) { ! if(!sequenceList.contains(value)) ! sequenceList.add(value); } public List<SequenceDef> findAllSequences() { *************** *** 137,143 **** public void addArray(ArrayDef value) { ! arrayList.add(value); } - public List<ArrayDef> findAllArrays() { --- 137,143 ---- public void addArray(ArrayDef value) { ! if(!arrayList.contains(value)) ! arrayList.add(value); } public List<ArrayDef> findAllArrays() { |
|
From: Teiniker E. <tei...@us...> - 2007-01-15 15:00:24
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31224/src/ccmtools/parser/idl Modified Files: ParserHelper.java Log Message: Fixed bug in the IDL parser which leads to redundant generation of Java impl files for facets. Index: ParserHelper.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ParserHelper.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** ParserHelper.java 10 Jan 2007 16:19:17 -0000 1.40 --- ParserHelper.java 15 Jan 2007 15:00:15 -0000 1.41 *************** *** 2039,2042 **** --- 2039,2043 ---- MProvidesDef provides = new MProvidesDefImpl(); provides.setIdentifier(id); + provides.setSourceFile(getIncludedSourceFile()); MIDLType type = getModelRepository().findIdlType(getScope(), ifaceType); if(type == null) |
1 message has been excluded from this view by a project administrator.
