changeset 4179:2417bb85eda7

IDEA, ECLIPSE: Get rid of circular dependencies, ensure that cached jfrt.jar is on the end of the class path to avoid shadowing, rename 'javafx' to 'rt', ensure projects outside of 'rt' depend on 'rt' instead of individual modules
author snorthov
date Thu, 04 Jul 2013 08:12:16 -0400
parents e48b05c36e15
children 62160d20258a
files idea/.idea/modules.xml idea/buildSrc.iml idea/builders.iml idea/deploy.iml idea/graphics.iml idea/javafx.iml idea/media.iml idea/rt-closed.iml idea/rt.iml idea/web.iml modules/graphics/.classpath
diffstat 11 files changed, 31 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/idea/.idea/modules.xml	Thu Jul 04 06:15:22 2013 -0400
+++ b/idea/.idea/modules.xml	Thu Jul 04 08:12:16 2013 -0400
@@ -11,8 +11,8 @@
       <module fileurl="file://$PROJECT_DIR$/fxml.iml" filepath="$PROJECT_DIR$/fxml.iml" />
       <module fileurl="file://$PROJECT_DIR$/fxpackager.iml" filepath="$PROJECT_DIR$/fxpackager.iml" />
       <module fileurl="file://$PROJECT_DIR$/graphics.iml" filepath="$PROJECT_DIR$/graphics.iml" />
-      <module fileurl="file://$PROJECT_DIR$/javafx.iml" filepath="$PROJECT_DIR$/javafx.iml" />
       <module fileurl="file://$PROJECT_DIR$/media.iml" filepath="$PROJECT_DIR$/media.iml" />
+      <module fileurl="file://$PROJECT_DIR$/rt.iml" filepath="$PROJECT_DIR$/rt.iml" />
       <module fileurl="file://$PROJECT_DIR$/rt-closed.iml" filepath="$PROJECT_DIR$/rt-closed.iml" />
       <module fileurl="file://$PROJECT_DIR$/swing.iml" filepath="$PROJECT_DIR$/swing.iml" />
       <module fileurl="file://$PROJECT_DIR$/swt.iml" filepath="$PROJECT_DIR$/swt.iml" />
--- a/idea/buildSrc.iml	Thu Jul 04 06:15:22 2013 -0400
+++ b/idea/buildSrc.iml	Thu Jul 04 08:12:16 2013 -0400
@@ -73,7 +73,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="inheritedJdk" />
     <orderEntry type="module-library" exported="">
       <library name="junit4">
         <CLASSES>
@@ -83,6 +82,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="inheritedJdk" />
   </component>
 </module>
 
--- a/idea/builders.iml	Thu Jul 04 06:15:22 2013 -0400
+++ b/idea/builders.iml	Thu Jul 04 08:12:16 2013 -0400
@@ -11,6 +11,7 @@
     <content url="file://$MODULE_DIR$/../modules/builders">
       <excludeFolder url="file://$MODULE_DIR$/../modules/builders/build" />
     </content>
+    <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library" exported="">
       <library name="builders.jar">
         <CLASSES>
@@ -22,14 +23,7 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="base" exported="" />
-    <orderEntry type="module" module-name="controls" exported="" />
-    <orderEntry type="module" module-name="graphics" exported="" />
-    <orderEntry type="module" module-name="swing" exported="" />
-    <orderEntry type="module" module-name="swt" exported="" />
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="web" exported="" />
   </component>
 </module>
 
--- a/idea/deploy.iml	Thu Jul 04 06:15:22 2013 -0400
+++ b/idea/deploy.iml	Thu Jul 04 08:12:16 2013 -0400
@@ -19,7 +19,7 @@
       <excludeFolder url="file://$MODULE_DIR$/../../deploy/javafx-deploy-samples/src/helloworld" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="plugin_exports.jar">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../deploy/cache/plugin_exports.jar!/" />
@@ -28,8 +28,8 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="rt" exported="" />
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="controls" exported="" />
   </component>
 </module>
 
