module dependencies-fix lib names

fix jar dependencies fix absolute paths
JetBrains · Nov 10, 2011 · 319bff5 · 319bff5
1 parent 8260ae2
commit 319bff5
Show file tree

Hide file tree

Showing 35 changed files with 138 additions and 207 deletions.
diff --git a/MPS-platform.iml b/MPS-platform.iml
@@ -4,11 +4,11 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="idea-patch" exported="" />
-    <orderEntry type="library" exported="" name="annotations" level="project" />
     <orderEntry type="library" exported="" name="Guava" level="project" />
-    <orderEntry type="library" exported="" name="IDEA-plaform" level="project" />
-    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="Idea-plaform" level="project" />
+    <orderEntry type="library" exported="" name="Annotations" level="project" />
   </component>
 </module>
 
diff --git a/...Language/baseLanguage/solutions/jetbrains.mps.baseLanguage.search/baseLanguage-search.iml b/...Language/baseLanguage/solutions/jetbrains.mps.baseLanguage.search/baseLanguage-search.iml
@@ -10,14 +10,14 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="MPS-platform" />
-    <orderEntry type="library" name="asm" level="project" />
-    <orderEntry type="library" name="Beansbinding" level="project" />
     <orderEntry type="module" module-name="kernel" />
     <orderEntry type="module" module-name="collections-runtime" />
     <orderEntry type="module" module-name="typesystemEngine" />
     <orderEntry type="module" module-name="generator-engine" />
     <orderEntry type="module" module-name="workbench" />
-    <orderEntry type="library" name="commons-logging" level="project" />
+    <orderEntry type="library" name="ASM" level="project" />
+    <orderEntry type="library" name="Beansbinding" level="project" />
+    <orderEntry type="library" name="Commons-logging" level="project" />
   </component>
 </module>
 
diff --git a/core/baseLanguage/runConfigurations/runtime/javaRunConfigurations-runtime.iml b/core/baseLanguage/runConfigurations/runtime/javaRunConfigurations-runtime.iml
@@ -11,37 +11,21 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="Closures-runtime" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/annotations.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module" module-name="kernel" />
     <orderEntry type="module" module-name="collections-runtime" />
     <orderEntry type="module" module-name="workbench" />
-    <orderEntry type="library" name="commons-lang" level="project" />
     <orderEntry type="module" module-name="MPS-platform" />
     <orderEntry type="module" module-name="generator-engine" />
-    <orderEntry type="library" name="Beansbinding" level="project" />
     <orderEntry type="module" module-name="uiLanguage-runtime" />
     <orderEntry type="module" module-name="debug-api" />
     <orderEntry type="module" module-name="plugin-runtime" />
     <orderEntry type="module" module-name="make-runtime" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../lib/commons-logging-1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module" module-name="runConfigurations" />
     <orderEntry type="module" module-name="Tuples-runtime" />
+    <orderEntry type="library" name="Commons-lang" level="project" />
+    <orderEntry type="library" name="Annotations" level="project" />
+    <orderEntry type="library" name="Beansbinding" level="project" />
+    <orderEntry type="library" name="Commons-logging" level="project" />
   </component>
 </module>
 
diff --git a/core/debug/debug.iml b/core/debug/debug.iml
@@ -11,17 +11,17 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="commons-logging" level="project" />
     <orderEntry type="module" module-name="MPS-platform" />
     <orderEntry type="module" module-name="kernel" />
-    <orderEntry type="library" exported="" name="tools" level="project" />
     <orderEntry type="module" module-name="debug-api" />
     <orderEntry type="module" module-name="Tuples-runtime" />
     <orderEntry type="module" module-name="collections-runtime" />
     <orderEntry type="module" module-name="typesystemEngine" />
     <orderEntry type="module" module-name="Closures-runtime" />
     <orderEntry type="module" module-name="idea-workbench" />
     <orderEntry type="module" module-name="generator-engine" />
+    <orderEntry type="library" exported="" name="Tools" level="project" />
+    <orderEntry type="library" name="Commons-logging" level="project" />
   </component>
 </module>
 
