added SSL framework

7 files changed, 109 insertions, 110 deletions

diff --git a/cpp/doc/Properties.sgml b/cpp/doc/Properties.sgml
index ff0cbf8fb14..7b0b65545a3 100644
--- a/cpp/doc/Properties.sgml
+++ b/cpp/doc/Properties.sgml
@@ -99,7 +99,7 @@ ice.adapter.<replaceable>name</replaceable>.endpoints=<replaceable>endpoint_list
 <section>
 <title>Description</title>
 <para>
-Sets the endpoints for an object adapter
+Sets the endpoints for the object adapter
 <replaceable>name</replaceable> to
 <replaceable>enpoint_list</replaceable>.
 </para>
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h
index 9412bcdf45c..64f4bf899e1 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.h
@@ -47,9 +47,6 @@ public:
 
     LocalObject();
     virtual ~LocalObject();
-
-    virtual void __write(::IceInternal::Stream*) = 0;
-    virtual void __read(::IceInternal::Stream*) = 0;
 };
 
 }
diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h
index ce813c7c243..8582743993b 100644
--- a/cpp/include/Ice/Outgoing.h
+++ b/cpp/include/Ice/Outgoing.h
@@ -47,6 +47,7 @@ private:
 
     enum
     {
+	StateUnsent,
 	StateInProgress,
 	StateOK,
 	StateException,
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 8143eadf58a..02e86ba02f4 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -63,6 +63,7 @@ public:
 
     ::Ice::ObjectPrx _twoway() const;
     ::Ice::ObjectPrx _oneway() const;
+    ::Ice::ObjectPrx _secure() const;
     ::Ice::ObjectPrx _datagram() const;
     ::Ice::ObjectPrx _timeout(int) const;
 
diff --git a/cpp/src/Slice/OutputUtil.cpp b/cpp/src/Slice/OutputUtil.cpp
index 5a34d525bfc..63fe83d2c90 100644
--- a/cpp/src/Slice/OutputUtil.cpp
+++ b/cpp/src/Slice/OutputUtil.cpp
@@ -31,21 +31,21 @@ Separator sp;
 Slice::Output::Output()
     : _pos(0),
       _indent(0),
-      _separator(true),

-      _blockStart("{"),

-      _blockEnd("}"),

-      _useTab(true),

-      _indentSize(4)

+      _separator(true),
+      _blockStart("{"),
+      _blockEnd("}"),
+      _useTab(true),
+      _indentSize(4)
 {
 }
 
 Slice::Output::Output(const char* s)
     : _pos(0),
       _indent(0),
-      _separator(true),

-      _blockStart("{"),

-      _blockEnd("}"),

-      _useTab(true),

+      _separator(true),
+      _blockStart("{"),
+      _blockEnd("}"),
+      _useTab(true),
       _indentSize(4)
 {
     open(s);
@@ -107,30 +107,30 @@ Slice::Output::restoreIndent()
     _indent = _indentSave.top();
     _indentSave.pop();
 }
-

-void 

-Slice::Output::setBeginBlock(const char *bb)

-{

-    _blockStart = bb;

-}

-

-void 

-Slice::Output::setEndBlock(const char *eb)

-{

-    _blockEnd = eb;

-}

-

-void 

-Slice::Output::setIndent(int indentSize)

-{

-    _indentSize = indentSize; 

-}

-

-void 

-Slice::Output::setUseTab(bool useTab)

-{

-    _useTab = useTab;

-}

+
+void 
+Slice::Output::setBeginBlock(const char *bb)
+{
+    _blockStart = bb;
+}
+
+void 
+Slice::Output::setEndBlock(const char *eb)
+{
+    _blockEnd = eb;
+}
+
+void 
+Slice::Output::setIndent(int indentSize)
+{
+    _indentSize = indentSize; 
+}
+
+void 
+Slice::Output::setUseTab(bool useTab)
+{
+    _useTab = useTab;
+}
 
 void
 Slice::Output::nl()
@@ -140,25 +140,25 @@ Slice::Output::nl()
     _separator = true;
 
     int indent = _indent;
-

-    if (_useTab)

-    {

-        while (indent >= 8)

-        {

-            indent -= 8;

-            _out << '\t';

-            _pos += 8;

-        }

-    }

-    else

-    {

+
+    if (_useTab)
+    {
+        while (indent >= 8)
+        {
+            indent -= 8;
+            _out << '\t';
+            _pos += 8;
+        }
+    }
+    else
+    {
         while (indent >= _indentSize)
         {
             indent -= _indentSize;
             _out << "    ";
             _pos += _indentSize;
         }
-    }

+    }
 
     while (indent > 0)
     {
diff --git a/cpp/src/Slice/OutputUtil.h b/cpp/src/Slice/OutputUtil.h
index 1d0c477fc4d..866b50e3681 100644
--- a/cpp/src/Slice/OutputUtil.h
+++ b/cpp/src/Slice/OutputUtil.h
@@ -37,11 +37,11 @@ class ICE_API Output : ::IceInternal::noncopyable
 public:
 
     Output();
-    Output(const char*);

-

-    void setBeginBlock(const char *); // what do we use at block starts?

-    void setEndBlock(const char *);   // what do we use the block end?

-    void setIndent(int);              // what is the indent level?

+    Output(const char*);
+
+    void setBeginBlock(const char *); // what do we use at block starts?
+    void setEndBlock(const char *);   // what do we use the block end?
+    void setIndent(int);              // what is the indent level?
     void setUseTab(bool);             // should we output tabs?
 
     void open(const char*); // Open output stream
@@ -68,11 +68,11 @@ private:
     int _pos;
     int _indent;
     std::stack<int> _indentSave;
-    bool _separator;

-

-    std::string _blockStart;

-    std::string _blockEnd;

-    bool _useTab;

+    bool _separator;
+
+    std::string _blockStart;
+    std::string _blockEnd;
+    bool _useTab;
     int  _indentSize;
 };
 
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index e4de966a3c8..8b86828b5f3 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -1341,58 +1341,58 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
 	    C << nl << "return ::IceInternal::DispatchOperationNotExist;";
 	    C << eb;
 	}
