merging Protocol Buffers into master, updated for Ice 3.5

1 files changed, 27 insertions, 0 deletions

diff --git a/protobuf/demo/java/HelloI.java b/protobuf/demo/java/HelloI.java
new file mode 100644
index 00000000000..9373fa072c2
--- /dev/null
+++ b/protobuf/demo/java/HelloI.java
@@ -0,0 +1,27 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice Protobuf is licensed to you under the terms
+// described in the ICE_PROTOBUF_LICENSE file included in this
+// distribution.
+//
+// **********************************************************************
+
+import Demo.*;
+
+public class HelloI extends _HelloDisp
+{
+    public void
+    sayHello(tutorial.PersonPB.Person p, Ice.Current current)
+    {
+        System.out.println("Hello World from " + p);
+    }
+
+    public void
+    shutdown(Ice.Current current)
+    {
+        System.out.println("Shutting down...");
+        current.adapter.getCommunicator().shutdown();
+    }
+}