Rename jet -> kotlin and regroup files in serialization

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

Deserialization goes to subpackage deserialization, built-ins-related stuff
goes to subpackage builtins

compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java

@@ -29,9 +29,9 @@ import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.kotlin.serialization.jvm.BitEncoding;
-import org.jetbrains.jet.descriptors.serialization.ClassData;
+import org.jetbrains.kotlin.serialization.ClassData;
-import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer;
+import org.jetbrains.kotlin.serialization.DescriptorSerializer;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
@@ -70,7 +70,7 @@ import java.util.*;
 import static org.jetbrains.kotlin.codegen.AsmUtil.*;
 import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.*;
 import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*;
-import static org.jetbrains.jet.descriptors.serialization.NameSerializationUtil.createNameResolver;
+import static org.jetbrains.kotlin.serialization.NameSerializationUtil.createNameResolver;
 import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.classDescriptorToDeclaration;
 import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration;
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*;

compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java

@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.codegen.context.CodegenContext;
 import org.jetbrains.kotlin.codegen.context.MethodContext;
 import org.jetbrains.kotlin.codegen.context.PackageContext;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.codeFragmentUtil.CodeFragmentUtilPackage;

compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java

@@ -19,12 +19,12 @@ package org.jetbrains.kotlin.codegen;
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.descriptors.serialization.NameResolver;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.SerializerExtension;
+import org.jetbrains.kotlin.serialization.SerializerExtension;
-import org.jetbrains.jet.descriptors.serialization.StringTable;
+import org.jetbrains.kotlin.serialization.StringTable;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPropertyDescriptor;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedSimpleFunctionDescriptor;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.kotlin.SignatureDeserializer;
 import org.jetbrains.jet.lang.resolve.name.FqName;

compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java

@@ -35,12 +35,12 @@ import org.jetbrains.kotlin.codegen.context.PackageContext;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.config.IncrementalCompilation;
 import org.jetbrains.kotlin.serialization.jvm.BitEncoding;
-import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer;
+import org.jetbrains.kotlin.serialization.DescriptorSerializer;
-import org.jetbrains.jet.descriptors.serialization.PackageData;
+import org.jetbrains.kotlin.serialization.PackageData;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPropertyDescriptor;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedSimpleFunctionDescriptor;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
@@ -66,7 +66,7 @@ import java.util.*;
 
 import static org.jetbrains.kotlin.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses;
 import static org.jetbrains.kotlin.codegen.AsmUtil.method;
-import static org.jetbrains.jet.descriptors.serialization.NameSerializationUtil.createNameResolver;
+import static org.jetbrains.kotlin.serialization.NameSerializationUtil.createNameResolver;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.K_PACKAGE_IMPL_TYPE;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType;
 import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassFqName;

compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java

@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.codegen.context.*;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPropertyDescriptor;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java

@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.codegen.context.MethodContext;
 import org.jetbrains.kotlin.codegen.context.PackageContext;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedSimpleFunctionDescriptor;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils;

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java

@@ -29,8 +29,8 @@ import org.jetbrains.kotlin.codegen.context.PackageContext;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedSimpleFunctionDescriptor;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils;

compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java

@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
 import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor;
 import org.jetbrains.kotlin.codegen.context.CodegenContext;
 import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;

compiler/builtins-serializer/src/BuiltInsSerializer.kt

@@ -20,7 +20,7 @@ import java.io.File
 import com.intellij.openapi.util.Disposer
 import org.jetbrains.jet.config.CompilerConfiguration
 import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment
-import org.jetbrains.jet.descriptors.serialization.*
+import org.jetbrains.kotlin.serialization.*
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.resolve.name.Name
 import java.io.ByteArrayOutputStream

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java

@@ -23,7 +23,7 @@ import com.intellij.util.PathUtil;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor;
 import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetFile;

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt

@@ -26,8 +26,8 @@ import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider
 import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl
 import org.jetbrains.jet.lang.resolve.scopes.JetScope
 import org.jetbrains.kotlin.storage.StorageManager
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
-import org.jetbrains.jet.descriptors.serialization.*
+import org.jetbrains.kotlin.serialization.*
 import org.jetbrains.kotlin.serialization.jvm.*
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver
 import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
