From 465c4a397e43c1f19764adc741e50def5d1edfeb Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Thu, 18 Dec 2014 14:27:43 +0300
Subject: [PATCH] Rename manifest.properties to kotlinManifest.properties to
 avoid clashing with other resources.

---
 .idea/artifacts/KotlinJpsPlugin.xml                          | 2 +-
 .idea/artifacts/KotlinPlugin.xml                             | 2 +-
 build.xml                                                    | 4 ++--
 compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.kt    | 4 ++--
 libraries/examples/kotlin-js-library-example/pom.xml         | 2 +-
 resources/{manifest.properties => kotlinManifest.properties} | 0
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename resources/{manifest.properties => kotlinManifest.properties} (100%)

diff --git a/.idea/artifacts/KotlinJpsPlugin.xml b/.idea/artifacts/KotlinJpsPlugin.xml
index b65083fffc6..4ce89a4c583 100644
--- a/.idea/artifacts/KotlinJpsPlugin.xml
+++ b/.idea/artifacts/KotlinJpsPlugin.xml
@@ -12,7 +12,7 @@
       <element id="module-output" name="preloader" />
       <element id="module-output" name="util" />
       <element id="module-output" name="util.runtime" />
-      <element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
+      <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 482d04c2737..0da513aceab 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -30,7 +30,7 @@
           <element id="module-output" name="eval4j" />
           <element id="module-output" name="idea-analysis" />
           <element id="module-output" name="ide-common" />
-          <element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
+          <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
           <element id="module-output" name="kotlin-android-plugin" />
         </element>
         <element id="library" level="project" name="javax.inject" />
diff --git a/build.xml b/build.xml
index 957f399bd5e..3bafbfe2c53 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <project name="Kotlin" default="dist">
     <include file="jslib_files.xml" />
 
-    <property file="resources/manifest.properties"/>
+    <property file="resources/kotlinManifest.properties"/>
 
     <!-- Set to false to disable proguard run on kotlin-compiler.jar. Speeds up the build -->
     <property name="shrink" value="true"/>
@@ -385,7 +385,7 @@
                 </fileset>
                 <fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
                 <fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/>
-                <fileset dir="${basedir}/resources" includes="manifest.properties"/>
+                <fileset dir="${basedir}/resources" includes="kotlinManifest.properties"/>
 
                 <fileset dir="idea/src">
                     <include name="META-INF/extensions/common.xml"/>
diff --git a/compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.kt b/compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.kt
index 7c3320a1dad..fb36a71a280 100644
--- a/compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.kt
+++ b/compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.kt
@@ -47,7 +47,7 @@ public object LibraryUtils {
         var jsStdLib = ""
         var jsLib = ""
 
-        val manifestProperties = javaClass<LibraryUtils>().getResourceAsStream("/manifest.properties")
+        val manifestProperties = javaClass<LibraryUtils>().getResourceAsStream("/kotlinManifest.properties")
         if (manifestProperties != null) {
             try {
                 val properties = Properties()
@@ -61,7 +61,7 @@ public object LibraryUtils {
 
         }
         else {
-            LOG.error("Resource 'manifest.properties' not found.")
+            LOG.error("Resource 'kotlinManifest.properties' not found.")
         }
 
         TITLE_KOTLIN_JAVASCRIPT_STDLIB = jsStdLib
diff --git a/libraries/examples/kotlin-js-library-example/pom.xml b/libraries/examples/kotlin-js-library-example/pom.xml
index cdfeda6421c..1fa16546f01 100644
--- a/libraries/examples/kotlin-js-library-example/pom.xml
+++ b/libraries/examples/kotlin-js-library-example/pom.xml
@@ -46,7 +46,7 @@
                         </goals>
                         <configuration>
                             <files>
-                                <file>../../../resources/manifest.properties</file>
+                                <file>../../../resources/kotlinManifest.properties</file>
                             </files>
                         </configuration>
                     </execution>
diff --git a/resources/manifest.properties b/resources/kotlinManifest.properties
similarity index 100%
rename from resources/manifest.properties
rename to resources/kotlinManifest.properties