2 files changed, 36 insertions, 34 deletions

diff --git a/CIAO/ciao/CCM_Home.idl b/CIAO/ciao/CCM_Home.idl
index 1c37d89355f..d786cdcc07c 100644
--- a/CIAO/ciao/CCM_Home.idl
+++ b/CIAO/ciao/CCM_Home.idl
@@ -14,40 +14,13 @@
 #if !defined (CCM_HOME_IDL)
 #define CCM_HOME_IDL
 
+#include "CCM_Object.idl"
 #include "tao/IFR_Client/IFR_Base.pidl"
 
-module Components
-{
-  typeprefix Components "omg.org";
-
-  typedef unsigned long FailureReason;
-
-  exception CreateFailure {
-    FailureReason reason;
-  };
-  exception FinderFailure
-  {
-    FailureReason reason;
-  };
-  exception RemoveFailure
-  {
-    FailureReason reason;
-  };
-
-  exception DuplicateKeyValue {};
-  exception InvalidKey {};
-  exception UnknownKeyValue {};
-
-  interface CCMObject;
-
-  interface CCMHome
-  {
-    CORBA::IRObject get_component_def ();
-    CORBA::IRObject get_home_def ();
-    void remove_component ( in CCMObject comp)
-      raises (RemoveFailure);
-  };
-
-};
+//module Components
+//{
+//  typeprefix Components "omg.org";
+//
+//};
 
 #endif /* CCM_HOME_IDL */
diff --git a/CIAO/ciao/CCM_Object.idl b/CIAO/ciao/CCM_Object.idl
index fc7309ddcdd..348ab0d758c 100644
--- a/CIAO/ciao/CCM_Object.idl
+++ b/CIAO/ciao/CCM_Object.idl
@@ -16,18 +16,47 @@
 
 #include "CCM_Event.idl"
 #include "CCM_Navigation.idl"
-#include "CCM_Home.idl"
+#include "tao/IFR_Client/IFR_Base.pidl"
 
 module Components
 {
   typeprefix Components "omg.org";
 
+  typedef unsigned long FailureReason;
+
   typedef FailureReason InvalidConfigurationReason;
   const InvalidConfigurationReason UnknownConfigValueName = 0;
   const InvalidConfigurationReason InvalidConfigValueType = 1;
   const InvalidConfigurationReason ConfigValueRequired = 2;
   const InvalidConfigurationReason ConfigValueNotExpected = 3;
 
+  exception CreateFailure {
+    FailureReason reason;
+  };
+  exception FinderFailure
+  {
+    FailureReason reason;
+  };
+  exception RemoveFailure
+  {
+    FailureReason reason;
+  };
+
+  exception DuplicateKeyValue {};
+  exception InvalidKey {};
+  exception UnknownKeyValue {};
+
+  interface CCMObject;
+
+  interface CCMHome
+  {
+    CORBA::IRObject get_component_def ();
+    CORBA::IRObject get_home_def ();
+    void remove_component ( in CCMObject comp)
+      raises (RemoveFailure);
+  };
+
+
   exception InvalidConfiguration
   {
     InvalidConfigurationReason reason;