*** empty log message ***

3 files changed, 64 insertions, 50 deletions

diff --git a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
index 3372afbf0f3..ecacdbb7eda 100644
--- a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
@@ -3,9 +3,9 @@
 
 project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
   sharedname  = CIAO_DnC_Client
-  idlflags  += -Wb,stub_export_include=CIAO_Client_Export.h 
-  idlflags  += -Wb,stub_export_macro=CIAO_CLIENT_Export 
-  idlflags  += -Wb,skel_export_include=CIAO_Container_Export.h 
+  idlflags  += -Wb,stub_export_include=CIAO_Client_Export.h
+  idlflags  += -Wb,stub_export_macro=CIAO_CLIENT_Export
+  idlflags  += -Wb,skel_export_include=CIAO_Container_Export.h
   idlflags  += -Wb,skel_export_macro=CIAO_CONTAINER_Export
 
   dynamicflags    = CIAO_CLIENT_BUILD_DLL
@@ -35,7 +35,7 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, iorintercep
   after += CIAO_DnC_Client
   sharedname  = CIAO_DnC_Container
   libs       += CIAO_DnC_Client
-  idlflags   += -Wb,export_include=CIAO_Container_Export.h 
+  idlflags   += -Wb,export_include=CIAO_Container_Export.h
   idlflags   += -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
 
@@ -91,20 +91,26 @@ project (CIAO_DnC_Server) : orbsvcslib, portableserver, iorinterceptor, objrefte
 project(Deployment_stub) : taolib_with_idl, valuetype , ciao_server_dnc {
   sharedname   =  Deployment_stub
 
-  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export 
-  idlflags     += -Wb,stub_export_include=Deployment_stub_export.h 
-  idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export 
+  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
+  idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
+  idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
   idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
 
   dynamicflags =  DEPLOYMENT_STUB_BUILD_DLL
 
   IDL_Files {
-     Deployment.idl
+     Deployment_Ex.idl
      NodeApplication_CallBack.idl
   }
 
+ IDL_Files {
+     idlflags += -St
+     Deployment.idl
+  }
+
   Source_Files {
     DeploymentC.cpp
+    Deployment_ExC.cpp
     NodeApplication_CallBackC.cpp
   }
 }
@@ -114,9 +120,9 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, ciao_server_dnc {
   sharedname   =  Deployment_svnt
   dynamicflags =  DEPLOYMENT_SVNT_BUILD_DLL
   libs         += Deployment_stub
-  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export 
-  idlflags     += -Wb,stub_export_include=Deployment_stub_export.h 
-  idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export 
+  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
+  idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
+  idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
   idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
 
   IDL_Files {
@@ -124,6 +130,7 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, ciao_server_dnc {
 
   Source_Files {
     DeploymentS.cpp
+    Deployment_ExS.cpp
     NodeApp_CB_Impl.cpp
     NodeApplication_CallBackS.cpp
   }
diff --git a/TAO/CIAO/DAnCE/ciao/Deployment.idl b/TAO/CIAO/DAnCE/ciao/Deployment.idl
index a690f64561e..33ec0a15378 100644
--- a/TAO/CIAO/DAnCE/ciao/Deployment.idl
+++ b/TAO/CIAO/DAnCE/ciao/Deployment.idl
@@ -2,6 +2,7 @@
 #include <orb.idl>
 #include "tao/ULongSeq.pidl"
 #include "Deployment_Core.idl"
+#include "Deployment_Ex.idl"
 
 module Deployment {
 
@@ -254,19 +255,6 @@ module Deployment {
     Properties infoProperty;
   };
 
-  exception ResourceNotAvailable {
-    string name;
-    string resourceType;
-    string propertyName;
-    string elementName;
-    string resourceName;
-  };
-
-  exception PlanError {
-    string name;
-    string reason;
-  };
-
   enum DomainUpdateKind {
     Add,
     Delete,
@@ -283,15 +271,6 @@ module Deployment {
     void updateDomain (in ::CORBA::StringSeq elements, in Domain domainSubset, in DomainUpdateKind updateKind);
   };
 
-  exception InvalidProperty {
-    string name;
-    string reason;
-  };
-
-  exception StopError {
-    string name;
-    string reason;
-  };
 
   interface ApplicationManager {
     Application startLaunch (in Properties configProperty, out Connections providedReference, in boolean start)
@@ -342,23 +321,6 @@ module Deployment {
       raises (StopError);
   };
 
-  exception NameExists {
-  };
-
-  exception PackageError {
-    string source;
-    string reason;
-  };
-
-  exception NoSuchName {
-  };
-
-  exception LastConfiguration {
-  };
-
-  exception InvalidReference {
-  };
-
   struct PackageConfiguration;
 
   typedef sequence < PackageConfiguration > PackageConfigurations;
diff --git a/TAO/CIAO/DAnCE/ciao/Deployment_Ex.idl b/TAO/CIAO/DAnCE/ciao/Deployment_Ex.idl
new file mode 100644
index 00000000000..236bae7f838
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ciao/Deployment_Ex.idl
@@ -0,0 +1,45 @@
+// $Id$
+#include <orb.idl>
+
+module Deployment {
+
+  exception ResourceNotAvailable {
+    string name;
+    string resourceType;
+    string propertyName;
+    string elementName;
+    string resourceName;
+  };
+
+  exception PlanError {
+    string name;
+    string reason;
+  };
+
+  exception InvalidProperty {
+    string name;
+    string reason;
+  };
+
+  exception StopError {
+    string name;
+    string reason;
+  };
+
+  exception NameExists {
+  };
+
+  exception PackageError {
+    string source;
+    string reason;
+  };
+
+  exception NoSuchName {
+  };
+
+  exception LastConfiguration {
+  };
+
+  exception InvalidReference {
+  };
+};