Index: /ossie/trunk/ossie/include/ossie/DomainManager_impl.h =================================================================== --- /ossie/trunk/ossie/include/ossie/DomainManager_impl.h (revision 3992) +++ /ossie/trunk/ossie/include/ossie/DomainManager_impl.h (revision 6151) @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright 2004, 2007, Virginia Polytechnic Institute and State University +Copyright 2004, 2007, 2008 Virginia Polytechnic Institute and State University This file is part of the OSSIE Core Framework. @@ -39,7 +39,5 @@ #include "cf.h" -#ifdef MS_dotNET #include "ossiecf.h" -#endif #include "FileManager_impl.h" @@ -78,6 +76,5 @@ #endif -class OSSIECF_API DomainManager_impl : public virtual POA_CF::DomainManager, - public PropertySet_impl +class OSSIECF_API DomainManager_impl : public virtual POA_CF::DomainManager { public: @@ -140,4 +137,13 @@ CF::DomainManager::InvalidEventChannelName, CORBA::SystemException); + + void + configure (const CF::Properties & configProperties) + throw (CF::PropertySet::PartialConfiguration, + CF::PropertySet::InvalidConfiguration, CORBA::SystemException); + + void + query (CF::Properties & configProperties) + throw (CF::UnknownProperties, CORBA::SystemException); CF::FileManager_ptr fileMgr(void) Index: /ossie/trunk/ossie/include/ossie/Resource_impl.h =================================================================== --- /ossie/trunk/ossie/include/ossie/Resource_impl.h (revision 2538) +++ /ossie/trunk/ossie/include/ossie/Resource_impl.h (revision 6151) @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright 2004, Virginia Polytechnic Institute and State University +Copyright 2004, 2008 Virginia Polytechnic Institute and State University This file is part of the OSSIE Core Framework. @@ -26,11 +26,8 @@ #include +#include "cf.h" #include "ossiecf.h" -#include "LifeCycle_impl.h" -#include "PortSupplier_impl.h" -#include "PropertySet_impl.h" -#include "TestableObject_impl.h" -class OSSIECF_API Resource_impl:public virtual POA_CF::Resource, public PropertySet_impl, public PortSupplier_impl, public LifeCycle_impl, public TestableObject_impl +class OSSIECF_API Resource_impl:public virtual POA_CF::Resource { @@ -40,8 +37,20 @@ public: Resource_impl (const char *_uuid); - void start () throw (CF::Resource::StartError, CORBA::SystemException); - void stop () throw (CF::Resource::StopError, CORBA::SystemException); + char *identifier () throw (CORBA::SystemException); + void start () throw (CF::Resource::StartError, CORBA::SystemException) = 0; + void stop () throw (CF::Resource::StopError, CORBA::SystemException) = 0; + + CORBA::Object_ptr getPort( const char* portName ) throw (CF::PortSupplier::UnknownPort, CORBA::SystemException) = 0; + + void initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException) = 0; + void releaseObject() throw (CF::LifeCycle::ReleaseError, CORBA::SystemException) = 0; + + void configure(const CF::Properties&) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration) = 0; + void query (CF::Properties & configProperties) throw (CORBA::SystemException, CF::UnknownProperties) = 0; + + void runTest (CORBA::ULong _number, CF::Properties & _props) throw (CORBA::SystemException, CF::TestableObject::UnknownTest, CF::UnknownProperties) = 0; + private: Resource_impl(); // No default constructor Index: /ossie/trunk/ossie/include/ossie/DeviceManager_impl.h =================================================================== --- /ossie/trunk/ossie/include/ossie/DeviceManager_impl.h (revision 3841) +++ /ossie/trunk/ossie/include/ossie/DeviceManager_impl.h (revision 6151) @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright 2004, 2007 Virginia Polytechnic Institute and State University +Copyright 2004, 2007, 2008 Virginia Polytechnic Institute and State University This file is part of the OSSIE Core Framework. @@ -26,6 +26,4 @@ #include "ossieSupport.h" -#include "PropertySet_impl.h" -#include "PortSupplier_impl.h" #include "FileManager_impl.h" #include "automaticTest.h" @@ -35,6 +33,5 @@ #include "SPDImplementation.h" -class OSSIECF_API DeviceManager_impl: public virtual POA_CF::DeviceManager, - public PropertySet_impl, public PortSupplier_impl +class OSSIECF_API DeviceManager_impl: public virtual POA_CF::DeviceManager { public: @@ -56,4 +53,15 @@ char* label() throw (CORBA::SystemException); + + void + configure (const CF::Properties & configProperties) + throw (CF::PropertySet::PartialConfiguration, + CF::PropertySet::InvalidConfiguration, CORBA::SystemException); + + void + query (CF::Properties & configProperties) + throw (CF::UnknownProperties, CORBA::SystemException); + + CORBA::Object* getPort (const char *) throw (CF::PortSupplier::UnknownPort, CORBA::SystemException); CF::DeviceSequence* registeredDevices() Index: /ossie/trunk/ossie/include/ossie/Device_impl.h =================================================================== --- /ossie/trunk/ossie/include/ossie/Device_impl.h (revision 3957) +++ /ossie/trunk/ossie/include/ossie/Device_impl.h (revision 6151) @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright 2004, Virginia Polytechnic Institute and State University +Copyright 2004, 2008 Virginia Polytechnic Institute and State University This file is part of the OSSIE Core Framework. @@ -32,8 +32,8 @@ #include -#include "Resource_impl.h" -#include "automaticTest.h" #include "cf.h" -class OSSIECF_API Device_impl:public virtual POA_CF::Device, public Resource_impl +#include "ossiecf.h" + +class OSSIECF_API Device_impl:public virtual POA_CF::Device { protected: Index: /ossie/trunk/ossie/include/ossie/Application_impl.h =================================================================== --- /ossie/trunk/ossie/include/ossie/Application_impl.h (revision 4064) +++ /ossie/trunk/ossie/include/ossie/Application_impl.h (revision 6151) @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright 2004, 2007 Virginia Polytechnic Institute and State University +Copyright 2004, 2007, 2008 Virginia Polytechnic Institute and State University This file is part of the OSSIE Core Framework. @@ -31,5 +31,4 @@ #include "ossiecf.h" #include "ossieSupport.h" -#include "Resource_impl.h" #include "SADParser.h" #include "SPDParser.h" @@ -45,11 +44,5 @@ PROC_ID_SEQ; -class OSSIECF_API -Application_impl: -public - virtual - POA_CF::Application, -public - Resource_impl +class OSSIECF_API Application_impl : public virtual POA_CF::Application { protected: @@ -91,10 +84,19 @@ start () throw (CF::Resource::StartError, CORBA::SystemException); + void stop () throw (CF::Resource::StopError, CORBA::SystemException); + + char *identifier() throw (CORBA::SystemException); + + void configure (const CF::Properties & configProperties) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration); + + void query (CF::Properties & configProperties) throw (CORBA::SystemException, CF::UnknownProperties); + void initialize () throw (CF::LifeCycle::InitializeError, CORBA::SystemException); + void releaseObject () @@ -103,9 +105,12 @@ getPort (const char *) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort); + void runTest (CORBA::ULong, CF::Properties&) throw (CORBA::SystemException, CF::UnknownProperties, CF::TestableObject::UnknownTest); + char *profile () throw (CORBA::SystemException); char *name () throw (CORBA::SystemException); + DEV_SEQ * componentDevices () @@ -126,4 +131,5 @@ SADParser *_sadParser; + std::string id; std::string sadProfile; std::string appName; Index: /ossie/trunk/ossie/framework/Resource_impl.cpp =================================================================== --- /ossie/trunk/ossie/framework/Resource_impl.cpp (revision 2539) +++ /ossie/trunk/ossie/framework/Resource_impl.cpp (revision 6151) @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright 2004, Virginia Polytechnic Institute and State University +Copyright 2004, 2008 Virginia Polytechnic Institute and State University This file is part of the OSSIE Core Framework. @@ -29,18 +29,4 @@ -void Resource_impl::start () throw (CORBA::SystemException, CF::Resource::StartError) -{ -// set CF::Device::UsageType = ACTIVE; -// generally, you'll overload this with some implementation that is dependent to your specific component -} - - -void Resource_impl::stop () throw (CORBA::SystemException, CF::Resource::StopError) -{ -// set CF::Device::UsageType = IDLE; -// generally, you'll overload this with some implementation that is dependent to your specific component -} - - char *Resource_impl::identifier () throw (CORBA::SystemException) { Index: /ossie/trunk/ossie/framework/DeviceManager_impl.cpp =================================================================== --- /ossie/trunk/ossie/framework/DeviceManager_impl.cpp (revision 3972) +++ /ossie/trunk/ossie/framework/DeviceManager_impl.cpp (revision 6151) @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright 2004, 2006, 2007 Virginia Polytechnic Institute and State University +Copyright 2004, 2006, 2007, 2008 Virginia Polytechnic Institute and State University This file is part of the OSSIE Core Framework. @@ -272,4 +272,17 @@ } + +void DeviceManager_impl::configure (const CF::Properties & configProperties) throw (CF::PropertySet::PartialConfiguration, CF::PropertySet::InvalidConfiguration, CORBA::SystemException) +{ +} + +void DeviceManager_impl::query (CF::Properties & configProperties) throw (CF::UnknownProperties, CORBA::SystemException) +{ +} + +CORBA::Object* DeviceManager_impl::getPort (const char *) throw (CF::PortSupplier::UnknownPort, CORBA::SystemException) +{ + return NULL; +} CF::DeviceSequence * Index: /ossie/trunk/ossie/framework/Device_impl.cpp =================================================================== --- /ossie/trunk/ossie/framework/Device_impl.cpp (revision 4081) +++ /ossie/trunk/ossie/framework/Device_impl.cpp (revision 6151) @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright 2004, 2007 Virginia Polytechnic Institute and State University +Copyright 2004, 2007, 2008 Virginia Polytechnic Institute and State University This file is part of the OSSIE Core Framework. @@ -31,5 +31,5 @@ #include "ossie/debug.h" - Device_impl::Device_impl (char *_id, char *lbl, char *sftwrPrfl) : Resource_impl(_id) +Device_impl::Device_impl (char *_id, char *lbl, char *sftwrPrfl) { _label = lbl; @@ -43,6 +43,5 @@ -Device_impl::Device_impl (char *_id, char *lbl, char *sftwrPrfl, - CF::Properties & capacities) : Resource_impl(_id) +Device_impl::Device_impl (char *_id, char *lbl, char *sftwrPrfl, CF::Properties & capacities) { _label = lbl; @@ -622,5 +621,5 @@ } - PropertySet_impl::configure(capacities); + configure(capacities); } Index: /ossie/trunk/ossie/framework/DomainManager_impl.cpp =================================================================== --- /ossie/trunk/ossie/framework/DomainManager_impl.cpp (revision 4099) +++ /ossie/trunk/ossie/framework/DomainManager_impl.cpp (revision 6151) @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright 2004, 2007, Virginia Polytechnic Institute and State University +Copyright 2004, 2007, 2008 Virginia Polytechnic Institute and State University This file is part of the OSSIE Core Framework. @@ -129,4 +129,11 @@ } +void DomainManager_impl::configure (const CF::Properties & configProperties) throw (CF::PropertySet::PartialConfiguration, CF::PropertySet::InvalidConfiguration, CORBA::SystemException) +{ +} + +void DomainManager_impl::query (CF::Properties & configProperties) throw (CF::UnknownProperties, CORBA::SystemException) +{ +} char * Index: /ossie/trunk/ossie/framework/Application_impl.cpp =================================================================== --- /ossie/trunk/ossie/framework/Application_impl.cpp (revision 4081) +++ /ossie/trunk/ossie/framework/Application_impl.cpp (revision 6151) @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright 2004, 2007 Virginia Polytechnic Institute and State University +Copyright 2004, 2007, 2008 Virginia Polytechnic Institute and State University This file is part of the OSSIE Core Framework. @@ -49,7 +49,7 @@ CF::Resource_ptr _controller, CF::DomainManager::ApplicationSequence *_appseq, -SADParser *sadParser, CosNaming::NamingContext_ptr wnc) : Resource_impl(_id) -{ - +SADParser *sadParser, CosNaming::NamingContext_ptr wnc) +{ + id = _id; appName = _name; sadProfile = _profile; @@ -140,4 +140,14 @@ assemblyController->stop (); } + + +void Application_impl::configure (const CF::Properties & configProperties) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration) +{ +} + +void Application_impl::query (CF::Properties & configProperties) throw (CORBA::SystemException, CF::UnknownProperties) +{ +} + @@ -333,4 +343,11 @@ +char *Application_impl::identifier () +throw (CORBA::SystemException) +{ + return CORBA::string_dup(id.c_str()); +} + + char *Application_impl::profile () throw (CORBA::SystemException) Index: /ossie/trunk/ossie/framework/Makefile.am =================================================================== --- /ossie/trunk/ossie/framework/Makefile.am (revision 5875) +++ /ossie/trunk/ossie/framework/Makefile.am (revision 6151) @@ -1,4 +1,4 @@ lib_LTLIBRARIES = libossiecf.la -libossiecf_la_SOURCES = ApplicationFactory_impl.cpp File_impl.cpp Application_impl.cpp FileManager_impl.cpp PortSupplier_impl.cpp Device_impl.cpp FileSystem_impl.cpp PropertySet_impl.cpp DeviceManager_impl.cpp LifeCycle_impl.cpp Resource_impl.cpp DomainManager_impl.cpp TestableObject_impl.cpp applicationSupport.cpp debug.cpp helperFunctions.cpp ossieComponent.cpp +libossiecf_la_SOURCES = ApplicationFactory_impl.cpp File_impl.cpp Application_impl.cpp FileManager_impl.cpp Device_impl.cpp FileSystem_impl.cpp DeviceManager_impl.cpp Resource_impl.cpp DomainManager_impl.cpp applicationSupport.cpp debug.cpp helperFunctions.cpp ossieComponent.cpp EXTRA_DIST = dirent.h