+	H << sp;
+	H << nl << "virtual void __write(::IceInternal::Stream*);";
+	H << nl << "virtual void __read(::IceInternal::Stream*);";
+	TypeStringList memberList;
+	DataMemberList dataMembers = p->dataMembers();
+	DataMemberList::const_iterator q;
+	for (q = dataMembers.begin(); q != dataMembers.end(); ++q)
+	    memberList.push_back(make_pair((*q)->type(), (*q)->name()));
+	C << sp;
+	C << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::Stream* __os)";
+	C << sb;
+	C << nl << "__os->startWriteEncaps();";
+	writeMarshalCode(C, memberList, 0);
+	C << nl << "__os->endWriteEncaps();";
+	if (base)
+	{
+	    C.zeroIndent();
+	    C << nl << "#ifdef WIN32"; // COMPILERBUG
+	    C.restoreIndent();
+	    C << nl << base->name() << "::__write(__os);";
+	    C.zeroIndent();
+	    C << nl << "#else";
+	    C.restoreIndent();
+	    C << nl << base->scoped() << "::__write(__os);";
+	    C.zeroIndent();
+	    C << nl << "#endif";
+	    C.restoreIndent();
+	}
+	C << eb;
+	C << sp;
+	C << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::Stream* __is)";
+	C << sb;
+	C << nl << "__is->startReadEncaps();";
+	writeUnmarshalCode(C, memberList, 0);
+	C << nl << "__is->endReadEncaps();";
+	if (base)
+	{
+	    C.zeroIndent();
+	    C << nl << "#ifdef WIN32"; // COMPILERBUG
+	    C.restoreIndent();
+	    C << nl << base->name() << "::__read(__is);";
+	    C.zeroIndent();
+	    C << nl << "#else";
+	    C.restoreIndent();
+	    C << nl << base->scoped() << "::__read(__is);";
+	    C.zeroIndent();
+	    C << nl << "#endif";
+	    C.restoreIndent();
+	}
+	C << eb;
     }
-    H << sp;
-    H << nl << "virtual void __write(::IceInternal::Stream*);";
-    H << nl << "virtual void __read(::IceInternal::Stream*);";
     H << eb << ';';
-    TypeStringList memberList;
-    DataMemberList dataMembers = p->dataMembers();
-    DataMemberList::const_iterator q;
-    for (q = dataMembers.begin(); q != dataMembers.end(); ++q)
-	memberList.push_back(make_pair((*q)->type(), (*q)->name()));
-    C << sp;
-    C << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::Stream* __os)";
-    C << sb;
-    C << nl << "__os->startWriteEncaps();";
-    writeMarshalCode(C, memberList, 0);
-    C << nl << "__os->endWriteEncaps();";
-    if (base)
-    {
-	C.zeroIndent();
-	C << nl << "#ifdef WIN32"; // COMPILERBUG
-	C.restoreIndent();
-	C << nl << base->name() << "::__write(__os);";
-	C.zeroIndent();
-	C << nl << "#else";
-	C.restoreIndent();
-	C << nl << base->scoped() << "::__write(__os);";
-	C.zeroIndent();
-	C << nl << "#endif";
-	C.restoreIndent();
-    }
-    C << eb;
-    C << sp;
-    C << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::Stream* __is)";
-    C << sb;
-    C << nl << "__is->startReadEncaps();";
-    writeUnmarshalCode(C, memberList, 0);
-    C << nl << "__is->endReadEncaps();";
-    if (base)
-    {
-	C.zeroIndent();
-	C << nl << "#ifdef WIN32"; // COMPILERBUG
-	C.restoreIndent();
-	C << nl << base->name() << "::__read(__is);";
-	C.zeroIndent();
-	C << nl << "#else";
-	C.restoreIndent();
-	C << nl << base->scoped() << "::__read(__is);";
-	C.zeroIndent();
-	C << nl << "#endif";
-	C.restoreIndent();
-    }
-    C << eb;
 }
 
 void