diff --git a/core/editor-runtime/editor-runtime.iml b/core/editor-runtime/editor-runtime.iml
@@ -11,8 +11,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="MPS-platform" />
-    <orderEntry type="library" name="commons-lang" level="project" />
-    <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="module" module-name="kernel" />
     <orderEntry type="module" module-name="actions-runtime" />
     <orderEntry type="module" module-name="workbench" />
@@ -21,9 +19,11 @@
     <orderEntry type="module" module-name="Tuples-runtime" />
     <orderEntry type="module" module-name="findUsages-runtime" />
     <orderEntry type="module" module-name="intentions-runtime" />
-    <orderEntry type="library" name="Trove" level="project" />
     <orderEntry type="module" module-name="make-runtime" />
     <orderEntry type="module" module-name="idea-workbench" />
+    <orderEntry type="library" name="Commons-lang" level="project" />
+    <orderEntry type="library" name="JDOM" level="project" />
+    <orderEntry type="library" name="Trove" level="project" />
   </component>
 </module>
 
diff --git a/core/findUsages-runtime/findUsages-runtime.iml b/core/findUsages-runtime/findUsages-runtime.iml
@@ -10,10 +10,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="library" name="annotations" level="project" />
     <orderEntry type="module" module-name="kernel" />
     <orderEntry type="module" module-name="collections-runtime" />
+    <orderEntry type="library" name="Annotations" level="project" />
+    <orderEntry type="library" name="JDOM" level="project" />
   </component>
 </module>
 
diff --git a/core/generator/generator-engine.iml b/core/generator/generator-engine.iml
@@ -13,17 +13,17 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Eclipse-compiler" level="project" />
-    <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="library" name="annotations" level="project" />
-    <orderEntry type="library" name="commons-logging" level="project" />
     <orderEntry type="module" module-name="kernel" />
     <orderEntry type="module" module-name="collections-runtime" />
     <orderEntry type="module" module-name="typesystemEngine" />
-    <orderEntry type="library" scope="TEST" name="Log4j" level="project" />
-    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="testbench" scope="TEST" />
     <orderEntry type="module" module-name="workbench" scope="TEST" />
+    <orderEntry type="library" name="Annotations" level="project" />
+    <orderEntry type="library" name="Commons-logging" level="project" />
+    <orderEntry type="library" name="Eclipse-compiler" level="project" />
+    <orderEntry type="library" name="JDOM" level="project" />
+    <orderEntry type="library" scope="TEST" name="Log4j" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
   </component>
 </module>
 
diff --git a/core/intentions-runtime/intentions-runtime.iml b/core/intentions-runtime/intentions-runtime.iml
@@ -14,8 +14,8 @@
     <orderEntry type="module" module-name="editor-runtime" />
     <orderEntry type="module" module-name="workbench" />
     <orderEntry type="module" module-name="typesystemEngine" />
-    <orderEntry type="library" name="commons-lang" level="project" />
     <orderEntry type="module" module-name="idea-workbench" />
+    <orderEntry type="library" name="Commons-lang" level="project" />
   </component>
 </module>
 
diff --git a/core/kernel/kernel.iml b/core/kernel/kernel.iml
@@ -20,17 +20,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Eclipse-compiler" level="project" />
-    <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="library" name="Log4j" level="project" />
-    <orderEntry type="library" name="Trove" level="project" />
-    <orderEntry type="library" name="XStream" level="project" />
-    <orderEntry type="library" name="annotations" level="project" />
-    <orderEntry type="library" name="asm" level="project" />
-    <orderEntry type="library" name="commons-lang" level="project" />
-    <orderEntry type="library" name="commons-logging" level="project" />
-    <orderEntry type="library" name="java-diff-utils" level="project" />
     <orderEntry type="module" module-name="runtime" exported="" />
     <orderEntry type="module" module-name="Tuples-runtime" />
     <orderEntry type="module" module-name="Closures-runtime" />
