33165fe0d5c265c92f2a67fc2b437b567c24e294 - third_party/protobuf

commit: 33165fe0d5c265c92f2a67fc2b437b567c24e294
[log]
author: liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>
Tue Nov 02 13:14:58 2010 +0000
committer: liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>
Tue Nov 02 13:14:58 2010 +0000
tree: 52def0850ddd2e976da238d1a437fbda79c96e44
parent: 80aa23df6c63750e8cdfdcf3996fbc37d63cac61 [diff]

Submit recent changes from internal branch. See CHANGES.txt for more details.

CHANGES.txt[diff]
Makefile.am[diff]
java/pom.xml[diff]
java/src/main/java/com/google/protobuf/AbstractMessage.java[diff]
java/src/main/java/com/google/protobuf/ByteString.java[diff]
java/src/main/java/com/google/protobuf/CodedInputStream.java[diff]
java/src/main/java/com/google/protobuf/CodedOutputStream.java[diff]
java/src/main/java/com/google/protobuf/Descriptors.java[diff]
java/src/main/java/com/google/protobuf/FieldSet.java[diff]
java/src/main/java/com/google/protobuf/GeneratedMessage.java[diff]
java/src/main/java/com/google/protobuf/GeneratedMessageLite.java[diff]
java/src/main/java/com/google/protobuf/Internal.java[diff]
java/src/main/java/com/google/protobuf/LazyStringArrayList.java[Added - diff]
java/src/main/java/com/google/protobuf/LazyStringList.java[Added - diff]
java/src/main/java/com/google/protobuf/Message.java[diff]
java/src/main/java/com/google/protobuf/MessageLite.java[diff]
java/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java[Added - diff]
java/src/main/java/com/google/protobuf/MessageOrBuilder.java[Added - diff]
java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java[Added - diff]
java/src/main/java/com/google/protobuf/ServiceException.java[diff]
java/src/main/java/com/google/protobuf/SingleFieldBuilder.java[Added - diff]
java/src/main/java/com/google/protobuf/SmallSortedMap.java[Added - diff]
java/src/main/java/com/google/protobuf/TextFormat.java[diff]
java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java[Added - diff]
java/src/main/java/com/google/protobuf/WireFormat.java[diff]
java/src/test/java/com/google/protobuf/AbstractMessageTest.java[diff]
java/src/test/java/com/google/protobuf/CodedInputStreamTest.java[diff]
java/src/test/java/com/google/protobuf/DeprecatedFieldTest.java[Added - diff]
java/src/test/java/com/google/protobuf/DescriptorsTest.java[diff]
java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java[Added - diff]
java/src/test/java/com/google/protobuf/GeneratedMessageTest.java[diff]
java/src/test/java/com/google/protobuf/LazyStringArrayListTest.java[Added - diff]
java/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java[Added - diff]
java/src/test/java/com/google/protobuf/LiteTest.java[diff]
java/src/test/java/com/google/protobuf/NestedBuildersTest.java[Added - diff]
java/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java[Added - diff]
java/src/test/java/com/google/protobuf/ServiceTest.java[diff]
java/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java[Added - diff]
java/src/test/java/com/google/protobuf/SmallSortedMapTest.java[Added - diff]
java/src/test/java/com/google/protobuf/TestBadIdentifiers.java[Added - diff]
java/src/test/java/com/google/protobuf/TestUtil.java[diff]
java/src/test/java/com/google/protobuf/TextFormatTest.java[diff]
java/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java[Added - diff]
java/src/test/java/com/google/protobuf/multiple_files_test.proto[diff]
java/src/test/java/com/google/protobuf/nested_builders_test.proto[Added - diff]
java/src/test/java/com/google/protobuf/nested_extension.proto[Added - diff]
java/src/test/java/com/google/protobuf/nested_extension_lite.proto[Added - diff]
java/src/test/java/com/google/protobuf/non_nested_extension.proto[Added - diff]
java/src/test/java/com/google/protobuf/non_nested_extension_lite.proto[Added - diff]
java/src/test/java/com/google/protobuf/test_bad_identifiers.proto[Added - diff]
python/google/protobuf/descriptor.py[diff]
python/google/protobuf/internal/api_implementation.py[Added - diff]
python/google/protobuf/internal/containers.py[diff]
python/google/protobuf/internal/cpp_message.py[Added - diff]
python/google/protobuf/internal/decoder.py[diff]
python/google/protobuf/internal/encoder.py[diff]
python/google/protobuf/internal/generator_test.py[diff]
python/google/protobuf/internal/message_test.py[diff]
python/google/protobuf/internal/python_message.py[Added - diff]
python/google/protobuf/internal/reflection_test.py[diff]
python/google/protobuf/internal/text_format_test.py[diff]
python/google/protobuf/message.py[diff]
python/google/protobuf/pyext/python-proto2.cc[Added - diff]
python/google/protobuf/pyext/python_descriptor.cc[Added - diff]
python/google/protobuf/pyext/python_descriptor.h[Added - diff]
python/google/protobuf/pyext/python_protobuf.cc[Added - diff]
python/google/protobuf/pyext/python_protobuf.h[Added - diff]
python/google/protobuf/reflection.py[diff]
python/google/protobuf/text_format.py[diff]
python/setup.py[diff]
src/Makefile.am[diff]
src/google/protobuf/compiler/code_generator.cc[diff]
src/google/protobuf/compiler/code_generator.h[diff]
src/google/protobuf/compiler/command_line_interface.cc[diff]
src/google/protobuf/compiler/command_line_interface.h[diff]
src/google/protobuf/compiler/command_line_interface_unittest.cc[diff]
src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc[diff]
src/google/protobuf/compiler/cpp/cpp_enum_field.cc[diff]
src/google/protobuf/compiler/cpp/cpp_file.cc[diff]
src/google/protobuf/compiler/cpp/cpp_generator.cc[diff]
src/google/protobuf/compiler/cpp/cpp_generator.h[diff]
src/google/protobuf/compiler/cpp/cpp_message.cc[diff]
src/google/protobuf/compiler/cpp/cpp_message_field.cc[diff]
src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc[diff]
src/google/protobuf/compiler/cpp/cpp_primitive_field.cc[diff]
src/google/protobuf/compiler/cpp/cpp_string_field.cc[diff]
src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto[diff]
src/google/protobuf/compiler/cpp/cpp_unittest.cc[diff]
src/google/protobuf/compiler/java/java_enum.cc[diff]
src/google/protobuf/compiler/java/java_enum_field.cc[diff]
src/google/protobuf/compiler/java/java_enum_field.h[diff]
src/google/protobuf/compiler/java/java_extension.cc[diff]
src/google/protobuf/compiler/java/java_extension.h[diff]
src/google/protobuf/compiler/java/java_field.cc[diff]
src/google/protobuf/compiler/java/java_field.h[diff]
src/google/protobuf/compiler/java/java_file.cc[diff]
src/google/protobuf/compiler/java/java_file.h[diff]
src/google/protobuf/compiler/java/java_generator.cc[diff]
src/google/protobuf/compiler/java/java_generator.h[diff]
src/google/protobuf/compiler/java/java_helpers.cc[diff]
src/google/protobuf/compiler/java/java_helpers.h[diff]
src/google/protobuf/compiler/java/java_message.cc[diff]
src/google/protobuf/compiler/java/java_message.h[diff]
src/google/protobuf/compiler/java/java_message_field.cc[diff]
src/google/protobuf/compiler/java/java_message_field.h[diff]
src/google/protobuf/compiler/java/java_plugin_unittest.cc[diff]
src/google/protobuf/compiler/java/java_primitive_field.cc[diff]
src/google/protobuf/compiler/java/java_primitive_field.h[diff]
src/google/protobuf/compiler/java/java_service.cc[diff]
src/google/protobuf/compiler/java/java_string_field.cc[Added - diff]
src/google/protobuf/compiler/java/java_string_field.h[Added - diff]
src/google/protobuf/compiler/mock_code_generator.cc[diff]
src/google/protobuf/compiler/mock_code_generator.h[diff]
src/google/protobuf/compiler/parser.cc[diff]
src/google/protobuf/compiler/parser.h[diff]
src/google/protobuf/compiler/parser_unittest.cc[diff]
src/google/protobuf/compiler/plugin.cc[diff]
src/google/protobuf/compiler/plugin.h[diff]
src/google/protobuf/compiler/plugin.pb.cc[diff]
src/google/protobuf/compiler/plugin.pb.h[diff]
src/google/protobuf/compiler/plugin.proto[diff]
src/google/protobuf/compiler/python/python_generator.cc[diff]
src/google/protobuf/compiler/python/python_generator.h[diff]
src/google/protobuf/compiler/python/python_plugin_unittest.cc[diff]
src/google/protobuf/compiler/subprocess.cc[diff]
src/google/protobuf/compiler/subprocess.h[diff]
src/google/protobuf/compiler/zip_output_unittest.sh[diff]
src/google/protobuf/compiler/zip_writer.cc[diff]
src/google/protobuf/compiler/zip_writer.h[diff]
src/google/protobuf/descriptor.cc[diff]
src/google/protobuf/descriptor.pb.cc[diff]
src/google/protobuf/descriptor.pb.h[diff]
src/google/protobuf/descriptor.proto[diff]
src/google/protobuf/descriptor_unittest.cc[diff]
src/google/protobuf/extension_set.cc[diff]
src/google/protobuf/extension_set.h[diff]
src/google/protobuf/generated_message_reflection.cc[diff]
src/google/protobuf/generated_message_util.cc[diff]
src/google/protobuf/generated_message_util.h[diff]
src/google/protobuf/io/coded_stream.cc[diff]
src/google/protobuf/io/coded_stream.h[diff]
src/google/protobuf/io/coded_stream_unittest.cc[diff]
src/google/protobuf/io/gzip_stream.cc[diff]
src/google/protobuf/io/printer.cc[diff]
src/google/protobuf/io/printer.h[diff]
src/google/protobuf/io/tokenizer.cc[diff]
src/google/protobuf/io/tokenizer.h[diff]
src/google/protobuf/io/tokenizer_unittest.cc[diff]
src/google/protobuf/io/zero_copy_stream_unittest.cc[diff]
src/google/protobuf/message.h[diff]
src/google/protobuf/repeated_field.cc[diff]
src/google/protobuf/repeated_field.h[diff]
src/google/protobuf/repeated_field_unittest.cc[diff]
src/google/protobuf/text_format.cc[diff]
src/google/protobuf/text_format.h[diff]
src/google/protobuf/text_format_unittest.cc[diff]
src/google/protobuf/unittest.proto[diff]
src/google/protobuf/unittest_custom_options.proto[diff]
src/google/protobuf/unittest_no_generic_services.proto[diff]
src/google/protobuf/wire_format_lite_inl.h[diff]

160 files changed

tree: 52def0850ddd2e976da238d1a437fbda79c96e44