Merge commit 'origin/R3_3_branch'

Conflicts:
	CHANGES
	cpp/demo/Freeze/backup/.depend
	cpp/demo/Freeze/bench/.depend
	cpp/demo/Freeze/casino/.depend
	cpp/demo/Freeze/customEvictor/.depend
	cpp/demo/Freeze/library/.depend
	cpp/demo/Freeze/phonebook/.depend
	cpp/demo/Freeze/transform/.depend
	cpp/demo/Glacier2/callback/.depend
	cpp/demo/Glacier2/chat/.depend
	cpp/demo/Ice/async/.depend
	cpp/demo/Ice/bidir/.depend
	cpp/demo/Ice/callback/.depend
	cpp/demo/Ice/converter/.depend
	cpp/demo/Ice/hello/.depend
	cpp/demo/Ice/invoke/.depend
	cpp/demo/Ice/latency/.depend
	cpp/demo/Ice/minimal/.depend
	cpp/demo/Ice/multicast/.depend
	cpp/demo/Ice/nested/.depend
	cpp/demo/Ice/nrvo/.depend
	cpp/demo/Ice/session/.depend
	cpp/demo/Ice/throughput/.depend
	cpp/demo/Ice/value/.depend
	cpp/demo/IceBox/hello/.depend
	cpp/demo/IceGrid/allocate/.depend
	cpp/demo/IceGrid/icebox/.depend
	cpp/demo/IceGrid/replication/.depend
	cpp/demo/IceGrid/sessionActivation/.depend
	cpp/demo/IceGrid/simple/.depend
	cpp/demo/IceStorm/clock/.depend
	cpp/demo/IceStorm/counter/.depend
	cpp/demo/IceStorm/replicated/.depend
	cpp/demo/IceStorm/replicated2/.depend
	cpp/demo/book/freeze_filesystem/.depend
	cpp/demo/book/lifecycle/.depend
	cpp/demo/book/printer/.depend
	cpp/demo/book/simple_filesystem/.depend
	cpp/src/Freeze/.depend
	cpp/src/FreezeScript/.depend
	cpp/src/Ice/.depend
	cpp/src/Ice/UdpTransceiver.cpp
	cpp/src/Ice/UdpTransceiver.h
	cpp/src/IceBox/.depend
	cpp/src/IceGrid/.depend
	cpp/src/IceGridLib/.depend
	cpp/src/IcePatch2/.depend
	cpp/src/IceStorm/.depend
	cpp/src/slice2freeze/.depend
	cpp/test/Freeze/complex/.depend
	cpp/test/Freeze/dbmap/.depend
	cpp/test/Freeze/evictor/.depend
	cpp/test/Freeze/oldevictor/.depend
	cpp/test/FreezeScript/dbmap/.depend
	cpp/test/FreezeScript/evictor/.depend
	cpp/test/Glacier2/attack/.depend
	cpp/test/Glacier2/dynamicFiltering/.depend
	cpp/test/Glacier2/router/.depend
	cpp/test/Glacier2/sessionControl/.depend
	cpp/test/Glacier2/ssl/.depend
	cpp/test/Glacier2/staticFiltering/.depend
	cpp/test/Ice/adapterDeactivation/.depend
	cpp/test/Ice/background/.depend
	cpp/test/Ice/binding/.depend
	cpp/test/Ice/checksum/.depend
	cpp/test/Ice/checksum/server/.depend
	cpp/test/Ice/custom/.depend
	cpp/test/Ice/exceptions/.depend
	cpp/test/Ice/facets/.depend
	cpp/test/Ice/faultTolerance/.depend
	cpp/test/Ice/gc/.depend
	cpp/test/Ice/hold/.depend
	cpp/test/Ice/inheritance/.depend
	cpp/test/Ice/interceptor/.depend
	cpp/test/Ice/location/.depend
	cpp/test/Ice/objects/.depend
	cpp/test/Ice/operations/.depend
	cpp/test/Ice/proxy/.depend
	cpp/test/Ice/retry/.depend
	cpp/test/Ice/servantLocator/.depend
	cpp/test/Ice/slicing/exceptions/.depend
	cpp/test/Ice/slicing/objects/.depend
	cpp/test/Ice/stream/.depend
	cpp/test/Ice/stringConverter/.depend
	cpp/test/Ice/timeout/.depend
	cpp/test/Ice/udp/.depend
	cpp/test/IceBox/configuration/.depend
	cpp/test/IceGrid/activation/.depend
	cpp/test/IceGrid/allocation/.depend
	cpp/test/IceGrid/deployer/.depend
	cpp/test/IceGrid/distribution/.depend
	cpp/test/IceGrid/replicaGroup/.depend
	cpp/test/IceGrid/replication/.depend
	cpp/test/IceGrid/session/.depend
	cpp/test/IceGrid/simple/.depend
	cpp/test/IceGrid/update/.depend
	cpp/test/IceSSL/configuration/.depend
	cpp/test/IceStorm/federation/.depend
	cpp/test/IceStorm/federation2/.depend
	cpp/test/IceStorm/rep1/.depend
	cpp/test/IceStorm/repgrid/.depend
	cpp/test/IceStorm/repstress/.depend
	cpp/test/IceStorm/single/.depend
	cpp/test/IceStorm/stress/.depend
	cpp/test/Slice/keyword/.depend
	cs/src/Ice/Instance.cs
	cs/src/IceSSL/ConnectorI.cs
	java/demo/book/simple_filesystem/Filesystem/DirectoryI.java
	java/demo/book/simple_filesystem/Filesystem/FileI.java
	java/src/IceInternal/TcpConnector.java
	java/src/IceSSL/ConnectorI.java
	py/modules/IcePy/.depend
	rb/src/IceRuby/.depend

