Rename java -> jvm, jet -> kotlin in module serialization.java

org.jetbrains.jet.descriptors.serialization ->
org.jetbrains.kotlin.serialization.jvm

compiler/tests/compiler-tests.iml

@@ -16,7 +16,7 @@
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="library" name="dx-android" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.java" />
+    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="builtins-serializer" />
     <orderEntry type="module" module-name="js.frontend" />

compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.descriptors.serialization.ClassData;
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil;
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
 import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
@@ -54,7 +54,7 @@ public class KotlinClassAnnotationTest extends CodegenTestCase {
 
         String[] data = (String[]) CodegenTestUtil.getAnnotationAttribute(kotlinClass, "data");
         assertNotNull(data);
-        ClassData classData = JavaProtoBufUtil.readClassDataFrom(data);
+        ClassData classData = JvmProtoBufUtil.readClassDataFrom(data);
 
         Set<String> callableNames = collectCallableNames(classData.getClassProto().getMemberList(), classData.getNameResolver());
         assertSameElements(Arrays.asList("foo", "bar"), callableNames);

compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil;
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
 import org.jetbrains.jet.descriptors.serialization.NameResolver;
 import org.jetbrains.jet.descriptors.serialization.PackageData;
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
@@ -60,7 +60,7 @@ public class KotlinPackageAnnotationTest extends CodegenTestCase {
 
         String[] data = (String[]) CodegenTestUtil.getAnnotationAttribute(kotlinPackage, "data");
         assertNotNull(data);
-        PackageData packageData = JavaProtoBufUtil.readPackageDataFrom(data);
+        PackageData packageData = JvmProtoBufUtil.readPackageDataFrom(data);
 
         Set<String> callableNames = collectCallableNames(packageData.getPackageProto().getMemberList(), packageData.getNameResolver());
         assertSameElements(callableNames, Arrays.asList("foo", "bar"));

compiler/tests/org/jetbrains/kotlin/serialization/jvm/BitEncodingTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.jvm;
 
 import com.intellij.testFramework.UsefulTestCase;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Random;
 
-import static org.jetbrains.jet.descriptors.serialization.BitEncoding.decodeBytes;
-import static org.jetbrains.jet.descriptors.serialization.BitEncoding.encodeBytes;
+import static org.jetbrains.kotlin.serialization.jvm.BitEncoding.decodeBytes;
+import static org.jetbrains.kotlin.serialization.jvm.BitEncoding.encodeBytes;
 import static org.junit.Assert.assertArrayEquals;
 
 public class BitEncodingTest extends UsefulTestCase {