Bug 3910 - Remove references to google protocol buffers

6 files changed, 6 insertions, 41 deletions

diff --git a/CHANGES b/CHANGES
index 652efc56cf1..97d00869186 100644
--- a/CHANGES
+++ b/CHANGES
@@ -33,10 +33,6 @@ noted.
 - Fixed a bug where ice_getCachedConnection could throw if called
   shortly after connection establishment failed.
 
-- Added support for Google protocol buffers to Ice for C++, Java,
-  and Python. This supercedes the ZeroC Labs release of the protocol
-  buffer support.
-
 - Fixed an IceGrid bug where an application update could trigger the
   deactivation of all session-activated servers even if these servers
   were not updated.
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 457253b5f0b..b2bc52b1dba 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -54,27 +54,6 @@ Features added with 3.3.1
 =========================
 
 
-Protobuf
---------
-
-This release integrates the ZeroC Labs release for Google protocol
-buffers. This feature allows you to serialize and deserialize data to
-and from protocol buffers and transmit these via Ice operation
-invocations with Ice for C++, Java, and Python. To use protocol
-buffers in your application, you must annotate a byte sequence with
-metadata that specifies the desired protocol buffer message type, as
-shown below for C++:
-
-// Slice
-["cpp:protobuf:tutorial::Person"] sequence<byte> Person;
-
-With this definition, the Slice compiler generates additional code to
-transparently encode and decode a protocol buffer message.
-
-You can read more about this feature in the Ice manual. We have also
-included a new sample program for each of the supported languages.
-
-
 Java and .NET serialization
 ---------------------------
 
@@ -140,10 +119,6 @@ New sample programs
 
 This release adds the following sample programs:
 
-  - protobuf (C++, Java, Python)
-
-    Demonstrates integration with Google protocol buffers.
-
   - serialize (.NET, Java)
 
     Shows how to transfer serializable classes with Ice.
diff --git a/cpp/demo/Ice/README b/cpp/demo/Ice/README
index b286aa96f6a..0b9aee63862 100644
--- a/cpp/demo/Ice/README
+++ b/cpp/demo/Ice/README
@@ -61,10 +61,6 @@ Demos in this directory:
   A demo that shows how Ice takes advantage of NRVO (Named Return
   Value Optimization) which is included in modern C++ compilers.
 
-- protobuf
-
-  A demo that shows how to integrate Google Protocol Buffers with Ice.
-
 - session
 
   This demo shows how to use sessions to clean up client-specific
diff --git a/java/demo/Ice/README b/java/demo/Ice/README
index c3020c216a1..5714a88aa20 100644
--- a/java/demo/Ice/README
+++ b/java/demo/Ice/README
@@ -52,10 +52,6 @@ Demos in this directory:
   A demo to illustrate how nested callbacks work, and how the size of
   the thread pool affects the maximum nesting depth.
 
-- protobuf
-
-  A demo that shows how to integrate Google Protocol Buffers with Ice.
-
 - serialize
 
   This demo illustrates how to transfer serializable Java classes
diff --git a/makedist.py b/makedist.py
index 654d07e4664..8b821e5d46c 100755
--- a/makedist.py
+++ b/makedist.py
@@ -42,6 +42,12 @@ filesToRemove = [ \
     "makedist.py", \
     "cpp/config/makegitignore.py", \
     "rb/config/Make.rules.Darwin", \
+    "cpp/demo/Ice/protobuf", \
+    "java/demo/Ice/protobuf", \
+    "py/demo/Ice/protobuf", \
+    "cpp/test/Ice/protobuf", \
+    "java/test/Ice/protobuf", \
+    "py/test/Ice/protobuf", \
 ]
 
 #
diff --git a/py/demo/Ice/README b/py/demo/Ice/README
index 4123ae8a4f4..0ac4d943801 100644
--- a/py/demo/Ice/README
+++ b/py/demo/Ice/README
@@ -38,10 +38,6 @@ Demos in this directory:
 
   This demo illustrates a minimal Ice application.
 
-- protobuf
-
-  A demo that shows how to integrate Google Protocol Buffers with Ice.
-
 - session
 
   This demo shows how to use sessions to clean up client-specific