@@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils
 import org.jetbrains.jet.lang.resolve.java.JvmClassName
 import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache
 import org.jetbrains.jet.lang.resolve.name.Name
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
 
 public class IncrementalPackageFragmentProvider(
         sourceFiles: Collection<JetFile>,

compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt

@@ -26,9 +26,9 @@ import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl
 import java.util.ArrayList
 import org.jetbrains.kotlin.utils.Printer
 import org.jetbrains.jet.lang.resolve.java.structure.JavaNamedElement
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.TypeDeserializer
+import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
 import org.jetbrains.jet.lang.types.JetType
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
 import java.util.HashMap

compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugBuiltInsProtoBuf.java

@@ -1,107 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization/src/builtins.debug.proto
-
-package org.jetbrains.jet.descriptors.serialization;
-
-public final class DebugBuiltInsProtoBuf {
-  private DebugBuiltInsProtoBuf() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registry.add(org.jetbrains.jet.descriptors.serialization.DebugBuiltInsProtoBuf.className);
-    registry.add(org.jetbrains.jet.descriptors.serialization.DebugBuiltInsProtoBuf.classAnnotation);
-    registry.add(org.jetbrains.jet.descriptors.serialization.DebugBuiltInsProtoBuf.callableAnnotation);
-    registry.add(org.jetbrains.jet.descriptors.serialization.DebugBuiltInsProtoBuf.parameterAnnotation);
-  }
-  public static final int CLASS_NAME_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Package { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package,
-      java.util.List<java.lang.Integer>> className = com.google.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        java.lang.Integer.class,
-        null);
-  public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Class { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class,
-      java.util.List<org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation>> classAnnotation = com.google.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int CALLABLE_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable,
-      java.util.List<org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation>> callableAnnotation = com.google.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter,
-      java.util.List<org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation>> parameterAnnotation = com.google.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n+core/serialization/src/builtins.debug." +
-      "proto\022+org.jetbrains.jet.descriptors.ser" +
-      "ialization\032.core/serialization/src/descr" +
-      "iptors.debug.proto:M\n\nclass_name\0224.org.j" +
-      "etbrains.jet.descriptors.serialization.P" +
-      "ackage\030\226\001 \003(\005B\002\020\001:\206\001\n\020class_annotation\0222" +
-      ".org.jetbrains.jet.descriptors.serializa" +
-      "tion.Class\030\226\001 \003(\01327.org.jetbrains.jet.de" +
-      "scriptors.serialization.Annotation:\214\001\n\023c" +
-      "allable_annotation\0225.org.jetbrains.jet.d",
-      "escriptors.serialization.Callable\030\226\001 \003(\013" +
-      "27.org.jetbrains.jet.descriptors.seriali" +
-      "zation.Annotation:\234\001\n\024parameter_annotati" +
-      "on\022D.org.jetbrains.jet.descriptors.seria" +
-      "lization.Callable.ValueParameter\030\226\001 \003(\0132" +
-      "7.org.jetbrains.jet.descriptors.serializ" +
-      "ation.AnnotationB\027B\025DebugBuiltInsProtoBu" +
-      "f"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-        public com.google.protobuf.ExtensionRegistry assignDescriptors(
-            com.google.protobuf.Descriptors.FileDescriptor root) {
-          descriptor = root;
-          className.internalInit(descriptor.getExtensions().get(0));
-          classAnnotation.internalInit(descriptor.getExtensions().get(1));
-          callableAnnotation.internalInit(descriptor.getExtensions().get(2));
-          parameterAnnotation.internalInit(descriptor.getExtensions().get(3));
-          return null;
-        }
-      };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.getDescriptor(),
-        }, assigner);
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}

compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java

@@ -29,7 +29,7 @@ import org.jetbrains.jet.TestJdkKind;
 import org.jetbrains.jet.analyzer.AnalysisResult;
 import org.jetbrains.jet.config.CommonConfigurationKeys;
 import org.jetbrains.jet.config.CompilerConfiguration;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedClassDescriptor;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor;

compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt

@@ -17,10 +17,10 @@
 package org.jetbrains.jet.jvm.compiler
 
 import org.jetbrains.jet.lang.resolve.scopes.JetScope
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedMemberScope
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberScope
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import java.util.Collections
-import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer
+import org.jetbrains.kotlin.serialization.DescriptorSerializer
 import com.intellij.testFramework.UsefulTestCase
 import java.util.ArrayList
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor

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

@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.descriptors.serialization.ClassData;
+import org.jetbrains.kotlin.serialization.ClassData;
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
 import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames;
 import org.jetbrains.jet.lang.resolve.name.FqName;

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

@@ -19,9 +19,9 @@ package org.jetbrains.kotlin.codegen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
-import org.jetbrains.jet.descriptors.serialization.NameResolver;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
-import org.jetbrains.jet.descriptors.serialization.PackageData;
+import org.jetbrains.kotlin.serialization.PackageData;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
 import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;

compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,19 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.builtins
 
-import java.io.File
-import org.jetbrains.kotlin.serialization.builtins.BuiltInsSerializer
 import org.jetbrains.jet.test.TestCaseWithTmpdir
