kuml-cvs

[Chris M. <zm...@us...>]

Update of /cvsroot/kuml/kuml/libkuml/uml/main
In directory usw-pr-cvs1:/tmp/cvs-serv22382

Modified Files:
	Makefile main.cc 
Log Message:
Mods for UML 1.4.
Now puts the UMLPackageFactory in the nameserver.


Index: Makefile
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/uml/main/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Makefile	16 Oct 2000 04:02:12 -0000	1.1.1.1
--- Makefile	27 Feb 2002 22:30:07 -0000	1.2
***************
*** 1,5 ****
  CPROGS:=${shell ls *.cc}
  OBJS=${CPROGS:.cc=.o}
! MICO_CPP_FLAGS= -I../Reflective -I../Foundation
  
  .SUFFIXES : .cc .o
--- 1,5 ----
  CPROGS:=${shell ls *.cc}
  OBJS=${CPROGS:.cc=.o}
! MICO_CPP_FLAGS= -I../Reflective -I../DataTypes -I../Core -I../CommonBehavior -I../StateMachines -I../Collaborations -I../UseCases -I../ActivityGraphs -I../ModelManagement -I../UML
  
  .SUFFIXES : .cc .o

Index: main.cc
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/uml/main/main.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** main.cc	16 Oct 2000 04:02:12 -0000	1.1.1.1
--- main.cc	27 Feb 2002 22:30:07 -0000	1.2
***************
*** 2,7 ****
  #include <CORBA.h>
  #include <mico/CosNaming.h>
! #include "Foundation.h"
! #include "FoundationPackageFactory_impl.h"
  
  
--- 2,7 ----
  #include <CORBA.h>
  #include <mico/CosNaming.h>
! 
! #include "UMLPackageFactory_impl.h"
  
  
***************
*** 16,49 ****
    PortableServer::POAManager_var mgr = poa->the_POAManager();
  
!   // Create the Core Factory object
!   FoundationPackageFactory_impl* ucf =
!     new FoundationPackageFactory_impl;
  
!   // activate the server to register with the POA
!   PortableServer::ObjectId_var oid = poa->activate_object(ucf);
  
    // Activate POAs and start serving requests.
    mgr->activate ();
  
!   // create reference for naming service
    CORBA::Object_var objRef = poa->id_to_reference(oid);
  
!   // register the server object with the naming service
!   // obtain reference to naming service daemon
    CORBA::Object_var nsobj = orb->resolve_initial_references( "NameService" );
  
!   // downcast to type
    CosNaming::NamingContext_var nc = CosNaming::NamingContext::_narrow( nsobj );
  
!   // create binding
    CosNaming::Name name;
    name.length(1);
!   name[0].id = CORBA::string_dup( "fcCoreFactory" );
!   name[0].kind = CORBA::string_dup( "UmlCoreFactory" );
    nc->bind( name, objRef );
  
    orb->run ();
  
!   /* Shutdown. This calls etherealize() for our UmlCorePackage. */
    poa->destroy (TRUE, TRUE);
  
--- 16,49 ----
    PortableServer::POAManager_var mgr = poa->the_POAManager();
  
!   // Create the UML Factory object.
!   UMLPackageFactory_impl* upf =
!     new UMLPackageFactory_impl;
  
!   // Activate the server to register with the POA.
!   PortableServer::ObjectId_var oid = poa->activate_object(upf);
  
    // Activate POAs and start serving requests.
    mgr->activate ();
  
!   // Create reference for naming service.
    CORBA::Object_var objRef = poa->id_to_reference(oid);
  
!   // Register the server object with the naming service.
!   // Obtain reference to naming service daemon
    CORBA::Object_var nsobj = orb->resolve_initial_references( "NameService" );
  
!   // Downcast to type.
    CosNaming::NamingContext_var nc = CosNaming::NamingContext::_narrow( nsobj );
  
!   // Create binding
    CosNaming::Name name;
    name.length(1);
!   name[0].id = CORBA::string_dup( "fcUMLPackageFactory" );
!   name[0].kind = CORBA::string_dup( "UMLPackageFactory" );
    nc->bind( name, objRef );
  
    orb->run ();
  
!   /* Shutdown. This calls etherealize() for our UmlPackagePackage. */
    poa->destroy (TRUE, TRUE);