1 files changed, 114 insertions, 0 deletions

diff --git a/java/test/Ice/serialize/InitialI.java b/java/test/Ice/serialize/InitialI.java
new file mode 100644
index 00000000000..7973076b65e
--- /dev/null
+++ b/java/test/Ice/serialize/InitialI.java
@@ -0,0 +1,114 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+import Test.*;
+import java.io.*;
+
+public final class InitialI extends _InitialDisp
+{
+    InitialI(Ice.ObjectAdapter adapter, Ice.Identity ident)
+    {
+        _s = new Struct1();
+        _s.bo = true;
+        _s.by = (byte)1;
+        _s.sh = (short)2;
+        _s.i = 3;
+        _s.l = 4;
+        _s.f = (float)5.0;
+        _s.d = 6.0;
+        _s.str = "7";
+        _s.e = Test.MyEnum.enum2;
+        _s.p = Test.InitialPrxHelper.uncheckedCast(adapter.createProxy(ident));
+
+        _d = new Derived();
+        _d.b = _d;
+        _d.o = _d;
+        _d.s = _s;
+        _d.seq1 = new byte[] { 0, 1, 2, 3, 4 };
+        _d.seq2 = new int[] { 5, 6, 7, 8, 9 };
+        _d.seq3 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 };
+        _d.seq4 = new Base[] { _d };
+        _d.d1 = new java.util.HashMap<Byte, Boolean>();
+        _d.d1.put((byte)1, true);
+        _d.d2 = new java.util.HashMap<Short, Integer>();
+        _d.d2.put((short)2, 3);
+        _d.d3 = new java.util.HashMap<String, MyEnum>();
+        _d.d3.put("enum3", MyEnum.enum3);
+        _d.d4 = new java.util.HashMap<String, Base>();
+        _d.d4.put("b", _d);
+        _d.p = _s.p;
+    }
+
+    public byte[]
+    getStruct1(Ice.Current current)
+    {
+        try
+        {
+            ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+            ObjectOutputStream stream = new ObjectOutputStream(byteStream);
+            stream.writeObject(_s);
+            return byteStream.toByteArray();
+        }
+        catch(IOException ex)
+        {
+            Ice.UnknownException e = new Ice.UnknownException();
+            e.initCause(ex);
+            throw e;
+        }
+    }
+
+    public byte[]
+    getBase(Ice.Current current)
+    {
+        try
+        {
+            ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+            ObjectOutputStream stream = new ObjectOutputStream(byteStream);
+            stream.writeObject(_d);
+            return byteStream.toByteArray();
+        }
+        catch(IOException ex)
+        {
+            Ice.UnknownException e = new Ice.UnknownException();
+            e.initCause(ex);
+            throw e;
+        }
+    }
+
+    public byte[]
+    getEx(Ice.Current current)
+    {
+        try
+        {
+            Ex ex = new Ex();
+            ex.s = _s;
+            ex.b = _d;
+
+            ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+            ObjectOutputStream stream = new ObjectOutputStream(byteStream);
+            stream.writeObject(ex);
+            return byteStream.toByteArray();
+        }
+        catch(IOException ex)
+        {
+            Ice.UnknownException e = new Ice.UnknownException();
+            e.initCause(ex);
+            throw e;
+        }
+    }
+
+    public void
+    shutdown(Ice.Current current)
+    {
+        current.adapter.getCommunicator().shutdown();
+    }
+
+    private Struct1 _s;
+    private Derived _d;
+}