-import org.jetbrains.jet.lang.types.lang.BuiltinsPackageFragment
+import java.io.File
-import org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME
-import org.jetbrains.kotlin.storage.LockBasedStorageManager
-import org.jetbrains.jet.JetTestUtils
-import java.io.FileInputStream
-import org.jetbrains.jet.test.util.RecursiveDescriptorComparator
-import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
+import org.jetbrains.jet.JetTestUtils
+import org.jetbrains.kotlin.storage.LockBasedStorageManager
+import java.io.FileInputStream
+import org.jetbrains.jet.lang.types.lang.BuiltinsPackageFragment
+import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
+import org.jetbrains.jet.test.util.RecursiveDescriptorComparator
+import org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME
 
 public class BuiltInsSerializerTest : TestCaseWithTmpdir() {
     private fun doTest(fileName: String) {

compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java

@@ -0,0 +1,105 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: core/serialization/src/builtins.debug.proto
+
+package org.jetbrains.kotlin.serialization.builtins;
+
+public final class DebugBuiltInsProtoBuf {
+  private DebugBuiltInsProtoBuf() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.className);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.classAnnotation);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.callableAnnotation);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.parameterAnnotation);
+  }
+  public static final int CLASS_NAME_FIELD_NUMBER = 150;
+  /**
+   * <code>extend .org.jetbrains.kotlin.serialization.Package { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Package,
+      java.util.List<java.lang.Integer>> className = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Integer.class,
+        null);
+  public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * <code>extend .org.jetbrains.kotlin.serialization.Class { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Class,
+      java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation>> classAnnotation = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+  public static final int CALLABLE_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
+      java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation>> callableAnnotation = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+  public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter,
+      java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation>> parameterAnnotation = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n+core/serialization/src/builtins.debug." +
+      "proto\022+org.jetbrains.kotlin.serializatio" +
+      "n.builtins\032.core/serialization/src/descr" +
+      "iptors.debug.proto:D\n\nclass_name\022+.org.j" +
+      "etbrains.kotlin.serialization.Package\030\226\001" +
+      " \003(\005B\002\020\001:t\n\020class_annotation\022).org.jetbr" +
+      "ains.kotlin.serialization.Class\030\226\001 \003(\0132." +
+      ".org.jetbrains.kotlin.serialization.Anno" +
+      "tation:z\n\023callable_annotation\022,.org.jetb" +
+      "rains.kotlin.serialization.Callable\030\226\001 \003",
+      "(\0132..org.jetbrains.kotlin.serialization." +
+      "Annotation:\212\001\n\024parameter_annotation\022;.or" +
+      "g.jetbrains.kotlin.serialization.Callabl" +
+      "e.ValueParameter\030\226\001 \003(\0132..org.jetbrains." +
+      "kotlin.serialization.AnnotationB\027B\025Debug" +
+      "BuiltInsProtoBuf"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
+        public com.google.protobuf.ExtensionRegistry assignDescriptors(
+            com.google.protobuf.Descriptors.FileDescriptor root) {
+          descriptor = root;
+          className.internalInit(descriptor.getExtensions().get(0));
+          classAnnotation.internalInit(descriptor.getExtensions().get(1));
+          callableAnnotation.internalInit(descriptor.getExtensions().get(2));
+          parameterAnnotation.internalInit(descriptor.getExtensions().get(3));
+          return null;
+        }
+      };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
+        }, assigner);
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.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,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.builtins;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.containers.ContainerUtil;

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

@@ -3723,44 +3723,44 @@ public final class DebugJvmProtoBuf {
 
   public static final int METHOD_SIGNATURE_FIELD_NUMBER = 100;
   /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
    */
   public static final
     com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable,
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
       org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature> methodSignature = com.google.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.class,
         org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance());
   public static final int PROPERTY_SIGNATURE_FIELD_NUMBER = 101;
   /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
    */
   public static final
     com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable,
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
       org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature> propertySignature = com.google.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.class,
         org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.getDefaultInstance());
   public static final int IMPL_CLASS_NAME_FIELD_NUMBER = 102;
   /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
    */
   public static final
     com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable,
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
       java.lang.Integer> implClassName = com.google.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
   public static final int INDEX_FIELD_NUMBER = 100;
   /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter { ... }</code>
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }</code>
    */
   public static final
     com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter,
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter,
       java.lang.Integer> index = com.google.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
@@ -3820,19 +3820,18 @@ public final class DebugJvmProtoBuf {
       "(\0132:.org.jetbrains.kotlin.serialization." +
       "jvm.JvmMethodSignature\022J\n\006setter\030\004 \001(\0132:" +
       ".org.jetbrains.kotlin.serialization.jvm." +
-      "JvmMethodSignature:\213\001\n\020method_signature\022" +
+      "JvmMethodSignature:\202\001\n\020method_signature\022" +
-      "5.org.jetbrains.jet.descriptors.serializ" +
+      ",.org.jetbrains.kotlin.serialization.Cal" +
-      "ation.Callable\030d \001(\0132:.org.jetbrains.kot" +
+      "lable\030d \001(\0132:.org.jetbrains.kotlin.seria" +
-      "lin.serialization.jvm.JvmMethodSignature",
+      "lization.jvm.JvmMethodSignature:\206\001\n\022prop",
-      ":\217\001\n\022property_signature\0225.org.jetbrains." +
+      "erty_signature\022,.org.jetbrains.kotlin.se" +
-      "jet.descriptors.serialization.Callable\030e" +
+      "rialization.Callable\030e \001(\0132<.org.jetbrai" +
-      " \001(\0132<.org.jetbrains.kotlin.serializatio" +
+      "ns.kotlin.serialization.jvm.JvmPropertyS" +
-      "n.jvm.JvmPropertySignature:N\n\017impl_class" +
+      "ignature:E\n\017impl_class_name\022,.org.jetbra" +
-      "_name\0225.org.jetbrains.jet.descriptors.se" +
+      "ins.kotlin.serialization.Callable\030f \001(\005:" +
-      "rialization.Callable\030f \001(\005:S\n\005index\022D.or" +
+      "J\n\005index\022;.org.jetbrains.kotlin.serializ" +
-      "g.jetbrains.jet.descriptors.serializatio" +
+      "ation.Callable.ValueParameter\030d \001(\005B\022B\020D" +
-      "n.Callable.ValueParameter\030d \001(\005B\022B\020Debug" +
+      "ebugJvmProtoBuf"
-      "JvmProtoBuf"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -3873,7 +3872,7 @@ public final class DebugJvmProtoBuf {
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.getDescriptor(),
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
         }, assigner);
   }
 

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt

