diff --git a/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt index 067596656a8..9341d39dcaa 100644 --- a/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt +++ b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt @@ -25,7 +25,7 @@ import org.apache.tools.ant.types.Commandline import java.io.PrintStream import org.apache.tools.ant.AntClassLoader import java.lang.ref.SoftReference -import org.jetbrains.jet.preloading.ClassPreloadingUtils +import org.jetbrains.kotlin.preloading.ClassPreloadingUtils import java.net.JarURLConnection object CompilerClassLoaderHolder { diff --git a/build.xml b/build.xml index bd8aac683fe..e915806523c 100644 --- a/build.xml +++ b/build.xml @@ -383,7 +383,7 @@ - + diff --git a/compiler/cli/bin/kotlinc-js b/compiler/cli/bin/kotlinc-js index 762b9192449..ba3e0451539 100755 --- a/compiler/cli/bin/kotlinc-js +++ b/compiler/cli/bin/kotlinc-js @@ -82,6 +82,6 @@ CPSELECT="-cp " $JAVA_OPTS \ "${java_args[@]}" \ ${CPSELECT}"${KOTLIN_HOME}/lib/kotlin-preloader.jar" \ - org.jetbrains.jet.preloading.Preloader \ + org.jetbrains.kotlin.preloading.Preloader \ "${KOTLIN_HOME}/lib/kotlin-compiler.jar" \ org.jetbrains.jet.cli.js.K2JSCompiler 4096 notime "$@" diff --git a/compiler/cli/bin/kotlinc-js.bat b/compiler/cli/bin/kotlinc-js.bat index 7299f624dc9..26c763b93d2 100644 --- a/compiler/cli/bin/kotlinc-js.bat +++ b/compiler/cli/bin/kotlinc-js.bat @@ -26,7 +26,7 @@ rem We use the value of the JAVA_OPTS environment variable if defined set _JAVA_OPTS=-Xmx256M -Xms32M -noverify "%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^ - org.jetbrains.jet.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar" ^ + org.jetbrains.kotlin.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar" ^ org.jetbrains.jet.cli.js.K2JSCompiler 4096 notime %* exit /b %ERRORLEVEL% diff --git a/compiler/cli/bin/kotlinc-jvm b/compiler/cli/bin/kotlinc-jvm index 25572ccc4ac..35906f6c171 100755 --- a/compiler/cli/bin/kotlinc-jvm +++ b/compiler/cli/bin/kotlinc-jvm @@ -82,6 +82,6 @@ CPSELECT="-cp " $JAVA_OPTS \ "${java_args[@]}" \ ${CPSELECT}"${KOTLIN_HOME}/lib/kotlin-preloader.jar" \ - org.jetbrains.jet.preloading.Preloader \ + org.jetbrains.kotlin.preloading.Preloader \ "${KOTLIN_HOME}/lib/kotlin-compiler.jar" \ org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 notime "$@" diff --git a/compiler/cli/bin/kotlinc-jvm.bat b/compiler/cli/bin/kotlinc-jvm.bat index c5638e2c2ab..ddae33633b7 100644 --- a/compiler/cli/bin/kotlinc-jvm.bat +++ b/compiler/cli/bin/kotlinc-jvm.bat @@ -26,7 +26,7 @@ rem We use the value of the JAVA_OPTS environment variable if defined set _JAVA_OPTS=-Xmx256M -Xms32M -noverify "%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^ - org.jetbrains.jet.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar" ^ + org.jetbrains.kotlin.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar" ^ org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 notime %* exit /b %ERRORLEVEL% diff --git a/compiler/preloader/instrumentation/ReadMe.md b/compiler/preloader/instrumentation/ReadMe.md index f3f048e2f34..81ad70a6ecd 100644 --- a/compiler/preloader/instrumentation/ReadMe.md +++ b/compiler/preloader/instrumentation/ReadMe.md @@ -8,7 +8,7 @@ But as a side effect, we got a chance to support instrumenting the compiler's co To run Preloader with instrumentation, pass ```instrument=...``` on the command line: ``` -org.jetbrains.jet.preloading.Preloader \ +org.jetbrains.kotlin.preloading.Preloader \ dist/kotlinc/lib/kotlin-compiler.jar \ org.jetbrains.jet.cli.jvm.K2JVMCompiler \ 5000 \ @@ -17,12 +17,12 @@ org.jetbrains.jet.preloading.Preloader \ ``` This example uses an artifact already configured in our project. -In this artifact, what to instrument is configured in the ```org.jetbrains.jet.preloading.ProfilingInstrumenterExample``` class. -This is determined by the ```src/META-INF/services/org.jetbrains.jet.preloading.instrumentation.Instrumenter``` file (see JavaDoc for ```java.util.ServiceLoader```). +In this artifact, what to instrument is configured in the ```org.jetbrains.kotlin.preloading.ProfilingInstrumenterExample``` class. +This is determined by the ```src/META-INF/services/org.jetbrains.kotlin.preloading.instrumentation.Instrumenter``` file (see JavaDoc for ```java.util.ServiceLoader```). ## More structured description -**Instrumenter** is any implementation of ```org.jetbrains.jet.preloading.instrumentation.Instrumenter``` interface. +**Instrumenter** is any implementation of ```org.jetbrains.kotlin.preloading.instrumentation.Instrumenter``` interface. Preloader loads the **first** instrumenter service found on the class path. Services are provided through the [standard JDK mechanism](http://docs.oracle.com/javase/6/docs/api/java/util/ServiceLoader.html). @@ -32,7 +32,7 @@ Every preloaded class is run through the instrumenter. Before exiting the progra The ```instrumentation``` module provides a convenient way to define useful instrumenters: -* Derive your class from ```org.jetbrains.jet.preloading.instrumentation.InterceptionInstrumenterAdaptor``` +* Derive your class from ```org.jetbrains.kotlin.preloading.instrumentation.InterceptionInstrumenterAdaptor``` * In this class define public static fields with ```@MethodInterceptor``` annotation Whatever the type of the field, if it has methods named by the convention defined below, they will be called as follows: @@ -50,4 +50,4 @@ If any of the methods above, except for ```dump.*```, have parameters, they are * ```@MethodDesc``` - this parameter receives the JVM descriptor of the instrumented method, like ```(ILjava/lang/Object;)V```, must be a ```String``` * ```@AllArgs``` - this parameter receives an array of all arguments of the instrumented method, must be of type ```Object[]``` -See ```org.jetbrains.jet.preloading.ProfilingInstrumenterExample```. +See ```org.jetbrains.kotlin.preloading.ProfilingInstrumenterExample```. diff --git a/compiler/preloader/instrumentation/src/META-INF/services/org.jetbrains.jet.preloading.instrumentation.Instrumenter b/compiler/preloader/instrumentation/src/META-INF/services/org.jetbrains.jet.preloading.instrumentation.Instrumenter deleted file mode 100644 index 4778763239c..00000000000 --- a/compiler/preloader/instrumentation/src/META-INF/services/org.jetbrains.jet.preloading.instrumentation.Instrumenter +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.jet.preloading.ProfilingInstrumenterExample \ No newline at end of file diff --git a/compiler/preloader/instrumentation/src/META-INF/services/org.jetbrains.kotlin.preloading.instrumentation.Instrumenter b/compiler/preloader/instrumentation/src/META-INF/services/org.jetbrains.kotlin.preloading.instrumentation.Instrumenter new file mode 100644 index 00000000000..322859af6b3 --- /dev/null +++ b/compiler/preloader/instrumentation/src/META-INF/services/org.jetbrains.kotlin.preloading.instrumentation.Instrumenter @@ -0,0 +1 @@ +org.jetbrains.kotlin.preloading.ProfilingInstrumenterExample \ No newline at end of file diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/ProfilingInstrumenterExample.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/ProfilingInstrumenterExample.java similarity index 90% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/ProfilingInstrumenterExample.java rename to compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/ProfilingInstrumenterExample.java index 4ba01b3316f..c9be687583e 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/ProfilingInstrumenterExample.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/ProfilingInstrumenterExample.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.preloading; +package org.jetbrains.kotlin.preloading; -import org.jetbrains.jet.preloading.instrumentation.InterceptionInstrumenterAdaptor; -import org.jetbrains.jet.preloading.instrumentation.annotations.ClassName; -import org.jetbrains.jet.preloading.instrumentation.annotations.MethodDesc; -import org.jetbrains.jet.preloading.instrumentation.annotations.MethodInterceptor; -import org.jetbrains.jet.preloading.instrumentation.annotations.MethodName; +import org.jetbrains.kotlin.preloading.instrumentation.InterceptionInstrumenterAdaptor; +import org.jetbrains.kotlin.preloading.instrumentation.annotations.ClassName; +import org.jetbrains.kotlin.preloading.instrumentation.annotations.MethodDesc; +import org.jetbrains.kotlin.preloading.instrumentation.annotations.MethodInterceptor; +import org.jetbrains.kotlin.preloading.instrumentation.annotations.MethodName; import java.io.PrintStream; import java.util.*; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/FieldData.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/FieldData.java similarity index 90% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/FieldData.java rename to compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/FieldData.java index 8a5eba5a800..1089188dc7a 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/FieldData.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/FieldData.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.preloading.instrumentation; +package org.jetbrains.kotlin.preloading.instrumentation; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenter.java similarity index 99% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java rename to compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenter.java index cb26a95d75c..88bd72717b7 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenter.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,9 @@ * limitations under the License. */ -package org.jetbrains.jet.preloading.instrumentation; +package org.jetbrains.kotlin.preloading.instrumentation; -import org.jetbrains.jet.preloading.instrumentation.annotations.*; +import org.jetbrains.kotlin.preloading.instrumentation.annotations.*; import org.jetbrains.org.objectweb.asm.*; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.org.objectweb.asm.util.Textifier; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenterAdaptor.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenterAdaptor.java similarity index 92% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenterAdaptor.java rename to compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenterAdaptor.java index 87527e242ab..4f75e047f8a 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenterAdaptor.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenterAdaptor.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.preloading.instrumentation; +package org.jetbrains.kotlin.preloading.instrumentation; import java.io.PrintStream; import java.util.Collections; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MemberData.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/MemberData.java similarity index 91% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MemberData.java rename to compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/MemberData.java index 8a0537e0e0a..ba565c6bb7d 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MemberData.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/MemberData.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.preloading.instrumentation; +package org.jetbrains.kotlin.preloading.instrumentation; class MemberData { diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodData.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/MethodData.java similarity index 95% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodData.java rename to compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/MethodData.java index 3a743ecc2a1..f9d5f25ac66 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodData.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/MethodData.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.preloading.instrumentation; +package org.jetbrains.kotlin.preloading.instrumentation; public class MethodData extends MemberData { private final FieldData ownerField; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInstrumenter.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/MethodInstrumenter.java similarity index 96% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInstrumenter.java rename to compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/MethodInstrumenter.java index 504c1663262..5acd3cc9c4b 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInstrumenter.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/MethodInstrumenter.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.preloading.instrumentation; +package org.jetbrains.kotlin.preloading.instrumentation; import java.util.List; import java.util.regex.Pattern; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/AllArgs.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/AllArgs.java similarity index 88% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/AllArgs.java rename to compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/AllArgs.java index f78dee658c1..adca658dc3f 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/AllArgs.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/AllArgs.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.preloading.instrumentation.annotations; +package org.jetbrains.kotlin.preloading.instrumentation.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/ClassName.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/ClassName.java similarity index 88% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/ClassName.java rename to compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/ClassName.java index f2c70b404cb..88f142b9d1e 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/ClassName.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/ClassName.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.preloading.instrumentation.annotations; +package org.jetbrains.kotlin.preloading.instrumentation.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodDesc.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/MethodDesc.java similarity index 88% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodDesc.java rename to compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/MethodDesc.java index bdee48cd17a..64a11fd5680 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodDesc.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/MethodDesc.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.preloading.instrumentation.annotations; +package org.jetbrains.kotlin.preloading.instrumentation.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodInterceptor.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/MethodInterceptor.java similarity index 93% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodInterceptor.java rename to compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/MethodInterceptor.java index 1c3c2dbdb7f..cbab828a2c1 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodInterceptor.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/MethodInterceptor.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.preloading.instrumentation.annotations; +package org.jetbrains.kotlin.preloading.instrumentation.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodName.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/MethodName.java similarity index 88% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodName.java rename to compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/MethodName.java index c2d24a351e2..d366a381462 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodName.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/MethodName.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.preloading.instrumentation.annotations; +package org.jetbrains.kotlin.preloading.instrumentation.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/This.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/This.java similarity index 88% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/This.java rename to compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/This.java index 4776931816d..04dfd39b506 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/This.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/annotations/This.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.preloading.instrumentation.annotations; +package org.jetbrains.kotlin.preloading.instrumentation.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/preloader/src/org/jetbrains/jet/preloading/ClassCondition.java b/compiler/preloader/src/org/jetbrains/kotlin/preloading/ClassCondition.java similarity index 88% rename from compiler/preloader/src/org/jetbrains/jet/preloading/ClassCondition.java rename to compiler/preloader/src/org/jetbrains/kotlin/preloading/ClassCondition.java index a2d689373e9..bf4da8c7d2b 100644 --- a/compiler/preloader/src/org/jetbrains/jet/preloading/ClassCondition.java +++ b/compiler/preloader/src/org/jetbrains/kotlin/preloading/ClassCondition.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.preloading; +package org.jetbrains.kotlin.preloading; public interface ClassCondition { boolean accept(String className); diff --git a/compiler/preloader/src/org/jetbrains/jet/preloading/ClassHandler.java b/compiler/preloader/src/org/jetbrains/kotlin/preloading/ClassHandler.java similarity index 92% rename from compiler/preloader/src/org/jetbrains/jet/preloading/ClassHandler.java rename to compiler/preloader/src/org/jetbrains/kotlin/preloading/ClassHandler.java index c1d8d12ff5f..a31896db80c 100644 --- a/compiler/preloader/src/org/jetbrains/jet/preloading/ClassHandler.java +++ b/compiler/preloader/src/org/jetbrains/kotlin/preloading/ClassHandler.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.preloading; +package org.jetbrains.kotlin.preloading; import java.io.File; diff --git a/compiler/preloader/src/org/jetbrains/jet/preloading/ClassPreloadingUtils.java b/compiler/preloader/src/org/jetbrains/kotlin/preloading/ClassPreloadingUtils.java similarity index 98% rename from compiler/preloader/src/org/jetbrains/jet/preloading/ClassPreloadingUtils.java rename to compiler/preloader/src/org/jetbrains/kotlin/preloading/ClassPreloadingUtils.java index 2640751c09f..b4b866d94da 100644 --- a/compiler/preloader/src/org/jetbrains/jet/preloading/ClassPreloadingUtils.java +++ b/compiler/preloader/src/org/jetbrains/kotlin/preloading/ClassPreloadingUtils.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.preloading; +package org.jetbrains.kotlin.preloading; import java.io.*; import java.util.*; diff --git a/compiler/preloader/src/org/jetbrains/jet/preloading/MemoryBasedClassLoader.java b/compiler/preloader/src/org/jetbrains/kotlin/preloading/MemoryBasedClassLoader.java similarity index 98% rename from compiler/preloader/src/org/jetbrains/jet/preloading/MemoryBasedClassLoader.java rename to compiler/preloader/src/org/jetbrains/kotlin/preloading/MemoryBasedClassLoader.java index 32a6ce03f5d..3e79f2e9eb1 100644 --- a/compiler/preloader/src/org/jetbrains/jet/preloading/MemoryBasedClassLoader.java +++ b/compiler/preloader/src/org/jetbrains/kotlin/preloading/MemoryBasedClassLoader.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.preloading; +package org.jetbrains.kotlin.preloading; import java.io.IOException; import java.net.URL; diff --git a/compiler/preloader/src/org/jetbrains/jet/preloading/Preloader.java b/compiler/preloader/src/org/jetbrains/kotlin/preloading/Preloader.java similarity index 97% rename from compiler/preloader/src/org/jetbrains/jet/preloading/Preloader.java rename to compiler/preloader/src/org/jetbrains/kotlin/preloading/Preloader.java index 3c8e2ed789d..4dc442aa38c 100644 --- a/compiler/preloader/src/org/jetbrains/jet/preloading/Preloader.java +++ b/compiler/preloader/src/org/jetbrains/kotlin/preloading/Preloader.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,9 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.preloading; +package org.jetbrains.kotlin.preloading; -import org.jetbrains.jet.preloading.instrumentation.Instrumenter; +import org.jetbrains.kotlin.preloading.instrumentation.Instrumenter; import java.io.File; import java.lang.reflect.Method; diff --git a/compiler/preloader/src/org/jetbrains/jet/preloading/ResourceData.java b/compiler/preloader/src/org/jetbrains/kotlin/preloading/ResourceData.java similarity index 96% rename from compiler/preloader/src/org/jetbrains/jet/preloading/ResourceData.java rename to compiler/preloader/src/org/jetbrains/kotlin/preloading/ResourceData.java index b0f3d044681..9ed4ab1896c 100644 --- a/compiler/preloader/src/org/jetbrains/jet/preloading/ResourceData.java +++ b/compiler/preloader/src/org/jetbrains/kotlin/preloading/ResourceData.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.preloading; +package org.jetbrains.kotlin.preloading; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/compiler/preloader/src/org/jetbrains/jet/preloading/instrumentation/Instrumenter.java b/compiler/preloader/src/org/jetbrains/kotlin/preloading/instrumentation/Instrumenter.java similarity index 91% rename from compiler/preloader/src/org/jetbrains/jet/preloading/instrumentation/Instrumenter.java rename to compiler/preloader/src/org/jetbrains/kotlin/preloading/instrumentation/Instrumenter.java index a23cf2b5e3e..1f391ddd76d 100644 --- a/compiler/preloader/src/org/jetbrains/jet/preloading/instrumentation/Instrumenter.java +++ b/compiler/preloader/src/org/jetbrains/kotlin/preloading/instrumentation/Instrumenter.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.preloading.instrumentation; +package org.jetbrains.kotlin.preloading.instrumentation; import java.io.PrintStream; diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerEnvironment.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerEnvironment.java index 614f7c5eae8..8a610827a72 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerEnvironment.java +++ b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerEnvironment.java @@ -19,9 +19,9 @@ package org.jetbrains.jet.compiler.runner; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.config.Services; -import org.jetbrains.jet.preloading.ClassCondition; import org.jetbrains.jet.utils.KotlinPaths; import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.kotlin.preloading.ClassCondition; import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR; diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java index 2bf1db81ca2..788d3cfac0d 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java +++ b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.compiler.runner; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.preloading.ClassPreloadingUtils; import org.jetbrains.jet.utils.KotlinPaths; +import org.jetbrains.kotlin.preloading.ClassPreloadingUtils; import java.io.File; import java.io.IOException;