Generate a package name suffix ".nano" for nano messages

Also introducing an option javanano_use_deprecated_package to allow users to disable the suffix

1 files changed, 5 insertions, 5 deletions

diff --git a/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java b/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java
index 3a75777a..87deb00b 100644
--- a/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java
+++ b/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java
@@ -30,16 +30,16 @@
 
 package com.google.protobuf.nano;
 
-import com.google.protobuf.nano.MapTestProto.TestMap;
+import com.google.protobuf.nano.MapTestProto.nano.TestMap;
 import com.google.protobuf.nano.CodedOutputByteBufferNano;
-import com.google.protobuf.nano.MapTestProto.TestMap.MessageValue;
+import com.google.protobuf.nano.MapTestProto.nano.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.RecursiveMessageNano;
+import com.google.protobuf.nano.UnittestRecursiveNano.nano.RecursiveMessageNano;
 import com.google.protobuf.nano.NanoReferenceTypesCompat;
-import com.google.protobuf.nano.UnittestSimpleNano.SimpleMessageNano;
-import com.google.protobuf.nano.UnittestSingleNano.SingleMessageNano;
+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;