Merge branch 'master' of https://github.com/zsurocking/protobuf

javanano/src/test/java/com/google/protobuf/nano/NanoTest.java

@@ -30,20 +30,20 @@
 
 package com.google.protobuf.nano;
 
-import com.google.protobuf.nano.MapTestProto.nano.TestMap;
+import com.google.protobuf.nano.MapTestProto.TestMap;
 import com.google.protobuf.nano.CodedOutputByteBufferNano;
-import com.google.protobuf.nano.MapTestProto.nano.TestMap.MessageValue;
+import com.google.protobuf.nano.MapTestProto.TestMap.MessageValue;
 import com.google.protobuf.nano.NanoAccessorsOuterClass.TestNanoAccessors;
 import com.google.protobuf.nano.NanoHasOuterClass.TestAllTypesNanoHas;
 import com.google.protobuf.nano.NanoOuterClass.TestAllTypesNano;
-import com.google.protobuf.nano.UnittestRecursiveNano.nano.RecursiveMessageNano;
+import com.google.protobuf.nano.UnittestRecursiveNano.RecursiveMessageNano;
 import com.google.protobuf.nano.NanoReferenceTypesCompat;
-import com.google.protobuf.nano.UnittestSimpleNano.nano.SimpleMessageNano;
-import com.google.protobuf.nano.UnittestSingleNano.nano.SingleMessageNano;
-import com.google.protobuf.nano.testext.Extensions;
-import com.google.protobuf.nano.testext.Extensions.AnotherMessage;
-import com.google.protobuf.nano.testext.Extensions.MessageWithGroup;
-import com.google.protobuf.nano.testimport.UnittestImportNano;
+import com.google.protobuf.nano.UnittestSimpleNano.SimpleMessageNano;
+import com.google.protobuf.nano.UnittestSingleNano.SingleMessageNano;
+import com.google.protobuf.nano.testext.nano.Extensions;
+import com.google.protobuf.nano.testext.nano.Extensions.AnotherMessage;
+import com.google.protobuf.nano.testext.nano.Extensions.MessageWithGroup;
+import com.google.protobuf.nano.testimport.nano.UnittestImportNano;
 
 import junit.framework.TestCase;
 

javanano/src/test/java/com/google/protobuf/nano/map_test.proto

@@ -32,7 +32,7 @@ syntax = "proto3";
 
 package map_test;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "MapTestProto";
 
 message TestMap {

javanano/src/test/java/com/google/protobuf/nano/unittest_accessors_nano.proto

@@ -32,7 +32,7 @@
 
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "NanoAccessorsOuterClass";
 
 message TestNanoAccessors {

javanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_multiple_nano.proto

@@ -32,7 +32,7 @@
 
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_multiple_files = true;
 
 enum FileScopeEnumMultiple {

javanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_nano.proto

@@ -32,7 +32,7 @@
 
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "EnumClassNanos";
 
 enum FileScopeEnum {

javanano/src/test/java/com/google/protobuf/nano/unittest_enum_validity_nano.proto

@@ -1,6 +1,6 @@
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "EnumValidity";
 
 enum E {

javanano/src/test/java/com/google/protobuf/nano/unittest_extension_packed_nano.proto

@@ -1,7 +1,7 @@
 syntax = "proto2";
 
 option java_multiple_files = true;
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 
 import "google/protobuf/nano/unittest_extension_nano.proto";
 

javanano/src/test/java/com/google/protobuf/nano/unittest_extension_repeated_nano.proto

@@ -1,7 +1,7 @@
 syntax = "proto2";
 
 option java_multiple_files = true;
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 
 import "google/protobuf/nano/unittest_extension_nano.proto";
 

javanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto

@@ -1,7 +1,7 @@
 syntax = "proto2";
 
 option java_multiple_files = true;
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 
 import "google/protobuf/nano/unittest_extension_nano.proto";
 

javanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto

@@ -32,7 +32,7 @@
 
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "NanoHasOuterClass";
 
 message TestAllTypesNanoHas {

javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto

@@ -32,7 +32,7 @@
 
 package protobuf_unittest_import;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "MultipleNameClashNano";
 option java_multiple_files = true;
 

javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nano.proto

@@ -34,7 +34,7 @@ package protobuf_unittest_import;
 
 import "google/protobuf/nano/unittest_import_nano.proto";
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_multiple_files = true;
 
 enum FileScopeEnum {

javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto

@@ -34,7 +34,7 @@ package protobuf_unittest;
 
 import "google/protobuf/nano/unittest_import_nano.proto";
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "NanoOuterClass";
 
 // Same as TestAllTypes but with the nano runtime.

javanano/src/test/java/com/google/protobuf/nano/unittest_recursive_nano.proto

@@ -33,7 +33,7 @@
 
 package protobuf_unittest_import;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 // Explicit outer classname to suppress legacy info.
 option java_outer_classname = "UnittestRecursiveNano";
 

javanano/src/test/java/com/google/protobuf/nano/unittest_reference_types_nano.proto

@@ -1,6 +1,6 @@
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "NanoReferenceTypes";
 
 message TestAllTypesNano {

javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto

@@ -34,7 +34,7 @@ package protobuf_unittest;
 
 import "google/protobuf/nano/unittest_nano.proto";
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_multiple_files = true;
 
 // A container message for testing the merging of repeated fields at a

javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_packables_nano.proto

@@ -32,7 +32,7 @@
 
 package protobuf_unittest;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 option java_outer_classname = "NanoRepeatedPackables";
 
 enum Enum {

javanano/src/test/java/com/google/protobuf/nano/unittest_simple_nano.proto

@@ -33,7 +33,7 @@
 
 package protobuf_unittest_import;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 // Explicit outer classname to suppress legacy info.
 option java_outer_classname = "UnittestSimpleNano";
 

javanano/src/test/java/com/google/protobuf/nano/unittest_single_nano.proto

@@ -32,7 +32,7 @@
 
 package protobuf_unittest_import;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 
 message SingleMessageNano {
 }

javanano/src/test/java/com/google/protobuf/nano/unittest_stringutf8_nano.proto

@@ -33,7 +33,7 @@
 
 package protobuf_unittest_import;
 
-option java_package = "com.google.protobuf.nano";
+option java_package = "com.google.protobuf";
 // Explicit outer classname to suppress legacy info.
 option java_outer_classname = "UnittestStringutf8Nano";