summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/examples/CosEC/Factory
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/examples/CosEC/Factory')
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc7
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h2
6 files changed, 7 insertions, 10 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
index a8ca4d25dab..9f36dda8a84 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
@@ -1,19 +1,16 @@
// -*- MPC -*-
// $Id$
-project(*Client) : orbsvcsexe, event, event_skel, naming {
+project(*Client) : orbsvcsexe, event {
idlflags += -I ../../..
- exename = FactoryClient
source_files {
FactoryClient.cpp
}
}
-project(*Server) : orbsvcsexe, event, event_serv, naming {
+project(*Server) : orbsvcsexe, event {
idlflags += -I ../../..
- exename = FactoryServer
source_files {
- main.cpp
FactoryDriver.cpp
CosEventChannelFactory_i.cpp
}
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
index ffeff6c5f94..59446678f5a 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
@@ -36,7 +36,7 @@
#ifndef TAO_COSEVENTCHANNELFACTORY_IDL
#define TAO_COSEVENTCHANNELFACTORY_IDL
-#include "orbsvcs/CosEventChannelAdmin.idl"
+#include "orbsvcs/orbsvcs/CosEventChannelAdmin.idl"
module CosEventChannelFactory
{
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
index 60210ad8515..c3661adf5eb 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
@@ -2,7 +2,7 @@
// $Id$
#include "CosEventChannelFactory_i.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
#include "tao/PortableServer/PortableServer.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
index 628383b8ed2..520fc37d382 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
@@ -23,7 +23,7 @@
#include /**/ "ace/pre.h"
#include "CosEventChannelFactoryS.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index 72c9ebc763b..2161591ffef 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -2,7 +2,7 @@
// $Id$
#include "CosEventChannelFactoryC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/Log_Msg.h"
class FactoryClient
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
index 97d837a7c2e..d60f76a6c68 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
@@ -22,7 +22,7 @@
#define TAO_FACTORYDRIVER_H
#include "CosEventChannelFactory_i.h"
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
// @@ Pradeep: I know this is just an example, but could you talk to
// Vishal about making this a service that could be bootstraped