@@ -18,18 +18,18 @@ package org.jetbrains.jet.lang.resolve.kotlin
 
 import org.jetbrains.jet.lang.resolve.name.ClassId
 import java.util.ArrayList
-import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotatedCallableKind
+import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.*
-import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter
 import org.jetbrains.jet.lang.resolve.name.FqName
 import java.util.HashMap
 import org.jetbrains.jet.lang.resolve.name.Name
-import org.jetbrains.jet.descriptors.serialization.Flags
+import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationAndConstantLoader
+import org.jetbrains.kotlin.serialization.deserialization.AnnotationAndConstantLoader
 import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames
 
 public abstract class AbstractBinaryClassAnnotationAndConstantLoader<A : Any, C : Any>(

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt

@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.constants.EnumValue
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptorImpl
 import org.jetbrains.jet.lang.resolve.constants.ErrorValue
 import org.jetbrains.jet.lang.resolve.constants.createCompileTimeConstant
-import org.jetbrains.jet.descriptors.serialization.findClassAcrossModuleDependencies
+import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant
 
 public class BinaryClassAnnotationAndConstantLoaderImpl(

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt

@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.kotlin
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
 
 // This class is needed only for easier injection: exact types of needed components are specified in the constructor here.
 // Otherwise injector generator is not smart enough to deduce, for example, which package fragment provider DeserializationComponents needs

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java

@@ -20,9 +20,9 @@ import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
-import org.jetbrains.jet.descriptors.serialization.PackageData;
+import org.jetbrains.kotlin.serialization.PackageData;
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents;
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter;

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaClassDataFinder.kt

@@ -17,8 +17,8 @@
 package org.jetbrains.jet.lang.resolve.kotlin
 
 import org.jetbrains.jet.lang.resolve.name.ClassId
-import org.jetbrains.jet.descriptors.serialization.ClassDataFinder
+import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
-import org.jetbrains.jet.descriptors.serialization.ClassData
+import org.jetbrains.kotlin.serialization.ClassData
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader
 

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.lang.resolve.kotlin
 
-import org.jetbrains.jet.descriptors.serialization.FlexibleTypeCapabilitiesDeserializer
+import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeResolver
 import org.jetbrains.jet.lang.types.FlexibleTypeCapabilities
@@ -29,4 +29,4 @@ object JavaFlexibleTypeCapabilitiesDeserializer : FlexibleTypeCapabilitiesDeseri
                else null
     }
 
-}
+}

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java

@@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.kotlin;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.NameResolver;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 

core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsAnnotationAndConstantLoader.kt

@@ -16,11 +16,12 @@
 
 package org.jetbrains.jet.lang.types.lang
 
