From 6abce56ad4eb532ff44db3a7380f01642cb77b92 Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@epfl.ch>
Date: Mon, 11 Oct 2010 08:03:55 +0000
Subject: Updated IntelliJ sample files. no review.

---
 src/intellij/README                |  12 +
 src/intellij/actors.iml.SAMPLE     |   7 +-
 src/intellij/compiler.iml.SAMPLE   |   8 +-
 src/intellij/dbc.iml.SAMPLE        |   8 +-
 src/intellij/library.iml.SAMPLE    |   7 +-
 src/intellij/manual.iml.SAMPLE     |   9 +-
 src/intellij/partest.iml.SAMPLE    |  10 +-
 src/intellij/scala-lang.ipr.SAMPLE | 485 ++-----------------------------------
 src/intellij/scalap.iml.SAMPLE     |   9 +-
 src/intellij/swing.iml.SAMPLE      |   9 +-
 10 files changed, 70 insertions(+), 494 deletions(-)
 create mode 100644 src/intellij/README

(limited to 'src')

diff --git a/src/intellij/README b/src/intellij/README
new file mode 100644
index 0000000000..f24d700889
--- /dev/null
+++ b/src/intellij/README
@@ -0,0 +1,12 @@
+Use IntelliJ IDEA X EAP (http://confluence.jetbrains.net/display/IDEADEV/IDEA+X+EAP)
+a Scala Plugin nightly build (http://confluence.jetbrains.net/display/SCA/Scala+Plugin+Nightly+Builds+for+IDEA+X)
+
+The following steps are required to use IntelliJ IDEA on Scala trunk
+ - Copy the *.iml.SAMPLE / *.ipr.SAMPLE files to *.iml / *.ipr
+ - In IDEA, create a global library named "ant" which contains "ant.jar"
+ - In the Scala Facet of the "library" module, update the path in the command-line
+   argument for "-sourcepath"
+ - In the Project Settings, update the "Version Control" to match your checkout
+
+Known problems
+ - Currently, it's not possible to build the "actors" module in IDEA
diff --git a/src/intellij/actors.iml.SAMPLE b/src/intellij/actors.iml.SAMPLE
index 8902ee2de2..b095d29d7b 100644
--- a/src/intellij/actors.iml.SAMPLE
+++ b/src/intellij/actors.iml.SAMPLE
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="scala" name="Scala">
       <configuration>
         <option name="compilerLibraryLevel" value="Project" />
-        <option name="compilerLibraryName" value="compiler_palo" />
+        <option name="compilerLibraryName" value="compiler-locker" />
+        <option name="maximumHeapSize" value="1536" />
+        <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" />
       </configuration>
     </facet>
   </component>
@@ -16,7 +18,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="library" />
-    <orderEntry type="module" module-name="compiler" />
     <orderEntry type="library" name="lib" level="project" />
   </component>
 </module>
diff --git a/src/intellij/compiler.iml.SAMPLE b/src/intellij/compiler.iml.SAMPLE
index ef3eb9d730..75c7653018 100644
--- a/src/intellij/compiler.iml.SAMPLE
+++ b/src/intellij/compiler.iml.SAMPLE
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="scala" name="Scala">
       <configuration>
         <option name="compilerLibraryLevel" value="Project" />
-        <option name="compilerLibraryName" value="compiler_palo" />
+        <option name="compilerLibraryName" value="compiler-locker" />
+        <option name="maximumHeapSize" value="1536" />
+        <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" />
       </configuration>
     </facet>
   </component>
@@ -15,9 +17,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="library" />
     <orderEntry type="library" name="lib" level="project" />
     <orderEntry type="library" name="ant" level="application" />
-    <orderEntry type="library" name="quicklib" level="project" />
   </component>
 </module>
 
diff --git a/src/intellij/dbc.iml.SAMPLE b/src/intellij/dbc.iml.SAMPLE
index 785cc00cc8..5a6df4cfaa 100644
--- a/src/intellij/dbc.iml.SAMPLE
+++ b/src/intellij/dbc.iml.SAMPLE
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="scala" name="Scala">
       <configuration>
         <option name="compilerLibraryLevel" value="Project" />
-        <option name="compilerLibraryName" value="compiler_palo" />
+        <option name="compilerLibraryName" value="compiler-locker" />
+        <option name="maximumHeapSize" value="1536" />
+        <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" />
       </configuration>
     </facet>
   </component>
@@ -15,9 +17,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="compiler" />
     <orderEntry type="module" module-name="library" />
-    <orderEntry type="library" name="lib" level="project" />
   </component>
 </module>
 
diff --git a/src/intellij/library.iml.SAMPLE b/src/intellij/library.iml.SAMPLE
index 9a8774fa47..a86c0a005c 100644
--- a/src/intellij/library.iml.SAMPLE
+++ b/src/intellij/library.iml.SAMPLE
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="scala" name="Scala">
       <configuration>
         <option name="compilerLibraryLevel" value="Project" />
-        <option name="compilerLibraryName" value="compiler_palo" />
+        <option name="compilerLibraryName" value="compiler-locker" />
+        <option name="compilerOptions" value="-sourcepath /Users/luc/scala/git/src/library" />
+        <option name="maximumHeapSize" value="1536" />
+        <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" />
       </configuration>
     </facet>
   </component>
diff --git a/src/intellij/manual.iml.SAMPLE b/src/intellij/manual.iml.SAMPLE
index e5dc896776..10de797fc4 100644
--- a/src/intellij/manual.iml.SAMPLE
+++ b/src/intellij/manual.iml.SAMPLE
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="scala" name="Scala">
       <configuration>
         <option name="compilerLibraryLevel" value="Project" />
-        <option name="compilerLibraryName" value="compiler_palo" />
+        <option name="compilerLibraryName" value="compiler-locker" />
+        <option name="maximumHeapSize" value="1536" />
+        <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" />
       </configuration>
     </facet>
   </component>
@@ -15,9 +17,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="compiler" />
     <orderEntry type="module" module-name="library" />
-    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="ant" level="application" />
   </component>
 </module>
 
diff --git a/src/intellij/partest.iml.SAMPLE b/src/intellij/partest.iml.SAMPLE
index 36584042e4..98731d980d 100644
--- a/src/intellij/partest.iml.SAMPLE
+++ b/src/intellij/partest.iml.SAMPLE
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="scala" name="Scala">
       <configuration>
         <option name="compilerLibraryLevel" value="Project" />
-        <option name="compilerLibraryName" value="compiler_palo" />
+        <option name="compilerLibraryName" value="compiler-locker" />
+        <option name="maximumHeapSize" value="1536" />
+        <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" />
       </configuration>
     </facet>
   </component>
@@ -15,10 +17,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="actors" />
-    <orderEntry type="module" module-name="compiler" />
     <orderEntry type="module" module-name="library" />
-    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="module" module-name="actors" />
   </component>
 </module>
 
diff --git a/src/intellij/scala-lang.ipr.SAMPLE b/src/intellij/scala-lang.ipr.SAMPLE
index b3964f14f8..6c5a49c644 100644
--- a/src/intellij/scala-lang.ipr.SAMPLE
+++ b/src/intellij/scala-lang.ipr.SAMPLE
@@ -2,50 +2,6 @@
 <project version="4">
   <component name="AntConfiguration">
     <defaultAnt bundledAnt="true" />
-    <buildFile url="file://$PROJECT_DIR$/../../build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <maximumStackSize value="32" />
-      <properties />
-    </buildFile>
-  </component>
-  <component name="BuildJarProjectSettings">
-    <option name="BUILD_JARS_ON_MAKE" value="false" />
-  </component>
-  <component name="CodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <ADDITIONAL_INDENT_OPTIONS fileType="java">
-          <option name="INDENT_SIZE" value="4" />
-          <option name="CONTINUATION_INDENT_SIZE" value="8" />
-          <option name="TAB_SIZE" value="4" />
-          <option name="USE_TAB_CHARACTER" value="false" />
-          <option name="SMART_TABS" value="false" />
-          <option name="LABEL_INDENT_SIZE" value="0" />
-          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-        </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="jsp">
-          <option name="INDENT_SIZE" value="4" />
-          <option name="CONTINUATION_INDENT_SIZE" value="8" />
-          <option name="TAB_SIZE" value="4" />
-          <option name="USE_TAB_CHARACTER" value="false" />
-          <option name="SMART_TABS" value="false" />
-          <option name="LABEL_INDENT_SIZE" value="0" />
-          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-        </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="xml">
-          <option name="INDENT_SIZE" value="4" />
-          <option name="CONTINUATION_INDENT_SIZE" value="8" />
-          <option name="TAB_SIZE" value="4" />
-          <option name="USE_TAB_CHARACTER" value="false" />
-          <option name="SMART_TABS" value="false" />
-          <option name="LABEL_INDENT_SIZE" value="0" />
-          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-        </ADDITIONAL_INDENT_OPTIONS>
-      </value>
-    </option>
   </component>
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
@@ -73,19 +29,7 @@
   <component name="DependencyValidationManager">
     <option name="SKIP_IMPORT_STATEMENTS" value="false" />
   </component>
-  <component name="EclipseCompilerSettings">
-    <option name="GENERATE_NO_WARNINGS" value="true" />
-    <option name="DEPRECATION" value="false" />
-  </component>
-  <component name="EclipseEmbeddedCompilerSettings">
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="true" />
-    <option name="DEPRECATION" value="false" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-  </component>
   <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-  <component name="IdProvider" IDEtalkID="522B472C2EA573563CC2BA93160270BE" />
   <component name="InspectionProjectProfileManager">
     <profiles>
       <profile version="1.0" is_locked="false">
@@ -101,13 +45,9 @@
     <option name="PROJECT_PROFILE" value="Project Default" />
     <option name="USE_PROJECT_PROFILE" value="true" />
     <version value="1.0" />
-    <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="TYPO" />
-      <item index="1" class="java.lang.String" itemvalue="SERVER PROBLEM" />
-      <item index="2" class="java.lang.String" itemvalue="INFO" />
-      <item index="3" class="java.lang.String" itemvalue="WARNING" />
-      <item index="4" class="java.lang.String" itemvalue="ERROR" />
-    </list>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_STRING" value="-source 1.5 -target 1.5" />
   </component>
   <component name="JavadocGenerationManager">
     <option name="OUTPUT_DIRECTORY" />
@@ -247,17 +187,9 @@
       </item>
     </group>
   </component>
-  <component name="ProjectDetails">
-    <option name="projectName" value="scala-lang" />
-  </component>
   <component name="ProjectDictionaryState">
-    <dictionary name="dragos" />
-    <dictionary name="odersky" />
     <dictionary name="luc" />
   </component>
-  <component name="ProjectKey">
-    <option name="state" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk/scala-lang.ipr" />
-  </component>
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/actors.iml" filepath="$PROJECT_DIR$/actors.iml" />
@@ -270,422 +202,45 @@
       <module fileurl="file://$PROJECT_DIR$/swing.iml" filepath="$PROJECT_DIR$/swing.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/../../out" />
-  </component>
-  <component name="ResourceManagerContainer">
-    <option name="myResourceBundles">
-      <value>
-        <list size="0" />
-      </value>
-    </option>
-  </component>
-  <component name="ScalaSettings">
-    <option name="MAXIMUM_HEAP_SIZE" value="1024" />
-    <option name="DEPRECATION" value="false" />
-    <option name="UNCHECKED" value="false" />
+  <component name="ProjectResources">
+    <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ScalacSettings">
-    <option name="MAXIMUM_HEAP_SIZE" value="1536" />
-  </component>
-  <component name="SvnBranchConfigurationManager">
-    <option name="myConfigurationMap">
-      <map>
-        <entry key="$PROJECT_DIR$/../..">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchMap">
-                <map>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" />
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/../../META-INF">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchMap">
-                <map>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" />
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/../../lib">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchMap">
-                <map>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" />
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/../actors">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchMap">
-                <map>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" />
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/../compiler">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchMap">
-                <map>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" />
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/../dbc">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchMap">
-                <map>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" />
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchMap">
-                <map>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" />
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/../library">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchMap">
-                <map>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" />
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/../manual">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchMap">
-                <map>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" />
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/../partest">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchMap">
-                <map>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" />
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/../scalap">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchMap">
-                <map>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" />
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/../swing">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchMap">
-                <map>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" />
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/../../test">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchMap">
-                <map>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                  <entry key="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags">
-                    <value>
-                      <list />
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" />
-                  <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="myVersion" value="124" />
-    <option name="mySupportsUserInfoFilter" value="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/../../out" />
   </component>
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="svn" />
     <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
   </component>
-  <component name="WebServicesPlugin" addRequiredLibraries="true" />
   <component name="libraryTable">
     <library name="lib">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/../../lib/fjbg.jar!/" />
-        <root url="jar://$PROJECT_DIR$/../../lib/msil.jar!/" />
         <root url="jar://$PROJECT_DIR$/../../lib/jline.jar!/" />
         <root url="jar://$PROJECT_DIR$/../../lib/forkjoin.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../../lib/fjbg.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../../lib/msil.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
     </library>
-    <library name="quicklib">
-      <CLASSES>
-        <root url="file://$PROJECT_DIR$/../../build/quick/classes/library" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="quicklib_sbt">
+    <library name="compiler-locker">
       <CLASSES>
-        <root url="file://$PROJECT_DIR$/../../target/quick/ classes/library" />
+        <root url="file://$PROJECT_DIR$/../../build/locker/classes/library" />
+        <root url="file://$PROJECT_DIR$/../../build/locker/classes/compiler" />
+        <root url="jar://$PROJECT_DIR$/../../lib/forkjoin.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../../lib/fjbg.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../../lib/msil.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
     </library>
-    <library name="compiler_palo">
+    <library name="quicklib">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/../../build/palo/lib/scala-library.jar!/" />
-        <root url="jar://$PROJECT_DIR$/../../build/palo/lib/scala-compiler.jar!/" />
-        <root url="jar://$PROJECT_DIR$/../../lib/fjbg.jar!/" />
-        <root url="jar://$PROJECT_DIR$/../../lib/msil.jar!/" />
+        <root url="file://$PROJECT_DIR$/../../build/quick/classes/library" />
       </CLASSES>
       <JAVADOC />
-      <SOURCES />
+      <SOURCES>
+        <root url="file://$PROJECT_DIR$/../library" />
+      </SOURCES>
     </library>
   </component>
 </project>
diff --git a/src/intellij/scalap.iml.SAMPLE b/src/intellij/scalap.iml.SAMPLE
index 37ad637bfc..9473864fbd 100644
--- a/src/intellij/scalap.iml.SAMPLE
+++ b/src/intellij/scalap.iml.SAMPLE
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="scala" name="Scala">
       <configuration>
         <option name="compilerLibraryLevel" value="Project" />
-        <option name="compilerLibraryName" value="compiler_palo" />
+        <option name="compilerLibraryName" value="compiler-locker" />
+        <option name="maximumHeapSize" value="1536" />
+        <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" />
       </configuration>
     </facet>
   </component>
@@ -15,9 +17,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="compiler" />
     <orderEntry type="module" module-name="library" />
-    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="module" module-name="compiler" />
   </component>
 </module>
 
diff --git a/src/intellij/swing.iml.SAMPLE b/src/intellij/swing.iml.SAMPLE
index 56e015496e..e9c4d13b91 100644
--- a/src/intellij/swing.iml.SAMPLE
+++ b/src/intellij/swing.iml.SAMPLE
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="scala" name="Scala">
       <configuration>
         <option name="compilerLibraryLevel" value="Project" />
-        <option name="compilerLibraryName" value="compiler_palo" />
+        <option name="compilerLibraryName" value="compiler-locker" />
+        <option name="maximumHeapSize" value="1536" />
+        <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" />
       </configuration>
     </facet>
   </component>
@@ -15,9 +17,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="compiler" />
     <orderEntry type="module" module-name="library" />
-    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="module" module-name="actors" />
   </component>
 </module>
 
-- 
cgit v1.2.3