Communicator.ice

7 files changed, 102 insertions, 48 deletions

diff --git a/cpp/include/Ice/Communicator.h b/cpp/include/Ice/Communicator.h
index 7f853dae037..db9bed7b6f2 100644
--- a/cpp/include/Ice/Communicator.h
+++ b/cpp/include/Ice/Communicator.h
@@ -8,63 +8,46 @@
 //
 // **********************************************************************
 
-#ifndef ICE_COMMUNICATOR_H
-#define ICE_COMMUNICATOR_H
+// Generated from file `Communicator.ice'
+
+#ifndef __Communicator_h__
+#define __Communicator_h__
 
 #include <Ice/CommunicatorF.h>
-#include <Ice/InstanceF.h>
-#include <Ice/ProxyF.h>
-#include <Ice/ObjectAdapterF.h>
-#include <Ice/ValueFactoryF.h>
-#include <Ice/PropertiesF.h>
-#include <Ice/LoggerF.h>
-#include <Ice/PicklerF.h>
-#include <Ice/Shared.h>
+#include <Ice/LocalObject.h>
 
 namespace Ice
 {
 
-class ICE_API Communicator : public ::__Ice::Shared, public JTCRecursiveMutex
+class Communicator : public ::Ice::LocalObject
 {
-public:
-    
-    void destroy();
-    void shutdown();
-    void waitForShutdown();
+public: 
 
-    Object_prx stringToProxy(const std::string&);
+    virtual void destroy() = 0;
 
-    ObjectAdapter_ptr createObjectAdapter(const std::string&);
-    ObjectAdapter_ptr createObjectAdapter(const std::string&,
-					  const std::string&);
+    virtual void shutdown() = 0;
 
-    void installValueFactory(const ValueFactory_ptr&, const std::string&);
+    virtual void waitForShutdown() = 0;
 
-    Properties_ptr properties();
+    virtual ::Ice::Object_prx stringToProxy(const ::std::string&) = 0;
 
-    Logger_ptr logger();
-    void logger(const Logger_ptr&);
+    virtual ::Ice::ObjectAdapter_ptr createObjectAdapter(const ::std::string&) = 0;
 
-    Pickler_ptr pickler();
+    virtual ::Ice::ObjectAdapter_ptr createObjectAdapterWithEndpoints(const ::std::string&, const ::std::string&) = 0;
 
-private:
+    virtual void installValueFactory(const ::Ice::ValueFactory_ptr&, const ::std::string&) = 0;
 
-    Communicator(const Properties_ptr&);
-    virtual ~Communicator();
+    virtual ::Ice::Properties_ptr getProperties() = 0;
 
-    friend ICE_API Communicator_ptr initialize(int&, char*[]);
-    friend ICE_API Communicator_ptr initialize(int&, char*[],
-					       const Properties_ptr&);
+    virtual ::Ice::Logger_ptr getLogger() = 0;
 
-    ::__Ice::Instance_ptr instance_;
-};
+    virtual void setLogger(const ::Ice::Logger_ptr&) = 0;
 
-ICE_API Communicator_ptr initialize(int&, char*[]);
-ICE_API Communicator_ptr initialize(int&, char*[], const Properties_ptr&);
+    virtual ::Ice::Pickler_ptr getPickler() = 0;
 
-ICE_API Properties_ptr createProperties();
-ICE_API Properties_ptr createProperties(const Properties_ptr&);
-ICE_API Properties_ptr createProperties(const std::string&);
+    virtual void __write(::__Ice::Stream*);
+    virtual void __read(::__Ice::Stream*);
+};
 
 }
 
diff --git a/cpp/include/Ice/CommunicatorF.h b/cpp/include/Ice/CommunicatorF.h
index 76edf35d312..e7805bd915b 100644
--- a/cpp/include/Ice/CommunicatorF.h
+++ b/cpp/include/Ice/CommunicatorF.h
@@ -8,25 +8,67 @@
 //
 // **********************************************************************
 
-#ifndef ICE_COMMUNICATOR_F_H
-#define ICE_COMMUNICATOR_F_H
+// Generated from file `Communicator.ice'
 
-#include <Ice/Handle.h>
+#ifndef __CommunicatorF_h__
+#define __CommunicatorF_h__
 