@@ -40,8 +29,19 @@
     <orderEntry type="module" module-name="make-runtime" />
     <orderEntry type="module" module-name="findUsages-runtime" />
     <orderEntry type="module" module-name="testbench" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="workbench" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="library" name="Eclipse-compiler" level="project" />
+    <orderEntry type="library" name="Guava" level="project" />
+    <orderEntry type="library" name="JDOM" level="project" />
+    <orderEntry type="library" name="Log4j" level="project" />
+    <orderEntry type="library" name="Trove" level="project" />
+    <orderEntry type="library" name="XStream" level="project" />
+    <orderEntry type="library" name="Annotations" level="project" />
+    <orderEntry type="library" name="ASM" level="project" />
+    <orderEntry type="library" name="Commons-lang" level="project" />
+    <orderEntry type="library" name="Commons-logging" level="project" />
+    <orderEntry type="library" name="Diff-utils" level="project" />
   </component>
 </module>
 
diff --git a/core/make-runtime/make-runtime.iml b/core/make-runtime/make-runtime.iml
@@ -10,13 +10,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="library" name="annotations" level="project" />
     <orderEntry type="module" module-name="collections-runtime" />
     <orderEntry type="module" module-name="Closures-runtime" />
     <orderEntry type="module" module-name="Tuples-runtime" />
     <orderEntry type="module" module-name="kernel" />
     <orderEntry type="module" module-name="generator-engine" />
+    <orderEntry type="library" name="Annotations" level="project" />
+    <orderEntry type="library" name="JDOM" level="project" />
   </component>
 </module>
 
diff --git a/core/plugin-runtime/plugin-runtime.iml b/core/plugin-runtime/plugin-runtime.iml
@@ -13,12 +13,12 @@
     <orderEntry type="module" module-name="MPS-platform" />
     <orderEntry type="module" module-name="kernel" />
     <orderEntry type="module" module-name="workbench" />
-    <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="library" name="commons-lang" level="project" />
     <orderEntry type="module" module-name="generator-engine" />
     <orderEntry type="module" module-name="debug" />
     <orderEntry type="module" module-name="debug-api" />
     <orderEntry type="module" module-name="runConfigurations" />
+    <orderEntry type="library" name="JDOM" level="project" />
+    <orderEntry type="library" name="Commons-lang" level="project" />
   </component>
 </module>
 
diff --git a/core/runtime/runtime.iml b/core/runtime/runtime.iml
@@ -10,9 +10,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="java-diff-utils" level="project" />
     <orderEntry type="library" name="Trove" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="library" name="Diff-utils" level="project" />
   </component>
 </module>
 
diff --git a/core/typesystemEngine/typesystemEngine.iml b/core/typesystemEngine/typesystemEngine.iml
@@ -10,10 +10,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="annotations" level="project" />
-    <orderEntry type="library" name="Trove" level="project" />
     <orderEntry type="module" module-name="kernel" />
     <orderEntry type="module" module-name="collections-runtime" />
+    <orderEntry type="library" name="Annotations" level="project" />
+    <orderEntry type="library" name="Trove" level="project" />
   </component>
 </module>
 
diff --git a/editor/typesystemIntegration/typesystemIntegration.iml b/editor/typesystemIntegration/typesystemIntegration.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="workbench" />
     <orderEntry type="module" module-name="editor-runtime" />
     <orderEntry type="module" module-name="collections-runtime" />
-    <orderEntry type="library" name="commons-logging" level="project" />
+    <orderEntry type="library" name="Commons-logging" level="project" />
   </component>
 </module>
 
diff --git a/languages/util/buildlanguage/ant/ant.iml b/languages/util/buildlanguage/ant/ant.iml
@@ -11,21 +11,21 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="ant" level="project" />
-    <orderEntry type="library" name="Eclipse-compiler" level="project" />
     <orderEntry type="module" module-name="testbench" scope="TEST" />
     <orderEntry type="module" module-name="Tuples-runtime" />
