Putting kotlin-jdk-annotations.jar into lib directory instead of lib/alt.

build.xml

@@ -386,7 +386,7 @@
     <target name="jdkAnnotations">
         <cleandir dir="${output}/classes/stdlib"/>
 
-        <jar destfile="${kotlin-home}/lib/alt/kotlin-jdk-annotations.jar">
+        <jar destfile="${kotlin-home}/lib/kotlin-jdk-annotations.jar">
             <fileset dir="${basedir}/jdk-annotations"/>
 
             <manifest>

compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java

@@ -148,6 +148,19 @@ public class TopDownAnalyzer {
         }
 
         context.debug("Exit");
+        for (DeclarationDescriptor descriptor : outerScope.getAllDescriptors()) {
+            if (descriptor instanceof NamespaceDescriptor) {
+                JetScope scope = ((NamespaceDescriptor) descriptor).getMemberScope();
+                for (DeclarationDescriptor member : scope.getAllDescriptors()) {
+                    if (member instanceof ClassDescriptor) {
+                        if (scope.getClassifier(member.getName()) != member) {
+                            System.out.println("Different members with same name " + member.getName());
+                        }
+                    }
+                }
+            }
+        }
+
         context.printDebugOutput(System.out);
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardClasses.java

@@ -335,6 +335,7 @@ public class JetStandardClasses {
             }
         }
         STANDARD_CLASSES_NAMESPACE.initialize(writableScope);
+        writableScope.changeLockLevel(WritableScope.LockLevel.READING);
     }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestPackJdkAnnotations.java

@@ -66,7 +66,7 @@ public class ForTestPackJdkAnnotations {
         if (ForTestCompileSomething.ACTUALLY_COMPILE) {
             return getJarFile();
         }
-        final File jdkAnnotations = new File("dist/kotlinc/lib/alt/kotlin-jdk-annotations.jar");
+        final File jdkAnnotations = new File("dist/kotlinc/lib/kotlin-jdk-annotations.jar");
         if (!jdkAnnotations.exists()) {
             throw new RuntimeException("Kotlin JDK annotations jar not found; please run 'ant dist' to build it");
         }

compiler/util/src/org/jetbrains/jet/utils/PathUtil.java

@@ -96,7 +96,7 @@ public class PathUtil {
 
     @Nullable
     public static File getJdkAnnotationsPath() {
-        return getFilePackedIntoLib("alt/" + JDK_ANNOTATIONS_JAR);
+        return getFilePackedIntoLib(JDK_ANNOTATIONS_JAR);
     }
 
     @NotNull