-namespace Ice { class Communicator; }
+#include <Ice/LocalObjectF.h>
+
+namespace Ice
+{
+
+class ObjectAdapter;
+
+class ValueFactory;
+
+class Properties;
+
+class Logger;
+
+class Pickler;
+
+class Communicator;
+
+}
 
 namespace __Ice
 {
 
-void ICE_API incRef(::Ice::Communicator*);
-void ICE_API decRef(::Ice::Communicator*);
+void incRef(::Ice::ObjectAdapter*);
+void decRef(::Ice::ObjectAdapter*);
+
+void incRef(::Ice::ValueFactory*);
+void decRef(::Ice::ValueFactory*);
+
+void incRef(::Ice::Properties*);
+void decRef(::Ice::Properties*);
+
+void incRef(::Ice::Logger*);
+void decRef(::Ice::Logger*);
+
+void incRef(::Ice::Pickler*);
+void decRef(::Ice::Pickler*);
+
+void incRef(::Ice::Communicator*);
+void decRef(::Ice::Communicator*);
 
 }
 
 namespace Ice
 {
 
-typedef __Ice::Handle<Communicator> Communicator_ptr;
+typedef ::__Ice::Handle< ::Ice::ObjectAdapter> ObjectAdapter_ptr;
+
+typedef ::__Ice::Handle< ::Ice::ValueFactory> ValueFactory_ptr;
+
+typedef ::__Ice::Handle< ::Ice::Properties> Properties_ptr;
+
+typedef ::__Ice::Handle< ::Ice::Logger> Logger_ptr;
+
+typedef ::__Ice::Handle< ::Ice::Pickler> Pickler_ptr;
+
+typedef ::__Ice::Handle< ::Ice::Communicator> Communicator_ptr;
 
 }
 
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index 1fbbfcfc4e2..7a13d990f78 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -18,5 +18,6 @@
 #include <Ice/Logger.h>
 #include <Ice/ValueFactory.h>
 #include <Ice/Pickler.h>
+#include <Ice/Initialize.h>
 
 #endif
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
new file mode 100644
index 00000000000..251b7c2a2dd
--- /dev/null
+++ b/cpp/include/Ice/Initialize.h
@@ -0,0 +1,27 @@
+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#ifndef ICE_INITIALIZE_H
+#define ICE_INITIALIZE_H
+
+namespace Ice
+{
+
+ICE_API Communicator_ptr initialize(int&, char*[]);
+ICE_API Communicator_ptr initializeWithProperties(int&, char*[],
+						  const Properties_ptr&);
+
+ICE_API Properties_ptr createProperties();
+ICE_API Properties_ptr copyProperties(const Properties_ptr&);
+ICE_API Properties_ptr loadProperties(const std::string&);
+
+}
+
+#endif
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h
index 3930db1e394..26ff71bd9bc 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.h
@@ -12,6 +12,7 @@
 #define ICE_LOCAL_OBJECT_H
 
 #include <Ice/LocalObjectF.h>
+#include <Ice/ProxyF.h> // TODO...
 #include <Ice/Shared.h>
 
 namespace __Ice
diff --git a/cpp/include/Ice/LoggerF.h b/cpp/include/Ice/LoggerF.h
index eb24fbc9cc3..a16b974ca45 100644
--- a/cpp/include/Ice/LoggerF.h
+++ b/cpp/include/Ice/LoggerF.h
@@ -13,7 +13,7 @@
 #ifndef __LoggerF_h__
 #define __LoggerF_h__
 
-#include <Ice/Handle.h>
+#include <Ice/LocalObjectF.h>
 
 namespace Ice
 {
diff --git a/cpp/include/Ice/Properties.h b/cpp/include/Ice/Properties.h
index 73081868d81..df2b7cfe377 100644
--- a/cpp/include/Ice/Properties.h
+++ b/cpp/include/Ice/Properties.h
@@ -34,8 +34,8 @@ private:
 
     friend ICE_API Communicator_ptr initialize(int&, char*[]);
     friend ICE_API Properties_ptr createProperties();
-    friend ICE_API Properties_ptr createProperties(const Properties_ptr&);
-    friend ICE_API Properties_ptr createProperties(const std::string&);
+    friend ICE_API Properties_ptr copyProperties(const Properties_ptr&);
+    friend ICE_API Properties_ptr loadProperties(const std::string&);
 
     void load(const std::string&);
     void parse(std::istream&);