--- a/idea/graphics.iml	Thu Jul 04 06:15:22 2013 -0400
+++ b/idea/graphics.iml	Thu Jul 04 08:12:16 2013 -0400
@@ -19,11 +19,10 @@
       <excludeFolder url="file://$MODULE_DIR$/../modules/graphics/build/resources" />
       <excludeFolder url="file://$MODULE_DIR$/../modules/graphics/build/tmp" />
     </content>
+    <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="base" exported="" />
+    <orderEntry type="module" module-name="builders" exported="" />
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="builders" exported="" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="rt-closed" exported="" />
   </component>
 </module>
 
--- a/idea/javafx.iml	Thu Jul 04 06:15:22 2013 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/..">
-      <excludeFolder url="file://$MODULE_DIR$/../.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../build/libs" />
-    </content>
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="inheritedJdk" />
-  </component>
-</module>
-
--- a/idea/media.iml	Thu Jul 04 06:15:22 2013 -0400
+++ b/idea/media.iml	Thu Jul 04 08:12:16 2013 -0400
@@ -2,15 +2,9 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../modules/media">
-      <sourceFolder url="file://$MODULE_DIR$/../modules/media/jfxmedia/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../modules/media/test/demos/JavaTestApps/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../modules/media/test/perf/JFXMediaSystemTestApp/src" isTestSource="false" />
-    </content>
+    <content url="file://$MODULE_DIR$/../modules/media" />
+    <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="rt-closed" exported="" />
-    <orderEntry type="module" module-name="controls" exported="" />
   </component>
 </module>
 
--- a/idea/rt-closed.iml	Thu Jul 04 06:15:22 2013 -0400
+++ b/idea/rt-closed.iml	Thu Jul 04 08:12:16 2013 -0400
@@ -111,20 +111,8 @@
       <excludeFolder url="file://$MODULE_DIR$/../../rt-closed/javafx-android" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="graphics" />
-    <orderEntry type="module" module-name="web" />
-    <orderEntry type="module" module-name="fxml" />
-    <orderEntry type="module" module-name="media" />
-    <orderEntry type="module-library">
-      <library name="jfxmedia.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../caches/sdk/build/lib/desktop/jfxmedia.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module" module-name="deploy" />
+    <orderEntry type="module" module-name="deploy" exported="" />
+    <orderEntry type="module" module-name="rt" exported="" />
     <orderEntry type="inheritedJdk" />
   </component>
 </module>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idea/rt.iml	Thu Jul 04 08:12:16 2013 -0400
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/..">
+      <excludeFolder url="file://$MODULE_DIR$/../.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../build/libs" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="fxml" exported="" />
+    <orderEntry type="module" module-name="fxpackager" exported="" />
+    <orderEntry type="module" module-name="swt" exported="" />
+    <orderEntry type="module" module-name="swing" exported="" />
+    <orderEntry type="module" module-name="media" exported="" />
+    <orderEntry type="module" module-name="web" exported="" />
+    <orderEntry type="inheritedJdk" />
+  </component>
+</module>
+
--- a/idea/web.iml	Thu Jul 04 06:15:22 2013 -0400
+++ b/idea/web.iml	Thu Jul 04 08:12:16 2013 -0400
@@ -12,7 +12,6 @@
     <orderEntry type="module" module-name="graphics" exported="" />
     <orderEntry type="module" module-name="controls" exported="" />
     <orderEntry type="module" module-name="media" exported="" />
-    <orderEntry type="inheritedJdk" />
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
@@ -22,6 +21,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="inheritedJdk" />
   </component>
 </module>
 
--- a/modules/graphics/.classpath	Thu Jul 04 06:15:22 2013 -0400
+++ b/modules/graphics/.classpath	Thu Jul 04 08:12:16 2013 -0400
@@ -26,9 +26,4 @@
   <classpathentry kind="src" exported="true" path="build/resources/jsl-prism"/>
   <classpathentry kind="src" exported="true" path="/base"/>
   <classpathentry kind="src" exported="true" path="/builders"/>
-  <classpathentry kind="src" exported="true" path="/rt-closed">
-    <attributes>
-      <attribute name="optional" value="true"/>
-    </attributes>
-  </classpathentry>
 </classpath>