-    <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="MPS-platform" />
     <orderEntry type="module" module-name="kernel" />
     <orderEntry type="module" module-name="workbench" />
-    <orderEntry type="library" name="Log4j" level="project" />
-    <orderEntry type="library" name="commons-lang" level="project" />
     <orderEntry type="module" module-name="plugin-runtime" />
     <orderEntry type="module" module-name="generator-engine" />
     <orderEntry type="module" module-name="collections-runtime" />
     <orderEntry type="module" module-name="make-runtime" />
     <orderEntry type="module" module-name="Closures-runtime" />
+    <orderEntry type="library" name="Commons-lang" level="project" />
+    <orderEntry type="library" name="Ant" level="project" />
+    <orderEntry type="library" name="Log4j" level="project" />
+    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="library" name="Eclipse-compiler" level="project" />
   </component>
 </module>
 
diff --git a/languages/util/runConfigurations/runConfigurations.iml b/languages/util/runConfigurations/runConfigurations.iml
@@ -14,38 +14,21 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="MPS-platform" />
     <orderEntry type="module" module-name="collections-runtime" />
-    <orderEntry type="library" name="commons-lang" level="project" />
     <orderEntry type="module" module-name="Closures-runtime" />
     <orderEntry type="module" module-name="kernel" />
     <orderEntry type="module" module-name="debug-api" />
-    <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="module" module-name="generator-engine" />
     <orderEntry type="module" module-name="typesystemEngine" />
     <orderEntry type="module" module-name="plugin-runtime" />
     <orderEntry type="module" module-name="workbench" />
     <orderEntry type="module" module-name="debug" />
-    <orderEntry type="library" name="commons-logging" level="project" />
     <orderEntry type="module" module-name="make-runtime" />
     <orderEntry type="module" module-name="javaRunConfigurations-runtime" />
-    <orderEntry type="module-library" scope="TEST">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.8.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" scope="TEST">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.9.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module" module-name="idea-workbench" />
+    <orderEntry type="library" name="JDOM" level="project" />
+    <orderEntry type="library" name="Commons-lang" level="project" />
+    <orderEntry type="library" name="Commons-logging" level="project" />
+    <orderEntry type="library" name="JUnit4" level="project" />
   </component>
 </module>
 
diff --git a/mergedriver/vcs-mergedriver.iml b/mergedriver/vcs-mergedriver.iml
@@ -10,43 +10,17 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="vcs" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../plugins/svn4idea/lib/svnkit.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="commons-logging" level="project" />
     <orderEntry type="module" module-name="MPS-platform" />
     <orderEntry type="module" module-name="workbench" />
     <orderEntry type="module" module-name="collections-runtime" />
     <orderEntry type="module" module-name="Closures-runtime" />
     <orderEntry type="module" module-name="kernel" />
-    <orderEntry type="library" name="commons-lang" level="project" />
     <orderEntry type="module" module-name="Tuples-runtime" />
     <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../plugins/git4idea/lib/git4idea.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="library" name="Log4j" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../plugins/svn4idea/lib/svn4idea.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="Commons-logging" level="project" />
+    <orderEntry type="library" name="Commons-lang" level="project" />
+    <orderEntry type="library" name="Idea-vcs" level="project" />
   </component>
 </module>
 
diff --git a/plugins/debugger-api/debugger-api.iml b/plugins/debugger-api/debugger-api.iml
@@ -20,12 +20,12 @@
     <orderEntry type="module" module-name="workbench" />
     <orderEntry type="module" module-name="collections-runtime" />
     <orderEntry type="module" module-name="generator-engine" />
-    <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="library" name="commons-logging" level="project" />
     <orderEntry type="module" module-name="typesystemEngine" />
     <orderEntry type="module" module-name="Closures-runtime" />
     <orderEntry type="module" module-name="idea-workbench" />
     <orderEntry type="module" module-name="mps-workbench" />
+    <orderEntry type="library" name="Commons-logging" level="project" />
+    <orderEntry type="library" name="JDOM" level="project" />
   </component>
 </module>