-import org.jetbrains.jet.descriptors.serialization.*
+import org.jetbrains.kotlin.serialization.*
-import org.jetbrains.jet.descriptors.serialization.descriptors.*
+import org.jetbrains.kotlin.serialization.deserialization.*
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
+import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf
 
 class BuiltInsAnnotationAndConstantLoader(
         module: ModuleDescriptor

core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt

@@ -16,8 +16,7 @@
 
 package org.jetbrains.jet.lang.types.lang
 
-import org.jetbrains.jet.descriptors.serialization.*
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
 import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider
 import org.jetbrains.jet.lang.descriptors.PackageFragmentProviderImpl
@@ -25,8 +24,14 @@ import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl
 import org.jetbrains.jet.lang.resolve.name.*
 import org.jetbrains.kotlin.storage.StorageManager
 import java.io.InputStream
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
 import com.google.protobuf.ExtensionRegistryLite
+import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
+import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer
+import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf
+import org.jetbrains.kotlin.serialization.NameSerializationUtil
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ClassData
 
 public class BuiltinsPackageFragment(
         fqName: FqName,

core/serialization.jvm/src/jvm_descriptors.proto

@@ -69,7 +69,7 @@ message JvmPropertySignature {
   optional JvmMethodSignature setter = 4;
 }
 
-extend org.jetbrains.jet.descriptors.serialization.Callable {
+extend org.jetbrains.kotlin.serialization.Callable {
   optional JvmMethodSignature method_signature = 100;
 
   optional JvmPropertySignature property_signature = 101;
@@ -82,7 +82,7 @@ extend org.jetbrains.jet.descriptors.serialization.Callable {
   optional int32 impl_class_name = 102;
 }
 
-extend org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter {
+extend org.jetbrains.kotlin.serialization.Callable.ValueParameter {
   // Index of the corresponding parameter of this method in JVM (counting receiver parameters, enum constructor synthetic parameters, etc.)
   optional int32 index = 100;
 }

core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java

@@ -2798,14 +2798,14 @@ public final class JvmProtoBuf {
 
   public static final int METHOD_SIGNATURE_FIELD_NUMBER = 100;
   /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
    */
   public static final
     com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
       org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature> methodSignature = com.google.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
         org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
         org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
         null,
@@ -2813,14 +2813,14 @@ public final class JvmProtoBuf {
         com.google.protobuf.WireFormat.FieldType.MESSAGE);
   public static final int PROPERTY_SIGNATURE_FIELD_NUMBER = 101;
   /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
    */
   public static final
     com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
       org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature> propertySignature = com.google.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
         org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
         org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
         null,
@@ -2828,14 +2828,14 @@ public final class JvmProtoBuf {
         com.google.protobuf.WireFormat.FieldType.MESSAGE);
   public static final int IMPL_CLASS_NAME_FIELD_NUMBER = 102;
   /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
    */
   public static final
     com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
       java.lang.Integer> implClassName = com.google.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
         0,
         null,
         null,
@@ -2843,14 +2843,14 @@ public final class JvmProtoBuf {
         com.google.protobuf.WireFormat.FieldType.INT32);
   public static final int INDEX_FIELD_NUMBER = 100;
   /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter { ... }</code>
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }</code>
    */
   public static final
     com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter,
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter,
       java.lang.Integer> index = com.google.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
         0,
         null,
         null,

core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.java

@@ -18,8 +18,8 @@ package org.jetbrains.kotlin.serialization.jvm;
 
 import com.google.protobuf.ExtensionRegistryLite;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.descriptors.serialization.ClassData;
+import org.jetbrains.kotlin.serialization.ClassData;
-import org.jetbrains.jet.descriptors.serialization.PackageData;
+import org.jetbrains.kotlin.serialization.PackageData;
 
 public class JvmProtoBufUtil {
     private JvmProtoBufUtil() {

core/serialization/src/builtins.proto

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.builtins;
 
 import "core/serialization/src/descriptors.proto";
 

core/serialization/src/descriptors.proto

@@ -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,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 option java_outer_classname = "ProtoBuf";
 option optimize_for = LITE_RUNTIME; // Smaller runtime

core/serialization/src/org/jetbrains/jet/descriptors/serialization/BuiltInsProtoBuf.java

@@ -1,80 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization/src/builtins.proto
-
-package org.jetbrains.jet.descriptors.serialization;
-
-public final class BuiltInsProtoBuf {
-  private BuiltInsProtoBuf() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-    registry.add(org.jetbrains.jet.descriptors.serialization.BuiltInsProtoBuf.className);
-    registry.add(org.jetbrains.jet.descriptors.serialization.BuiltInsProtoBuf.classAnnotation);
-    registry.add(org.jetbrains.jet.descriptors.serialization.BuiltInsProtoBuf.callableAnnotation);
-    registry.add(org.jetbrains.jet.descriptors.serialization.BuiltInsProtoBuf.parameterAnnotation);
-  }
-  public static final int CLASS_NAME_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Package { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package,
-      java.util.List<java.lang.Integer>> className = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package.getDefaultInstance(),
-        null,
-        null,
-        150,
-        com.google.protobuf.WireFormat.FieldType.INT32,
-        true);
-  public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Class { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class,
-      java.util.List<org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation>> classAnnotation = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.getDefaultInstance(),
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
-  public static final int CALLABLE_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
-      java.util.List<org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation>> callableAnnotation = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
-  public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter,
-      java.util.List<org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation>> parameterAnnotation = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
-
-  static {
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}

core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization
 
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor
 import org.jetbrains.jet.lang.resolve.constants.*
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type
 import org.jetbrains.jet.lang.types.JetType
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 

core/serialization/src/org/jetbrains/kotlin/serialization/ClassData.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,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import com.google.protobuf.ExtensionRegistryLite;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
 import java.io.ByteArrayInputStream;

core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.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,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.*;

core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import com.google.protobuf.Internal;
 import org.jetbrains.annotations.NotNull;

core/serialization/src/org/jetbrains/kotlin/serialization/Interner.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,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import gnu.trove.TObjectHashingStrategy;
 import gnu.trove.TObjectIntHashMap;

core/serialization/src/org/jetbrains/kotlin/serialization/NameSerializationUtil.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,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
 import java.io.IOException;

core/serialization/src/org/jetbrains/kotlin/serialization/PackageData.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,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import com.google.protobuf.ExtensionRegistryLite;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
 import java.io.ByteArrayInputStream;

core/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.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,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor;

core/serialization/src/org/jetbrains/kotlin/serialization/StringTable.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,17 +14,20 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import gnu.trove.TObjectHashingStrategy;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.ClassOrPackageFragmentDescriptor;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
 import java.util.List;
 
-import static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName;
+import static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName;
 
 public class StringTable {
     public static final TObjectHashingStrategy<QualifiedName.Builder> QUALIFIED_NAME_BUILDER_HASHING =

core/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java

@@ -0,0 +1,80 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: core/serialization/src/builtins.proto
+
+package org.jetbrains.kotlin.serialization.builtins;
+
+public final class BuiltInsProtoBuf {
+  private BuiltInsProtoBuf() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.className);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.classAnnotation);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.callableAnnotation);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.parameterAnnotation);
+  }
+  public static final int CLASS_NAME_FIELD_NUMBER = 150;
+  /**
+   * <code>extend .org.jetbrains.kotlin.serialization.Package { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.ProtoBuf.Package,
+      java.util.List<java.lang.Integer>> className = com.google.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(),
+        null,
+        null,
+        150,
+        com.google.protobuf.WireFormat.FieldType.INT32,
+        true);
+  public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * <code>extend .org.jetbrains.kotlin.serialization.Class { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.ProtoBuf.Class,
+      java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Annotation>> classAnnotation = com.google.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        com.google.protobuf.WireFormat.FieldType.MESSAGE,
+        false);
+  public static final int CALLABLE_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
+      java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Annotation>> callableAnnotation = com.google.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        com.google.protobuf.WireFormat.FieldType.MESSAGE,
+        false);
+  public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter,
+      java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Annotation>> parameterAnnotation = com.google.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        com.google.protobuf.WireFormat.FieldType.MESSAGE,
+        false);
+
+  static {
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotatedCallableKind.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors;
+package org.jetbrains.kotlin.serialization.deserialization;
 
 public enum AnnotatedCallableKind {
     FUNCTION,

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.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,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors;
+package org.jetbrains.kotlin.serialization.deserialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.descriptors.serialization.NameResolver;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
 
 import java.util.List;
 

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptorImpl
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.resolve.constants.*
@@ -33,6 +33,7 @@ import org.jetbrains.jet.lang.resolve.name.ClassId
 import org.jetbrains.jet.lang.types.ErrorUtils
 import org.jetbrains.jet.lang.descriptors.ClassKind
 import org.jetbrains.jet.lang.types.Variance
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 
 public class AnnotationDeserializer(private val module: ModuleDescriptor) {
     private val builtIns: KotlinBuiltIns
@@ -64,7 +65,7 @@ public class AnnotationDeserializer(private val module: ModuleDescriptor) {
 
     private fun resolveValue(
             expectedType: JetType,
-            value: ProtoBuf.Annotation.Argument.Value,
+            value: Value,
             nameResolver: NameResolver
     ): CompileTimeConstant<*> {
         val result = when (value.getType()) {

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.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,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.deserialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.resolve.name.ClassId;
+import org.jetbrains.kotlin.serialization.ClassData;
 
 public interface ClassDataFinder {
     @Nullable

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedClassDescriptor
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
 import org.jetbrains.jet.lang.resolve.name.ClassId
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
+import org.jetbrains.kotlin.serialization.ClassData
 
 public class ClassDeserializer(private val components: DeserializationComponents) {
     private val classes: (ClassKey) -> DeserializedClassDescriptor? =

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.lang.types.FlexibleTypeCapabilities
 
 trait FlexibleTypeCapabilitiesDeserializer {
@@ -27,4 +26,4 @@ trait FlexibleTypeCapabilitiesDeserializer {
     }
 
     fun capabilitiesById(id: String): FlexibleTypeCapabilities?
-}
+}

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,17 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.*
+import org.jetbrains.kotlin.serialization.*
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.*
-import org.jetbrains.jet.descriptors.serialization.descriptors.*
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations
 import org.jetbrains.jet.lang.descriptors.impl.*
 import org.jetbrains.jet.lang.resolve.DescriptorFactory
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind.*
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind.*
 
 public class MemberDeserializer(private val c: DeserializationContext) {
     public fun loadCallable(proto: Callable): CallableMemberDescriptor {

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.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,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.deserialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -22,8 +22,9 @@ import org.jetbrains.jet.lang.resolve.name.ClassId;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
 import org.jetbrains.jet.lang.resolve.name.Name;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
 
-import static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName;
+import static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName;
 
 public class NameResolver {
     private final ProtoBuf.StringTable strings;

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization
 
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.resolve.name.FqName
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
-import org.jetbrains.jet.descriptors.serialization.NameResolver
 import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe
 
 public data class ProtoContainer(val classProto: ProtoBuf.Class?, val packageFqName: FqName?) {

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedTypeParameterDescriptor
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedTypeParameterDescriptor
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor
 import org.jetbrains.jet.lang.types.*
 import org.jetbrains.kotlin.utils.*
-
 import java.util.LinkedHashMap
 
 public class TypeDeserializer(

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.context
+package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.storage.StorageManager
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.*
-import org.jetbrains.jet.descriptors.serialization.*
-import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationAndConstantLoader
 import org.jetbrains.jet.lang.resolve.name.ClassId
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
 import org.jetbrains.kotlin.utils.toReadOnlyList
 import org.jetbrains.kotlin.storage.StorageManager

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor
 
 public trait DeserializedCallableMemberDescriptor: CallableMemberDescriptor {
     public val proto: ProtoBuf.Callable
     public val nameResolver: NameResolver
-}
+}

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
-import org.jetbrains.jet.descriptors.serialization.Flags
+import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.context.*
+import org.jetbrains.kotlin.serialization.deserialization.*
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations
 import org.jetbrains.jet.lang.descriptors.impl.AbstractClassDescriptor
@@ -29,14 +29,12 @@ import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.resolve.scopes.StaticScopeForKotlinClass
 import org.jetbrains.jet.lang.types.AbstractClassTypeConstructor
 import org.jetbrains.jet.lang.types.JetType
-import org.jetbrains.jet.descriptors.serialization
+import org.jetbrains.kotlin.serialization.deserialization
 import org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName
-import org.jetbrains.jet.descriptors.serialization.classKind
 import org.jetbrains.kotlin.utils.addIfNotNull
 import org.jetbrains.jet.lang.resolve.scopes.JetScope
 import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter
 import java.util.*
-import org.jetbrains.jet.descriptors.serialization.NameResolver
 
 public class DeserializedClassDescriptor(
         outerContext: DeserializationContext,
@@ -46,9 +44,9 @@ public class DeserializedClassDescriptor(
         outerContext.storageManager,
         nameResolver.getClassId(classProto.getFqName()).getRelativeClassName().shortName()
 ) {
-    private val modality = serialization.modality(Flags.MODALITY.get(classProto.getFlags()))
+    private val modality = deserialization.modality(Flags.MODALITY.get(classProto.getFlags()))
-    private val visibility = serialization.visibility(Flags.VISIBILITY.get(classProto.getFlags()))
+    private val visibility = deserialization.visibility(Flags.VISIBILITY.get(classProto.getFlags()))
-    private val kind = classKind(Flags.CLASS_KIND.get(classProto.getFlags()))
+    private val kind = deserialization.classKind(Flags.CLASS_KIND.get(classProto.getFlags()))
     private val isInner = Flags.INNER.get(classProto.getFlags())
 
     val c = outerContext.childContext(this, classProto.getTypeParameterList(), nameResolver)

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
-import org.jetbrains.jet.descriptors.serialization.Flags
+import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.resolve.scopes.JetScope
 import org.jetbrains.kotlin.utils.Printer
 import org.jetbrains.kotlin.utils.toReadOnlyList
 import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
 import java.util.*
 
 public abstract class DeserializedMemberScope protected(

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor
 import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.name.ClassId
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.kotlin.utils.addIfNotNull
 import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 
 public open class DeserializedPackageMemberScope(
         packageDescriptor: PackageFragmentDescriptor,

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
@@ -22,9 +22,9 @@ import org.jetbrains.jet.lang.descriptors.Modality
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations
 import org.jetbrains.jet.lang.descriptors.Visibility
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind
 import org.jetbrains.jet.lang.descriptors.SourceElement
 
@@ -52,4 +52,4 @@ public class DeserializedPropertyDescriptor(
         return DeserializedPropertyDescriptor(
                 newOwner, original, getAnnotations(), newModality, newVisibility, isVar(), getName(), kind, proto, nameResolver)
     }
-}
+}

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.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,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors;
+package org.jetbrains.kotlin.serialization.deserialization.descriptors;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.descriptors.serialization.Flags;
+import org.jetbrains.kotlin.serialization.Flags;
-import org.jetbrains.jet.descriptors.serialization.NameResolver;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.SerializationPackage;
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationPackage;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
@@ -98,7 +98,7 @@ public class DeserializedSimpleFunctionDescriptor extends SimpleFunctionDescript
                 null,
                 annotations,
                 nameResolver.getName(proto.getName()),
-                SerializationPackage.memberKind(Flags.MEMBER_KIND.get(proto.getFlags())),
+                DeserializationPackage.memberKind(Flags.MEMBER_KIND.get(proto.getFlags())),
                 proto,
                 nameResolver
         );

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.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,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors;
+package org.jetbrains.kotlin.serialization.deserialization.descriptors;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.SerializationPackage;
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationPackage;
-import org.jetbrains.jet.descriptors.serialization.TypeDeserializer;
+import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer;
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext;
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext;
 import org.jetbrains.jet.lang.descriptors.SourceElement;
 import org.jetbrains.jet.lang.descriptors.impl.AbstractLazyTypeParameterDescriptor;
 import org.jetbrains.jet.lang.types.JetType;
@@ -38,7 +38,7 @@ public class DeserializedTypeParameterDescriptor extends AbstractLazyTypeParamet
         super(c.getStorageManager(),
               c.getContainingDeclaration(),
               c.getNameResolver().getName(proto.getName()),
-              SerializationPackage.variance(proto.getVariance()),
+              DeserializationPackage.variance(proto.getVariance()),
               proto.getReified(),
               index,
               SourceElement.NO_SOURCE);

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.resolve.name.Name
@@ -40,4 +40,4 @@ public fun ModuleDescriptor.findClassAcrossModuleDependencies(classId: ClassId):
         result = findInnerClass(result, name) ?: return null
     }
     return result
-}
+}

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor
 import org.jetbrains.jet.lang.descriptors.Modality
 import org.jetbrains.jet.lang.descriptors.Visibilities
 import org.jetbrains.jet.lang.descriptors.ClassKind
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter
+import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter
 import org.jetbrains.jet.lang.types.Variance
 
-fun memberKind(memberKind: Callable.MemberKind) = when (memberKind) {
+fun memberKind(memberKind: ProtoBuf.Callable.MemberKind) = when (memberKind) {
     ProtoBuf.Callable.MemberKind.DECLARATION -> CallableMemberDescriptor.Kind.DECLARATION
     ProtoBuf.Callable.MemberKind.FAKE_OVERRIDE -> CallableMemberDescriptor.Kind.FAKE_OVERRIDE
     ProtoBuf.Callable.MemberKind.DELEGATION -> CallableMemberDescriptor.Kind.DELEGATION

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt

@@ -18,16 +18,16 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder
 
 import com.intellij.psi.stubs.StubElement
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.Flags
+import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Modality
+import org.jetbrains.kotlin.serialization.ProtoBuf.Modality
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFunctionStubImpl
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPropertyStubImpl
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
-import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.MemberKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.MemberKind
 import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.jet.plugin.decompiler.stubBuilder.FlagsToModifiers.*
 
 fun createCallableStub(

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt

@@ -17,8 +17,8 @@
 package org.jetbrains.jet.plugin.decompiler.stubBuilder
 
 import com.intellij.psi.stubs.StubElement
-import org.jetbrains.jet.descriptors.serialization.Flags
+import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.psi.stubs.elements.JetClassElementType
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinClassStubImpl
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinObjectStubImpl
@@ -33,10 +33,10 @@ import org.jetbrains.jet.lang.psi.JetDelegatorToSuperClass
 import org.jetbrains.jet.lexer.JetTokens
 import org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName
 import org.jetbrains.jet.lang.psi.JetClassObject
-import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
 import org.jetbrains.jet.lexer.JetModifierKeywordToken
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type
+import org.jetbrains.kotlin.serialization.ProtoBuf.Type
 import org.jetbrains.jet.plugin.decompiler.stubBuilder.FlagsToModifiers.*
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 
@@ -230,4 +230,4 @@ private class ClassClsStubBuilder(
         val classData = c.components.classDataFinder.findClassData(nestedClassId)!!
         createClassStub(classBody, classData.getClassProto(), nestedClassId, c.child(classData.getNameResolver()))
     }
-}
+}

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt

@@ -16,11 +16,11 @@
 
 package org.jetbrains.jet.plugin.decompiler.stubBuilder
 
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.resolve.name.FqName
-import org.jetbrains.jet.descriptors.serialization.ClassDataFinder
+import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder
 import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter
 import org.jetbrains.jet.lang.resolve.kotlin.AbstractBinaryClassAnnotationAndConstantLoader

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt

@@ -17,7 +17,7 @@
 package org.jetbrains.jet.plugin.decompiler.stubBuilder
 
 import com.intellij.psi.stubs.StubElement
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.resolve.name.FqName
 import com.intellij.psi.PsiElement
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl
@@ -37,20 +37,20 @@ import org.jetbrains.jet.lang.psi.JetFunctionType
 import org.jetbrains.jet.lang.psi.JetFunctionTypeReceiver
 import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
 import org.jetbrains.jet.lang.psi.JetTypeParameterList
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type
+import org.jetbrains.kotlin.serialization.ProtoBuf.Type
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeParameterStubImpl
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance
+import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance
 import org.jetbrains.jet.lang.psi.JetTypeConstraintList
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeConstraintStubImpl
 import org.jetbrains.jet.lang.resolve.name.ClassId
 import java.util.ArrayList
-import org.jetbrains.jet.descriptors.serialization.Flags
+import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
 import org.jetbrains.jet.lang.psi.stubs.impl.ModifierMaskUtils
-import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection
+import org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection
 import org.jetbrains.jet.lang.psi.JetProjectionKind
 
 class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt

@@ -16,7 +16,6 @@
 
 package org.jetbrains.jet.plugin.decompiler.stubBuilder
 
-
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFileStubImpl
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl
@@ -31,19 +30,19 @@ import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub
 import org.jetbrains.jet.lang.resolve.name.SpecialNames
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinUserTypeStubImpl
 import org.jetbrains.jet.lexer.JetModifierKeywordToken
-import org.jetbrains.jet.descriptors.serialization.Flags
+import org.jetbrains.kotlin.serialization.Flags
 import org.jetbrains.jet.lexer.JetTokens
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
 import org.jetbrains.jet.lang.psi.stubs.impl.ModifierMaskUtils
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import com.intellij.util.io.StringRef
-import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinAnnotationEntryStubImpl
 import org.jetbrains.jet.lang.psi.JetConstructorCalleeExpression
 import org.jetbrains.jet.lang.psi.JetTypeReference
 import org.jetbrains.jet.lang.resolve.name.Name
-import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotatedCallableKind
+import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
 import java.util.ArrayList
 
 fun createTopLevelClassStub(classId: ClassId, classProto: ProtoBuf.Class, context: ClsStubBuilderContext): KotlinFileStubImpl {
@@ -231,4 +230,4 @@ fun sortCallableStubs(unordered: List<ProtoBuf.Callable>): List<ProtoBuf.Callabl
     result.addAll(nonExtensionFunctions)
     result.addAll(extensionFunctions)
     return result
-}
+}

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt

@@ -26,11 +26,10 @@ import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import java.util.Collections
 import com.intellij.openapi.vfs.VirtualFile
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
-import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils
 import com.intellij.openapi.diagnostic.Logger
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
 import org.jetbrains.jet.lang.PlatformToKotlinClassMap
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt

@@ -25,8 +25,8 @@ import org.jetbrains.jet.plugin.decompiler.isKotlinWithCompatibleAbiVersion
 import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache
 import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.jet.lang.resolve.name.FqName
-import org.jetbrains.jet.descriptors.serialization.ClassDataFinder
+import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
-import org.jetbrains.jet.descriptors.serialization.ClassData
+import org.jetbrains.kotlin.serialization.ClassData
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import com.intellij.openapi.diagnostic.Logger
 

idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt

@@ -29,7 +29,7 @@ import com.intellij.openapi.roots.LibraryOrderEntry
 import org.jetbrains.jet.lang.psi.JetDeclaration
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.openapi.module.impl.scopes.JdkScope

jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt

@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.serialization.jvm.BitEncoding
 import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf
 import com.google.protobuf.ExtensionRegistry
 import java.io.ByteArrayInputStream
-import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf
+import org.jetbrains.kotlin.serialization.DebugProtoBuf
 import java.util.Arrays
 import org.jetbrains.kotlin.jps.incremental.LocalFileKotlinClass
 import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind