fix devel/mico:

  - fix and enable lifecycle service
  - WITHOUT_SREVICES=yes to build only ORB
  - fixes to externalize service

PR:		54117
Submitted by:	Sergey Matveychuk <sem@ciam.ru> (maintainer)

6 files changed, 1030 insertions, 147 deletions

diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index 272f30c342aa..932477f78865 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mico
 PORTVERSION=	2.3.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.mico.org/
 
@@ -25,8 +25,15 @@ USE_GMAKE=		yes
 .if defined(WITH_GCC32)
 USE_GCC=		3.2
 .endif
-CONFIGURE_ARGS+=	--enable-cd --disable-mini-stl --enable-threads \
-			--enable-ccm
+
+CONFIGURE_ARGS=		--enable-cd --disable-mini-stl --enable-threads
+.if !defined(WITHOUT_SERVICES)
+CONFIGURE_ARGS+=	--enable-ccm --enable-life --enable-externalize
+.else
+CONFIGURE_ARGS+=	--disable-coss
+MICO_SERVICE=		"@comment "
+.endif
+
 CONFIGURE_ENV+=		CXXFLAGS=${CPPFLAGS}
 
 .if defined(WITH_X11)
@@ -60,19 +67,23 @@ MICO_TCL=		"@comment "
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_SSL)
+.if defined(WITHOUT_SSL) || defined(WITHOUT_SERVICES)
 MICO_SSL=		"@comment "
 .else
 USE_OPENSSL=		yes
-CONFIGURE_ARGS+=	--enable-ssl=${OPENSSLBASE} --enable-csiv2
+CONFIGURE_ARGS+=	--enable-ssl=${OPENSSLBASE}
+CONFIGURE_ARGS+=	--enable-csiv2
+#
 # CORBASecV2 doesn't build with gcc32 port because FlexLexer.h absent
+#
 .if !( ${OSVERSION} < 500035 && defined(WITH_GCC32) )
 CONFIGURE_ARGS+=	--enable-csl2
 .endif
 .endif
 
 PLIST_SUB+=	MICO_X11=${MICO_X11} MICO_QT=${MICO_QT} MICO_GTK=${MICO_GTK} \
-		MICO_TCL=${MICO_TCL} MICO_SSL=${MICO_SSL}
+		MICO_TCL=${MICO_TCL} MICO_SSL=${MICO_SSL} \
+		MICO_SERVICE=${MICO_SERVICE}
 
 MAN1=		idl.1 imr.1 nsadmin.1
 MAN5=		micorc.5
@@ -85,7 +96,10 @@ pre-fetch:
 	@${ECHO}
 .endif
 	@${ECHO} "Following options are allowed:"
-	@${ECHO} "WITHOUT_SSL=yes, WITH_X11=yes, WITH_QT=yes, WITH_GTK=yes, WITH_TCL=yes"
+	@${ECHO}
+	@${ECHO} "WITHOUT_SERVICES=yes  - build without services, only ORB"
+	@${ECHO} "WITHOUT_SSL=yes       - build without SSL and security services"
+	@${ECHO} "WITH_X11=yes, WITH_QT=yes, WITH_GTK=yes, WITH_TCL=yes"
 	@${ECHO} "============================================================================"
 
 post-extract:
@@ -99,7 +113,7 @@ post-configure:
 		${REINPLACE_CMD} -e "s#/doc/mico/examples#/share/examples/mico#"
 	${REINPLACE_CMD} -e "s#/doc/mico/examples#/share/examples/mico#" ${WRKSRC}/demo/MakeVars
 	${REINPLACE_CMD} -e "s#ministl##" ${WRKSRC}/include/Makefile
-	${RM} ${WRKSRC}/include/mico/*.orig
+	${RM} -f ${WRKSRC}/include/mico/*.orig ${WRKSRC}/include/coss/*.orig
 
 post-install:
 	@for i in `${GREP} '^lib/lib.*so$$' ${TMPPLIST}`; do \
diff --git a/devel/mico/files/patch-examples::Makefile b/devel/mico/files/patch-examples::Makefile
index ac45d2381b5a..3448308427cf 100644
--- a/devel/mico/files/patch-examples::Makefile
+++ b/devel/mico/files/patch-examples::Makefile
@@ -1,5 +1,5 @@
---- demo/Makefile.orig	Mon Jun 30 05:51:13 2003
-+++ demo/Makefile	Mon Jun 30 05:51:23 2003
+--- demo/Makefile.orig	Fri Feb 14 13:55:57 2003
++++ demo/Makefile	Sun Jul  6 00:26:03 2003
 @@ -27,7 +27,7 @@
  
  RUNDIRS = bench dynany interceptor codesets poa obv mcast generic pi
@@ -9,3 +9,12 @@
  
  ifeq ($(HAVE_DYNAMIC), yes)
  DIRS := $(DIRS) shlib
+@@ -62,7 +62,7 @@
+ endif
+ 
+ ifeq ($(USE_EXTERN), yes)
+-DIRS := $(DIRS) externalize 
++DIRS := $(DIRS) externalization
+ endif
+ 
+ 
diff --git a/devel/mico/files/patch-fixes::externalization b/devel/mico/files/patch-fixes::externalization
new file mode 100644
index 000000000000..919d60c5e04f
--- /dev/null
+++ b/devel/mico/files/patch-fixes::externalization
@@ -0,0 +1,333 @@
+--- coss/externalization/Makefile.orig	Fri Feb 14 13:55:55 2003
++++ coss/externalization/Makefile	Fri Jul  4 15:01:11 2003
+@@ -85,6 +85,8 @@
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) extreferenced.o $(LDLIBS) -o extreferenced
+ 	$(POSTLD) $@
+ 
++idlcompile: CosExternalization.cc CosExternalizationContainment.cc CosExternalizationReference.cc
++
+ CosExternalization.h CosExternalization.cc: \
+ 		../../include/coss/CosExternalization.idl $(IDL)
+ 	$(IDL) $(IDLFLAGS) --name CosExternalization \
+--- include/coss/CosStream_impl.h.orig	Fri Jul  4 15:24:06 2003
++++ include/coss/CosStream_impl.h	Fri Jul  4 17:12:36 2003
+@@ -58,8 +58,8 @@
+ 
+ class StreamIO_impl : virtual public POA_CosStream::StreamIO
+ {
+-    istream* istream_;
+-    ostream* ostream_;
++    std::istream* istream_;
++    std::ostream* ostream_;
+     enum in_out
+     {
+ 	in,
+@@ -67,12 +67,12 @@
+     } iotype;
+ 
+ protected:
+-    CORBA::Boolean was_extern(vector<CosObjectIdentity::ObjectIdentifier>* vec_,
++    CORBA::Boolean was_extern(std::vector<CosObjectIdentity::ObjectIdentifier>* vec_,
+ 			      CosObjectIdentity::ObjectIdentifier id);
+ public:
+-    StreamIO_impl(ostream* ostream_ptr = &cout)
++    StreamIO_impl(std::ostream* ostream_ptr = &std::cout)
+ 	: ostream_(ostream_ptr), iotype(out) { };
+-    StreamIO_impl(istream* istream_ptr = &cin)
++    StreamIO_impl(std::istream* istream_ptr = &std::cin)
+ 	: istream_(istream_ptr), iotype(in) { };
+ 
+     virtual void write_string(const char* aString);
+--- include/coss/Externalization_impl.h.orig	Fri Jul  4 18:04:44 2003
++++ include/coss/Externalization_impl.h	Fri Jul  4 18:08:33 2003
+@@ -32,8 +32,8 @@
+ {
+     CORBA::String_var filename_;
+     CosLifeCycle::Key factory_id_;
+-    istream* ifstream_;
+-    ostream* ofstream_;
++    std::istream* ifstream_;
++    std::ostream* ofstream_;
+     CORBA::Boolean context;
+     
+ public:
+--- coss/externalization/Stream_impl.cc.orig	Fri Jul  4 15:30:45 2003
++++ coss/externalization/Stream_impl.cc	Fri Jul  4 16:58:23 2003
+@@ -37,8 +37,10 @@
+ #include <iostream.h>
+ #endif
+ 
+-typedef map<RoleNameKey,CosGraphs::Traversal::TraversalScopedId,less<RoleNameKey> > WorkedRoles;
+-typedef map<RoleNameKey,CosGraphs::Role_ptr,less<RoleNameKey> > NewRoles;
++using std::string;
++
++typedef std::map<RoleNameKey,CosGraphs::Traversal::TraversalScopedId,std::less<RoleNameKey> > WorkedRoles;
++typedef std::map<RoleNameKey,CosGraphs::Role_ptr,std::less<RoleNameKey> > NewRoles;
+ typedef IfaceSequenceTmpl<CosCompoundExternalization::Node_var,CosCompoundExternalization::Node_ptr> NewNodes;
+ 
+ const char tag_object = 0xF0;
+@@ -135,10 +137,10 @@
+     (*aStreamable).externalize_to_stream(_sio);
+ }
+ 
+-CORBA::Boolean StreamIO_impl::was_extern(vector<CosObjectIdentity::ObjectIdentifier>* vec_,
++CORBA::Boolean StreamIO_impl::was_extern(std::vector<CosObjectIdentity::ObjectIdentifier>* vec_,
+ 					 CosObjectIdentity::ObjectIdentifier id)
+ {
+-    vector<CosObjectIdentity::ObjectIdentifier>::iterator j;
++    std::vector<CosObjectIdentity::ObjectIdentifier>::iterator j;
+     for(j = vec_->begin();j != vec_->end();++j)
+ 	if (*j == id)
+ 	    return TRUE;
+@@ -151,10 +153,10 @@
+     if (iotype != out)
+ 	return;
+     CosStream::StreamIO_ptr _sio = this->_this();
+-    vector<CosObjectIdentity::ObjectIdentifier>* done_nodes =
+-	new vector<CosObjectIdentity::ObjectIdentifier>;
+-    vector<CosObjectIdentity::ObjectIdentifier>* done_rel =
+-	new vector<CosObjectIdentity::ObjectIdentifier>;
++    std::vector<CosObjectIdentity::ObjectIdentifier>* done_nodes =
++	new std::vector<CosObjectIdentity::ObjectIdentifier>;
++    std::vector<CosObjectIdentity::ObjectIdentifier>* done_rel =
++	new std::vector<CosObjectIdentity::ObjectIdentifier>;
+ // Externalize Root Node
+     CosObjectIdentity::ObjectIdentifier starting_node_id = starting_node->constant_random_id();
+ // End
+--- coss/externalization/Externalization_impl.cc.orig	Fri Jul  4 15:28:31 2003
++++ coss/externalization/Externalization_impl.cc	Fri Jul  4 15:28:51 2003
+@@ -37,6 +37,8 @@
+ #include <coss/CosStream_impl.h>
+ #include <coss/RegisterHelper.h>
+ 
++using std::string;
++
+ #ifndef _WIN32
+ Stream_impl::Stream_impl(const char* filename = NULL)
+     : POA_CosExternalization::Stream(),
+--- coss/externalization/extreferenced.cc.orig	Fri Jul  4 17:57:42 2003
++++ coss/externalization/extreferenced.cc	Fri Jul  4 17:58:50 2003
+@@ -34,8 +34,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -65,7 +65,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosExternalizationReference Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosExternalizationReference Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -76,8 +76,8 @@
+ 				type = RegisterHelper::trading;
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/externalization/streamd.cc.orig	Fri Jul  4 17:57:59 2003
++++ coss/externalization/streamd.cc	Fri Jul  4 17:59:41 2003
+@@ -38,8 +38,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -67,7 +67,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--trading") == 0 ||
+@@ -77,8 +77,8 @@
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+@@ -111,20 +111,20 @@
+ 	    tr_obj = orb -> resolve_initial_references("TradingService");
+ #ifdef HAVE_EXCEPTIONS
+ 	} catch(CORBA::ORB::InvalidName&) {
+-	    cerr << "Can`t resolve Trading Service. Abort" << endl;
++	    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 	    exit(1);
+ 	}
+ #endif
+ 	if (CORBA::is_nil(tr_obj))
+ 	{
+-	    cerr << "Can`t resolve Trading Service. Abort" << endl;
++	    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 	    exit(1);
+ 	}
+ 	CosTrading::Lookup_var trader_ = CosTrading::Lookup::_narrow (tr_obj);
+ 	CosTrading::Register_var reg = trader_->register_if();
+ 	if (CORBA::is_nil(reg))
+ 	{
+-	    cerr << "Invalid Trading Service. Abort" << endl;
++	    std::cerr << "Invalid Trading Service. Abort" << std::endl;
+ 	    exit(1);
+ 	}
+ 	CORBA::Object_var obj = trader_->type_repos();
+@@ -132,7 +132,7 @@
+ 		CosTradingRepos::ServiceTypeRepository::_narrow(obj);
+ 	if (CORBA::is_nil(repo))
+ 	{
+-	    cerr << "Invalid Trading Service. Abort" << endl;
++	    std::cerr << "Invalid Trading Service. Abort" << std::endl;
+ 	    exit(1);
+ 	}
+ 
+--- coss/externalization/extcriteriad.cc.orig	Fri Jul  4 17:58:08 2003
++++ coss/externalization/extcriteriad.cc	Fri Jul  4 18:00:00 2003
+@@ -37,8 +37,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -63,13 +63,13 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosCompoundExternalization::PropagationCriteriaFactory Service is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosCompoundExternalization::PropagationCriteriaFactory Service is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/externalization/extcontainmentd.cc.orig	Fri Jul  4 18:01:09 2003
++++ coss/externalization/extcontainmentd.cc	Fri Jul  4 18:01:40 2003
+@@ -34,8 +34,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -64,7 +64,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -75,8 +75,8 @@
+ 		        type = RegisterHelper::trading;
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/externalization/extnoded.cc.orig	Fri Jul  4 17:35:15 2003
++++ coss/externalization/extnoded.cc	Fri Jul  4 17:35:45 2003
+@@ -34,8 +34,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -64,7 +64,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosCompoundExternalization::Node Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosCompoundExternalization::Node Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -75,8 +75,8 @@
+ 		    type = RegisterHelper::trading;
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- include/coss/CompoundExternalization_impl.h.orig	Sat Jul  5 23:41:43 2003
++++ include/coss/CompoundExternalization_impl.h	Sat Jul  5 23:52:35 2003
+@@ -52,7 +52,7 @@
+ 
+ 	virtual void internalize_node(CosStream::StreamIO_ptr sio,
+                     		      CosLifeCycle::FactoryFinder_ptr there,
+-                		      CosGraphs::Node::Roles*& rolesOfNode);
++                		      CosGraphs::Node::Roles_out rolesOfNode);
+     };
+ 
+ 
+@@ -73,7 +73,7 @@
+     
+ 	friend void CosCompoundExternalization_impl::Node_impl::internalize_node(CosStream::StreamIO_ptr sio,
+                         							 CosLifeCycle::FactoryFinder_ptr there,
+-										 CosGraphs::Node::Roles*& rolesOfNode);
++										 CosGraphs::Node::Roles_out rolesOfNode);
+ 	virtual void externalize_role(CosStream::StreamIO_ptr sio);
+ 
+ 	virtual void internalize_role(CosStream::StreamIO_ptr sio);
+--- coss/externalization/CompoundExternalization_impl.cc.orig	Sat Jul  5 23:14:13 2003
++++ coss/externalization/CompoundExternalization_impl.cc	Sat Jul  5 23:51:29 2003
+@@ -111,7 +111,7 @@
+ void
+ CosCompoundExternalization_impl::Node_impl::internalize_node(CosStream::StreamIO_ptr sio,
+                     					     CosLifeCycle::FactoryFinder_ptr there,
+-                    					     CosGraphs::Node::Roles*& rolesOfNode)
++                    					     CosGraphs::Node::Roles_out rolesOfNode)
+ {
+ //  Node read its non-object data using the primitive StreamIO::read_...(data) function
+     random_id = sio -> read_unsigned_long();
diff --git a/devel/mico/files/patch-fixes::lifecycle b/devel/mico/files/patch-fixes::lifecycle
new file mode 100644
index 000000000000..aa2a4470bfdf
--- /dev/null
+++ b/devel/mico/files/patch-fixes::lifecycle
@@ -0,0 +1,464 @@
+--- coss/lifecycle/Makefile.orig	Fri Feb 14 13:55:55 2003
++++ coss/lifecycle/Makefile	Fri Jul  4 12:33:15 2003
+@@ -101,6 +101,8 @@
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) genericfactory.o $(LDLIBS) -o genericfactory
+ 	$(POSTLD) $@
+ 
++idlcompile: CosLifeCycle.cc CosCompoundLifeCycle.cc CosLifeCycleContainment.cc CosLifeCycleReference.cc
++
+ CosLifeCycle.h CosLifeCycle.cc: \
+ 		../../include/coss/CosLifeCycle.idl $(IDL)
+ 	$(IDL) $(IDLFLAGS) --name CosLifeCycle \
+--- coss/lifecycle/FactoryFinder_impl.cc.orig	Fri Jul  4 14:44:09 2003
++++ coss/lifecycle/FactoryFinder_impl.cc	Fri Jul  4 16:44:03 2003
+@@ -28,6 +28,8 @@
+ #include <coss/FactoryFinder_impl.h>
+ #include <string>
+ 
++using std::string;
++
+ FactoryFinder_impl::FactoryFinder_impl()
+ #ifndef _WIN32
+     : POA_CosLifeCycle::FactoryFinder ()
+@@ -61,13 +63,13 @@
+ 				nm_obj = orb -> resolve_initial_references("NameService");
+ #ifdef HAVE_EXCEPTIONS
+ 			} catch(CORBA::ORB::InvalidName&) {
+-				cerr << "Can`t resolve Naming Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ #endif
+ 			if (CORBA::is_nil(nm_obj))
+ 			{
+-				cerr << "Can`t resolve Naming Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ 			naming_ = CosNaming::NamingContext::_narrow (nm_obj);
+@@ -82,13 +84,13 @@
+ 				tr_obj = orb -> resolve_initial_references("TradingService");
+ #ifdef HAVE_EXCEPTIONS
+ 			} catch(CORBA::ORB::InvalidName&) {
+-				cerr << "Can`t resolve Trading Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ #endif
+ 			if (CORBA::is_nil(tr_obj))
+ 			{
+-				cerr << "Can`t resolve Trading Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ 			trader_ = CosTrading::Lookup::_narrow (tr_obj);
+--- coss/lifecycle/GenericFactory_impl.cc.orig	Fri Jul  4 14:47:28 2003
++++ coss/lifecycle/GenericFactory_impl.cc	Fri Jul  4 16:19:21 2003
+@@ -25,6 +25,7 @@
+ #include <CORBA.h>
+ #include <coss/GenericFactory_impl.h>
+ 
++using std::string;
+ 
+ GenericFactory_impl::GenericFactory_impl (void)
+ #ifndef _WIN32
+@@ -58,13 +59,13 @@
+ 					nm_obj = orb -> resolve_initial_references("NameService");
+ #ifdef HAVE_EXCEPTIONS
+ 			} catch(CORBA::ORB::InvalidName&) {
+-				cerr << "Can`t resolve Naming Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ #endif
+ 			if (CORBA::is_nil(nm_obj))
+ 			{
+-				cerr << "Can`t resolve Naming Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ 			naming_ = CosNaming::NamingContext::_narrow (nm_obj);
+@@ -79,13 +80,13 @@
+ 				tr_obj = orb -> resolve_initial_references("TradingService");
+ #ifdef HAVE_EXCEPTIONS
+ 			} catch(CORBA::ORB::InvalidName&) {
+-				cerr << "Can`t resolve Trading Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ #endif
+ 			if (CORBA::is_nil(tr_obj))
+ 			{
+-				cerr << "Can`t resolve Trading Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ 			trader_ = CosTrading::Lookup::_narrow (tr_obj);
+@@ -404,8 +405,8 @@
+ 	if (!strcmp(factory_key[3].id.in(),""))
+ 		return CORBA::Object::_nil();
+ 
+-    CORBA::String_var filter_ = (char *)NULL;
+-    CORBA::String_var preferences = (char *)NULL;
++    const char* filter_ = NULL;
++    const char* preferences = NULL;
+     CORBA::ULong i;
+     for(i = 0;i < the_criteria.length();++i)
+ 	if (!strcmp(the_criteria[i].name,"filter"))
+@@ -505,13 +506,13 @@
+ 	add_ += filter;
+ 	filter = add_;
+     }
+-    if (filter.size() && filter_.in())
++    if (filter.size() && filter_ != NULL)
+     {
+ 	string add_;
+ 	add_ += "(";
+ 	add_ += filter;
+ 	add_ += ") and ";
+-	add_ += filter_.in();
++	add_ += filter_;
+ 	filter = add_;
+     }
+     
+--- coss/lifecycle/Operations_impl.cc.orig	Fri Jul  4 16:41:53 2003
++++ coss/lifecycle/Operations_impl.cc	Fri Jul  4 16:42:53 2003
+@@ -30,9 +30,9 @@
+ #include <list>
+ #include <algorithm>
+ 
+-typedef map<RoleKey,CosGraphs::Role_ptr,less<RoleKey> > WorkedRoles;
+-typedef list<CosObjectIdentity::ObjectIdentifier> WorkedRelationships;
+-typedef list<CosGraphs::Traversal::TraversalScopedId> WorkedNodes;
++typedef std::map<RoleKey,CosGraphs::Role_ptr,std::less<RoleKey> > WorkedRoles;
++typedef std::list<CosObjectIdentity::ObjectIdentifier> WorkedRelationships;
++typedef std::list<CosGraphs::Traversal::TraversalScopedId> WorkedNodes;
+ 
+ Operations_impl::Operations_impl()
+ #ifndef _WIN32
+@@ -142,7 +142,7 @@
+ #endif
+     for(CORBA::ULong i = 0;i < (*OriginalEdgeList).length();++i)
+     {
+-	if (find(workedRelationships.begin(),
++	if (std::find(workedRelationships.begin(),
+ 		  workedRelationships.end(),
+ 		  (*OriginalEdgeList)[i].the_relationship.scoped_relationship.constant_random_id) !=
+ 	   workedRelationships.end())
+@@ -251,7 +251,7 @@
+ 	    ex.reason = CORBA::string_dup("Node not supported CosCompoundLifeCycle::Node interface.");
+ 	    mico_throw (ex);
+ 	}
+-	if (find(MovedNodes.begin(),MovedNodes.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
++	if (std::find(MovedNodes.begin(),MovedNodes.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
+ 		MovedNodes.end())
+ 	    continue;
+ 	current_node_ptr->move_node(there,the_criteria);
+@@ -290,7 +290,7 @@
+ 
+     for(CORBA::ULong i = 0;i < (*OriginalEdgeList).length();++i)
+     {
+-	if (find(Rel4Remove.begin(),Rel4Remove.end(),
++	if (std::find(Rel4Remove.begin(),Rel4Remove.end(),
+ 		(*OriginalEdgeList)[i].the_relationship.scoped_relationship.constant_random_id) !=
+ 	    Rel4Remove.end())
+ 	    continue;
+@@ -316,7 +316,7 @@
+ #endif
+     for(CORBA::ULong i = 0;i < (*OriginalEdgeList).length();++i)
+     {
+-	if (find(Nodes4Remove.begin(),Nodes4Remove.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
++	if (std::find(Nodes4Remove.begin(),Nodes4Remove.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
+ 	    Nodes4Remove.end())
+ 	    continue;
+ 	CosCompoundLifeCycle::Node_ptr tmp_node_ptr =
+--- coss/lifecycle/RegisterHelper.cc.orig	Fri Jul  4 16:44:17 2003
++++ coss/lifecycle/RegisterHelper.cc	Fri Jul  4 16:45:17 2003
+@@ -45,7 +45,7 @@
+ #ifdef HAVE_EXCEPTIONS
+ 			} catch(CORBA::ORB::InvalidName&) {
+ #if DEBUG
+-	    		cerr << "Can`t resolve Naming Service." << endl;
++			    std::cerr << "Can`t resolve Naming Service." << std::endl;
+ #endif
+ 			}
+ #endif
+@@ -64,7 +64,7 @@
+ #ifdef HAVE_EXCEPTIONS
+ 			} catch(CORBA::ORB::InvalidName&) {
+ #if DEBUG
+-	    		cerr << "Can`t resolve Trading Service." << endl;
++			    std::cerr << "Can`t resolve Trading Service." << std::endl;
+ #endif
+ 			}
+ #endif
+@@ -121,14 +121,14 @@
+ {
+ 	if (CORBA::is_nil(_obj))
+ 	{
+-		cerr << "Can`t resolve Naming Service. Abort" << endl;
+-		return FALSE;
++	    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
++	    return FALSE;
+ 	}
+ 	CosNaming::NamingContext_var nc = CosNaming::NamingContext::_narrow(_obj);
+ 	if (CORBA::is_nil(nc.in()))
+ 	{
+-		cerr << "Invalid Naming Service. Abort" << endl;
+-		return FALSE;
++	    std::cerr << "Invalid Naming Service. Abort" << std::endl;
++	    return FALSE;
+ 	}
+ 	CosNaming::Name full(4);
+ 	full.length(4);
+@@ -173,14 +173,14 @@
+ {
+     if (CORBA::is_nil(_obj))
+     {
+-	cerr << "Can`t resolve Trading Service. Abort" << endl;
++	std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 	return FALSE;
+     }
+     CosTrading::Lookup_var trader_ = CosTrading::Lookup::_narrow (_obj);
+     CosTrading::Register_var reg = trader_->register_if();
+     if (CORBA::is_nil(reg))
+     {
+-	cerr << "Invalid Trading Service. Abort" << endl;
++	std::cerr << "Invalid Trading Service. Abort" << std::endl;
+ 	return FALSE;
+     }
+     CORBA::Object_var obj = trader_->type_repos();
+@@ -188,7 +188,7 @@
+ 	CosTradingRepos::ServiceTypeRepository::_narrow(obj);
+     if (CORBA::is_nil(repo))
+     {
+-	cerr << "Invalid Trading Service. Abort" << endl;
++	std::cerr << "Invalid Trading Service. Abort" << std::endl;
+ 	return FALSE;
+     }
+ 
+--- coss/lifecycle/lifenoded.cc.orig	Fri Jul  4 17:16:08 2003
++++ coss/lifecycle/lifenoded.cc	Fri Jul  4 17:17:41 2003
+@@ -36,8 +36,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++        std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -66,7 +66,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosCompoundLifeCycle::Node Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosCompoundLifeCycle::Node Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -81,8 +81,8 @@
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/lifecycle/lifecontainmentd.cc.orig	Fri Jul  4 17:22:32 2003
++++ coss/lifecycle/lifecontainmentd.cc	Fri Jul  4 17:23:15 2003
+@@ -36,8 +36,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -65,7 +65,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosLifeCycleContainment Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosLifeCycleContainment Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -80,8 +80,8 @@
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/lifecycle/lifereferenced.cc.orig	Fri Jul  4 17:24:49 2003
++++ coss/lifecycle/lifereferenced.cc	Fri Jul  4 17:25:32 2003
+@@ -36,8 +36,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -67,7 +67,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosLifeCycleReference Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosLifeCycleReference Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -82,8 +82,8 @@
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/lifecycle/operationd.cc.orig	Fri Jul  4 17:26:48 2003
++++ coss/lifecycle/operationd.cc	Fri Jul  4 17:27:22 2003
+@@ -30,8 +30,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -56,13 +56,13 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosCompoundLifeCycle::OperationsFactory Service is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosCompoundLifeCycle::OperationsFactory Service is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/lifecycle/lifecriteriad.cc.orig	Fri Jul  4 17:29:24 2003
++++ coss/lifecycle/lifecriteriad.cc	Fri Jul  4 17:29:58 2003
+@@ -38,8 +38,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -64,13 +64,13 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosCompoundLifeCycle::PropagationCriteriaFactory Service is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosCompoundLifeCycle::PropagationCriteriaFactory Service is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/lifecycle/factoryfinderd.cc.orig	Fri Jul  4 17:31:06 2003
++++ coss/lifecycle/factoryfinderd.cc	Fri Jul  4 17:31:36 2003
+@@ -29,8 +29,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -58,7 +58,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosLifeCycle::FactoryFinder Service is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosLifeCycle::FactoryFinder Service is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -69,8 +69,8 @@
+ 			type = RegisterHelper::trading;
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/lifecycle/genericfactory.cc.orig	Fri Jul  4 17:32:54 2003
++++ coss/lifecycle/genericfactory.cc	Fri Jul  4 17:33:21 2003
+@@ -29,8 +29,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -58,7 +58,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosLifeCycle::GenericFactory Service is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosLifeCycle::GenericFactory Service is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -69,8 +69,8 @@
+ 			type = RegisterHelper::trading;
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
diff --git a/devel/mico/pkg-descr b/devel/mico/pkg-descr
index f0df790a532d..2619557e7dbb 100644
--- a/devel/mico/pkg-descr
+++ b/devel/mico/pkg-descr
@@ -19,6 +19,6 @@ Here is some of MICO features:
     * CORBA Services: 
        o Interoperable Naming service, o Trading service, o Event service, 
        o Relationship service, o Property service, o Time service, 
-       o Security service 
+       o Security service, o Lifecycle service, o Externalization service
 
 WWW: http://www.mico.org
diff --git a/devel/mico/pkg-plist b/devel/mico/pkg-plist
index f0856d96a224..ebbe273d5a1e 100644
--- a/devel/mico/pkg-plist
+++ b/devel/mico/pkg-plist
@@ -1,66 +1,81 @@
-bin/ccmload
-bin/componentserver
-bin/containmentd
-bin/eventd
+%%MICO_SERVICE%%bin/extcontainmentd
+%%MICO_SERVICE%%bin/extnoded
+%%MICO_SERVICE%%bin/extreferenced
+%%MICO_SERVICE%%bin/streamd
+%%MICO_SERVICE%%bin/ccmload
+%%MICO_SERVICE%%bin/componentserver
+%%MICO_SERVICE%%bin/containmentd
+%%MICO_SERVICE%%bin/eventd
 bin/idl
 bin/imr
 bin/iordump
 bin/ird
+%%MICO_SERVICE%%bin/lifecontainmentd
+%%MICO_SERVICE%%bin/lifenoded
+%%MICO_SERVICE%%bin/lifereferenced
 bin/mico-ar
 bin/mico-c++
-bin/mico-ccm
-bin/mico-ccmd
+%%MICO_SERVICE%%bin/mico-ccm
+%%MICO_SERVICE%%bin/mico-ccmd
 bin/mico-cpp
 bin/mico-ld
 bin/mico-shc++
 bin/mico-shld
 bin/micod
-bin/noded
-bin/nsadmin
-bin/nsd
-bin/propertyd
-bin/proxyd
-bin/randomd
-bin/referenced
-bin/timed
-bin/traderd
-bin/traversald
+%%MICO_SERVICE%%bin/noded
+%%MICO_SERVICE%%bin/nsadmin
+%%MICO_SERVICE%%bin/nsd
+%%MICO_SERVICE%%bin/operationd
+%%MICO_SERVICE%%bin/propertyd
+%%MICO_SERVICE%%bin/proxyd
+%%MICO_SERVICE%%bin/randomd
+%%MICO_SERVICE%%bin/referenced
+%%MICO_SERVICE%%bin/timed
+%%MICO_SERVICE%%bin/traderd
+%%MICO_SERVICE%%bin/traversald
 include/CORBA-SMALL.h
 include/CORBA.h
 include/coss/CompoundExternalization_impl.h
+%%MICO_SERVICE%%include/coss/CosCompoundLifeCycle.h
 include/coss/CosCompoundLifeCycle.idl
-include/coss/CosContainment.h
+%%MICO_SERVICE%%include/coss/CosContainment.h
 include/coss/CosContainment.idl
 include/coss/CosContainment_impl.h
-include/coss/CosEventChannelAdmin.h
+%%MICO_SERVICE%%include/coss/CosEventChannelAdmin.h
 include/coss/CosEventChannelAdmin.idl
-include/coss/CosEventComm.h
+%%MICO_SERVICE%%include/coss/CosEventComm.h
 include/coss/CosEventComm.idl
+%%MICO_SERVICE%%include/coss/CosExternalization.h
 include/coss/CosExternalization.idl
+%%MICO_SERVICE%%include/coss/CosExternalizationContainment.h
 include/coss/CosExternalizationContainment.idl
+%%MICO_SERVICE%%include/coss/CosExternalizationReference.h
 include/coss/CosExternalizationReference.idl
-include/coss/CosGraphs.h
+%%MICO_SERVICE%%include/coss/CosGraphs.h
 include/coss/CosGraphs.idl
-include/coss/CosGraphsExtension.h
+%%MICO_SERVICE%%include/coss/CosGraphsExtension.h
 include/coss/CosGraphsExtension.idl
+%%MICO_SERVICE%%include/coss/CosLifeCycle.h
 include/coss/CosLifeCycle.idl
+%%MICO_SERVICE%%include/coss/CosLifeCycleContainment.h
 include/coss/CosLifeCycleContainment.idl
+%%MICO_SERVICE%%include/coss/CosLifeCycleReference.h
 include/coss/CosLifeCycleReference.idl
-include/coss/CosNaming.h
+%%MICO_SERVICE%%include/coss/CosNaming.h
 include/coss/CosNaming.idl
-include/coss/CosObjectIdentity.h
+%%MICO_SERVICE%%include/coss/CosObjectIdentity.h
 include/coss/CosObjectIdentity.idl
-include/coss/CosReference.h
+%%MICO_SERVICE%%include/coss/CosReference.h
 include/coss/CosReference.idl
 include/coss/CosReference_impl.h
-include/coss/CosRelationships.h
+%%MICO_SERVICE%%include/coss/CosRelationships.h
 include/coss/CosRelationships.idl
 include/coss/CosStream_impl.h
-include/coss/CosTime.h
+%%MICO_SERVICE%%include/coss/CosTime.h
 include/coss/CosTime.idl
-include/coss/CosTrading.h
+%%MICO_SERVICE%%include/coss/CosTrading.h
 include/coss/CosTrading.idl
-include/coss/CosTradingRepos.h
+%%MICO_SERVICE%%include/coss/CosTradingRepos.h
 include/coss/CosTradingRepos.idl
 include/coss/EdgeIterator_impl.h
 include/coss/ExternalizationContainment_impl.h
@@ -87,10 +102,10 @@ include/coss/NodeStreamableFactory_impl.h
 include/coss/Node_impl.h
 include/coss/OperationsFactory_impl.h
 include/coss/Operations_impl.h
-include/coss/PropertyService.h
+%%MICO_SERVICE%%include/coss/PropertyService.h
 include/coss/PropertyService.idl
 include/coss/PropertyService_impl.h
-include/coss/RandomGenerator.h
+%%MICO_SERVICE%%include/coss/RandomGenerator.h
 include/coss/RandomGenerator.idl
 include/coss/RandomGenerator_impl.h
 include/coss/RegisterHelper.h
@@ -102,9 +117,9 @@ include/coss/Role_impl.h
 include/coss/TraversalCriteria_impl.h
 include/coss/TraversalFactory_impl.h
 include/coss/Traversal_impl.h
-include/coss/random.h
+%%MICO_SERVICE%%include/coss/random.h
 include/coss/random.idl
-include/coss/stream.h
+%%MICO_SERVICE%%include/coss/stream.h
 include/coss/stream.idl
 include/coss/stream_impl.h
 include/mico/CCM.h
@@ -288,12 +303,12 @@ lib/libmico2.3.10.so.1
 lib/libmicoaux2.3.10.a
 lib/libmicoaux2.3.10.so
 lib/libmicoaux2.3.10.so.1
-lib/libmicoccm2.3.10.a
-lib/libmicoccm2.3.10.so
-lib/libmicoccm2.3.10.so.1
-lib/libmicocoss2.3.10.a
-lib/libmicocoss2.3.10.so
-lib/libmicocoss2.3.10.so.1
+%%MICO_SERVICE%%lib/libmicoccm2.3.10.a
+%%MICO_SERVICE%%lib/libmicoccm2.3.10.so
+%%MICO_SERVICE%%lib/libmicoccm2.3.10.so.1
+%%MICO_SERVICE%%lib/libmicocoss2.3.10.a
+%%MICO_SERVICE%%lib/libmicocoss2.3.10.so
+%%MICO_SERVICE%%lib/libmicocoss2.3.10.so.1
 %%MICO_GTK%%lib/libmicogtk2.3.10.a
 %%MICO_GTK%%lib/libmicogtk2.3.10.so
 %%MICO_GTK%%lib/libmicogtk2.3.10.so.1
@@ -427,39 +442,39 @@ lib/mico-setup.sh
 %%PORTDOCS%%share/examples/mico/boa/activate/hello-unshared
 %%PORTDOCS%%share/examples/mico/boa/activate/hello.idl
 %%PORTDOCS%%share/examples/mico/boa/activate/server.cc
-%%PORTDOCS%%share/examples/mico/ccm/Makefile
-%%PORTDOCS%%share/examples/mico/ccm/events/Makefile
-%%PORTDOCS%%share/examples/mico/ccm/events/README
-%%PORTDOCS%%share/examples/mico/ccm/events/channel.idl
-%%PORTDOCS%%share/examples/mico/ccm/events/channel_impl.cc
-%%PORTDOCS%%share/examples/mico/ccm/events/client.cc
-%%PORTDOCS%%share/examples/mico/ccm/events/consumer.idl
-%%PORTDOCS%%share/examples/mico/ccm/events/consumer_impl.cc
-%%PORTDOCS%%share/examples/mico/ccm/events/events
-%%PORTDOCS%%share/examples/mico/ccm/events/message.idl
-%%PORTDOCS%%share/examples/mico/ccm/events/message_impl.cc
-%%PORTDOCS%%share/examples/mico/ccm/events/message_impl.h
-%%PORTDOCS%%share/examples/mico/ccm/events/producer.idl
-%%PORTDOCS%%share/examples/mico/ccm/events/producer_impl.cc
-%%PORTDOCS%%share/examples/mico/ccm/hello/Makefile
-%%PORTDOCS%%share/examples/mico/ccm/hello/README
-%%PORTDOCS%%share/examples/mico/ccm/hello/client.cc
-%%PORTDOCS%%share/examples/mico/ccm/hello/hello
-%%PORTDOCS%%share/examples/mico/ccm/hello/hello.idl
-%%PORTDOCS%%share/examples/mico/ccm/hello/hello_impl.cc
-%%PORTDOCS%%share/examples/mico/ccm/hello2/Makefile
-%%PORTDOCS%%share/examples/mico/ccm/hello2/README
-%%PORTDOCS%%share/examples/mico/ccm/hello2/client.cc
-%%PORTDOCS%%share/examples/mico/ccm/hello2/hello
-%%PORTDOCS%%share/examples/mico/ccm/hello2/hello.idl
-%%PORTDOCS%%share/examples/mico/ccm/hello2/hello_impl.cc
-%%PORTDOCS%%share/examples/mico/ccm/philo/Makefile
-%%PORTDOCS%%share/examples/mico/ccm/philo/README
-%%PORTDOCS%%share/examples/mico/ccm/philo/client.cc
-%%PORTDOCS%%share/examples/mico/ccm/philo/philo
-%%PORTDOCS%%share/examples/mico/ccm/philo/philo.idl
-%%PORTDOCS%%share/examples/mico/ccm/philo/philo_impl.cc
-%%PORTDOCS%%share/examples/mico/ccm/philo/tkobserver.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/README
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/channel.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/channel_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/client.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/consumer.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/consumer_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/events
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/message.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/message_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/message_impl.h
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/producer.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/producer_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello/README
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello/client.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello/hello
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello/hello.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello/hello_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello2/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello2/README
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello2/client.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello2/hello
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello2/hello.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello2/hello_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/README
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/client.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/philo
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/philo.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/philo_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/tkobserver.cc
 %%PORTDOCS%%share/examples/mico/codesets/Makefile
 %%PORTDOCS%%share/examples/mico/codesets/client.cc
 %%PORTDOCS%%share/examples/mico/codesets/hello.idl
@@ -551,6 +566,11 @@ lib/mico-setup.sh
 %%PORTDOCS%%share/examples/mico/dynany/dynany.cc
 %%PORTDOCS%%share/examples/mico/dynany/dynanytest.cc
 %%PORTDOCS%%share/examples/mico/dynany/test.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/externalization/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/externalization/client.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/externalization/hello.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/externalization/runit
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/externalization/server.cc
 %%PORTDOCS%%share/examples/mico/generic/Makefile
 %%PORTDOCS%%share/examples/mico/generic/client.cc
 %%PORTDOCS%%share/examples/mico/generic/run_test
@@ -670,6 +690,11 @@ lib/mico-setup.sh
 %%PORTDOCS%%share/examples/mico/interop/visibroker/account
 %%PORTDOCS%%share/examples/mico/interop/visibroker/main.cc
 %%PORTDOCS%%share/examples/mico/interop/visibroker/run_applet
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/lifecycle/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/lifecycle/client.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/lifecycle/hello.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/lifecycle/runit
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/lifecycle/server.cc
 %%PORTDOCS%%share/examples/mico/mcast/Makefile
 %%PORTDOCS%%share/examples/mico/mcast/client.cc
 %%PORTDOCS%%share/examples/mico/mcast/hello.idl
@@ -975,63 +1000,97 @@ lib/mico-setup.sh
 %%PORTDOCS%%%%MICO_SSL%%share/examples/mico/security/tutorial/ssl
 %%PORTDOCS%%share/examples/mico/services/Makefile
 %%PORTDOCS%%share/examples/mico/services/README
-%%PORTDOCS%%share/examples/mico/services/events/Makefile
-%%PORTDOCS%%share/examples/mico/services/events/client.cc
-%%PORTDOCS%%share/examples/mico/services/events/client2.cc
-%%PORTDOCS%%share/examples/mico/services/events/runit
-%%PORTDOCS%%share/examples/mico/services/events/server.cc
-%%PORTDOCS%%share/examples/mico/services/events/server2.cc
-%%PORTDOCS%%share/examples/mico/services/events/server3.cc
-%%PORTDOCS%%share/examples/mico/services/naming-lb/Client.cc
-%%PORTDOCS%%share/examples/mico/services/naming-lb/Makefile
-%%PORTDOCS%%share/examples/mico/services/naming-lb/Printer.idl
-%%PORTDOCS%%share/examples/mico/services/naming-lb/Printer_impl.cc
-%%PORTDOCS%%share/examples/mico/services/naming-lb/Printer_impl.h
-%%PORTDOCS%%share/examples/mico/services/naming-lb/Server.cc
-%%PORTDOCS%%share/examples/mico/services/naming-lb/printer_test
-%%PORTDOCS%%share/examples/mico/services/naming/Makefile
-%%PORTDOCS%%share/examples/mico/services/naming/account.idl
-%%PORTDOCS%%share/examples/mico/services/naming/account_test
-%%PORTDOCS%%share/examples/mico/services/naming/client.cc
-%%PORTDOCS%%share/examples/mico/services/naming/server.cc
-%%PORTDOCS%%share/examples/mico/services/property-daemon/Makefile
-%%PORTDOCS%%share/examples/mico/services/property-daemon/README
-%%PORTDOCS%%share/examples/mico/services/property-daemon/bank.idl
-%%PORTDOCS%%share/examples/mico/services/property-daemon/get_properties.cc
-%%PORTDOCS%%share/examples/mico/services/property-daemon/set_properties.cc
-%%PORTDOCS%%share/examples/mico/services/property-daemon/start_demo
-%%PORTDOCS%%share/examples/mico/services/relship/Documents.idl
-%%PORTDOCS%%share/examples/mico/services/relship/DocumentsServer.cc
-%%PORTDOCS%%share/examples/mico/services/relship/Documents_impl.cc
-%%PORTDOCS%%share/examples/mico/services/relship/Documents_impl.h
-%%PORTDOCS%%share/examples/mico/services/relship/Makefile
-%%PORTDOCS%%share/examples/mico/services/relship/README
-%%PORTDOCS%%share/examples/mico/services/relship/Test.idl
-%%PORTDOCS%%share/examples/mico/services/relship/TestServer.cc
-%%PORTDOCS%%share/examples/mico/services/relship/Test_impl.cc
-%%PORTDOCS%%share/examples/mico/services/relship/Test_impl.h
-%%PORTDOCS%%share/examples/mico/services/relship/daemons-start
-%%PORTDOCS%%share/examples/mico/services/relship/daemons-stop
-%%PORTDOCS%%share/examples/mico/services/relship/rundemo
-%%PORTDOCS%%share/examples/mico/services/relship/servers-start
-%%PORTDOCS%%share/examples/mico/services/relship/simple-test.cc
-%%PORTDOCS%%share/examples/mico/services/relship/stop-servers
-%%PORTDOCS%%share/examples/mico/services/relship/test
-%%PORTDOCS%%share/examples/mico/services/stream-bench/Makefile
-%%PORTDOCS%%share/examples/mico/services/stream-bench/bench
-%%PORTDOCS%%share/examples/mico/services/stream-bench/req.idl
-%%PORTDOCS%%share/examples/mico/services/stream-bench/req_client.cc
-%%PORTDOCS%%share/examples/mico/services/stream-bench/req_server.cc
-%%PORTDOCS%%share/examples/mico/services/stream-bench/stream_client.cc
-%%PORTDOCS%%share/examples/mico/services/stream-bench/stream_server.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/Documents.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/DocumentsServer.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/Documents_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/Documents_impl.h
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/README
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/Test.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/TestServer.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/Test_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/Test_impl.h
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/daemons-start
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/daemons-stop
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/rundemo
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/servers-start
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/simple-test.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/stop-servers
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/test
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/client.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/client2.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/runit
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/server.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/server2.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/server3.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Documents.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/DocumentsServer.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Documents_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Documents_impl.h
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/README
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Test.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/TestServer.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Test_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Test_impl.h
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/daemons-start
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/daemons-stop
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/rundemo
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/servers-start
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/simple-test.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/stop-servers
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/test
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/Client.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/Printer.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/Printer_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/Printer_impl.h
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/Server.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/printer_test
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming/account.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming/account_test
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming/client.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming/server.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/property-daemon/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/property-daemon/README
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/property-daemon/bank.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/property-daemon/get_properties.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/property-daemon/set_properties.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/property-daemon/start_demo
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Documents.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/DocumentsServer.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Documents_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Documents_impl.h
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/README
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Test.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/TestServer.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Test_impl.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Test_impl.h
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/daemons-start
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/daemons-stop
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/rundemo
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/servers-start
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/simple-test.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/stop-servers
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/test
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/bench
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/req.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/req_client.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/req_server.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/stream_client.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/stream_server.cc
 %%PORTDOCS%%share/examples/mico/services/stream-sound/Makefile
 %%PORTDOCS%%share/examples/mico/services/stream-sound/client.cc
 %%PORTDOCS%%share/examples/mico/services/stream-sound/server.cc
 %%PORTDOCS%%share/examples/mico/services/stream-sound/sound.h
-%%PORTDOCS%%share/examples/mico/services/trader/Makefile
-%%PORTDOCS%%share/examples/mico/services/trader/demo.idl
-%%PORTDOCS%%share/examples/mico/services/trader/main.cc
-%%PORTDOCS%%share/examples/mico/services/trader/run
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/trader/Makefile
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/trader/demo.idl
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/trader/main.cc
+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/trader/run
 %%PORTDOCS%%share/examples/mico/shlib/Makefile
 %%PORTDOCS%%share/examples/mico/shlib/client.cc
 %%PORTDOCS%%share/examples/mico/shlib/hello
@@ -1088,14 +1147,16 @@ lib/mico-setup.sh
 %%PORTDOCS%%@dirrm share/examples/mico/siegel/central
 %%PORTDOCS%%@dirrm share/examples/mico/siegel
 %%PORTDOCS%%@dirrm share/examples/mico/shlib
-%%PORTDOCS%%@dirrm share/examples/mico/services/trader
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/trader
 %%PORTDOCS%%@dirrm share/examples/mico/services/stream-sound
-%%PORTDOCS%%@dirrm share/examples/mico/services/stream-bench
-%%PORTDOCS%%@dirrm share/examples/mico/services/relship
-%%PORTDOCS%%@dirrm share/examples/mico/services/property-daemon
-%%PORTDOCS%%@dirrm share/examples/mico/services/naming-lb
-%%PORTDOCS%%@dirrm share/examples/mico/services/naming
-%%PORTDOCS%%@dirrm share/examples/mico/services/events
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/stream-bench
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/relship
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/property-daemon
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/naming-lb
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/naming
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/lifecycle
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/events
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/externalize
 %%PORTDOCS%%@dirrm share/examples/mico/services
 %%PORTDOCS%%%%MICO_SSL%%@dirrm share/examples/mico/security/tutorial
 %%PORTDOCS%%%%MICO_SSL%%@dirrm share/examples/mico/security/l2
@@ -1139,6 +1200,7 @@ lib/mico-setup.sh
 %%PORTDOCS%%@dirrm share/examples/mico/mt/callback
 %%PORTDOCS%%@dirrm share/examples/mico/mt
 %%PORTDOCS%%@dirrm share/examples/mico/mcast
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/lifecycle
 %%PORTDOCS%%@dirrm share/examples/mico/interop/visibroker
 %%PORTDOCS%%@dirrm share/examples/mico/interop/orbix
 %%PORTDOCS%%@dirrm share/examples/mico/interop/jdk
@@ -1173,6 +1235,7 @@ lib/mico-setup.sh
 %%PORTDOCS%%@dirrm share/examples/mico/interceptor
 %%PORTDOCS%%@dirrm share/examples/mico/henning
 %%PORTDOCS%%@dirrm share/examples/mico/generic
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/externalization
 %%PORTDOCS%%@dirrm share/examples/mico/dynany
 %%PORTDOCS%%%%MICO_X11%%@dirrm share/examples/mico/dispatcher/x11
 %%PORTDOCS%%%%MICO_QT%%@dirrm share/examples/mico/dispatcher/qtmico
@@ -1187,11 +1250,11 @@ lib/mico-setup.sh
 %%PORTDOCS%%%%MICO_SSL%%@dirrm share/examples/mico/csiv2/hello-1
 %%PORTDOCS%%%%MICO_SSL%%@dirrm share/examples/mico/csiv2
 %%PORTDOCS%%@dirrm share/examples/mico/codesets
-%%PORTDOCS%%@dirrm share/examples/mico/ccm/philo
-%%PORTDOCS%%@dirrm share/examples/mico/ccm/hello2
-%%PORTDOCS%%@dirrm share/examples/mico/ccm/hello
-%%PORTDOCS%%@dirrm share/examples/mico/ccm/events
-%%PORTDOCS%%@dirrm share/examples/mico/ccm
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/ccm/philo
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/ccm/hello2
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/ccm/hello
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/ccm/events
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/ccm
 %%PORTDOCS%%@dirrm share/examples/mico/boa/activate
 %%PORTDOCS%%@dirrm share/examples/mico/boa/account4
 %%PORTDOCS%%@dirrm share/examples/mico/boa/account3