From b94f0fdc037b30b2f608ca216661b0f29c11621a Mon Sep 17 00:00:00 2001
From: Esko Luontola <esko.luontola@gmail.com>
Date: Tue, 25 Dec 2012 15:30:22 +0200
Subject: [PATCH] Upgraded to Java 7, added dependency to Jumi 0.2.235 and
 Specsy 2.1.0

---
 .idea/codeStyleSettings.xml                   | 38 +++++----------
 .idea/compiler.xml                            | 48 +++++++++++++++++--
 .idea/encodings.xml                           | 10 ++++
 .idea/inspectionProfiles/Project_Default.xml  |  5 +-
 .../Maven__fi_jumi_jumi_actors_0_1_196.xml    | 13 +++++
 .../Maven__fi_jumi_jumi_api_0_2_235.xml       | 13 +++++
 .../Maven__fi_jumi_jumi_core_0_2_235.xml      | 13 +++++
 .../Maven__fi_jumi_jumi_launcher_0_2_235.xml  | 13 +++++
 ...scala_lang_scala_compiler_bundle_2_9_2.xml | 10 ++++
 .../Maven__org_specsy_specsy_core_2_1_0.xml   | 13 +++++
 ...n__org_specsy_specsy_scala_2_9_2_2_1_0.xml | 13 +++++
 .idea/misc.xml                                | 24 +---------
 .idea/runConfigurations/Clean_build.xml       |  8 +++-
 .../End_to_end_tests__JRE_7_.xml              | 36 --------------
 .../End_to_end_tests__no_rebuild_.xml         |  4 +-
 .../End_to_end_tests__no_rebuild__JRE_7_.xml  | 36 --------------
 .../runConfigurations/Unit_tests__JRE_7_.xml  | 36 --------------
 dimdwarf-aop/dimdwarf-aop.iml                 | 12 +++--
 .../dimdwarf-api-internal.iml                 | 12 +++--
 dimdwarf-api/dimdwarf-api.iml                 | 12 +++--
 dimdwarf-core/dimdwarf-core.iml               | 12 +++--
 .../orfjackal/dimdwarf/actors/ScalaSpecs.java | 16 -------
 .../orfjackal/dimdwarf/auth/ScalaSpecs.java   | 15 ------
 .../dimdwarf/controller/ScalaSpecs.java       | 15 ------
 .../orfjackal/dimdwarf/domain/ScalaSpecs.java | 17 -------
 .../net/orfjackal/dimdwarf/mq/ScalaSpecs.java | 15 ------
 .../orfjackal/dimdwarf/net/ScalaSpecs.java    | 18 -------
 .../dimdwarf/net/sgs/ScalaSpecs.java          | 15 ------
 .../orfjackal/dimdwarf/server/ScalaSpecs.java | 17 -------
 .../orfjackal/dimdwarf/tasks2/ScalaSpecs.java | 15 ------
 dist/agent/agent.iml                          | 10 +++-
 dist/dimdwarf-dist/dimdwarf-dist.iml          |  8 +++-
 dist/launcher/launcher.iml                    | 12 +++--
 end-to-end-tests/end-to-end-tests.iml         | 12 +++--
 parent/parent.iml                             | 10 +++-
 parent/pom.xml                                | 17 ++++++-
 project.iml                                   |  2 +-
 test-utils/test-utils.iml                     | 14 ++++--
 38 files changed, 266 insertions(+), 343 deletions(-)
 create mode 100644 .idea/libraries/Maven__fi_jumi_jumi_actors_0_1_196.xml
 create mode 100644 .idea/libraries/Maven__fi_jumi_jumi_api_0_2_235.xml
 create mode 100644 .idea/libraries/Maven__fi_jumi_jumi_core_0_2_235.xml
 create mode 100644 .idea/libraries/Maven__fi_jumi_jumi_launcher_0_2_235.xml
 create mode 100644 .idea/libraries/Maven__org_scala_lang_scala_compiler_bundle_2_9_2.xml
 create mode 100644 .idea/libraries/Maven__org_specsy_specsy_core_2_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_specsy_specsy_scala_2_9_2_2_1_0.xml
 delete mode 100644 .idea/runConfigurations/End_to_end_tests__JRE_7_.xml
 delete mode 100644 .idea/runConfigurations/End_to_end_tests__no_rebuild__JRE_7_.xml
 delete mode 100644 .idea/runConfigurations/Unit_tests__JRE_7_.xml
 delete mode 100644 dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/actors/ScalaSpecs.java
 delete mode 100644 dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/auth/ScalaSpecs.java
 delete mode 100644 dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/controller/ScalaSpecs.java
 delete mode 100644 dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/domain/ScalaSpecs.java
 delete mode 100644 dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/mq/ScalaSpecs.java
 delete mode 100644 dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/net/ScalaSpecs.java
 delete mode 100644 dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/net/sgs/ScalaSpecs.java
 delete mode 100644 dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/server/ScalaSpecs.java
 delete mode 100644 dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/tasks2/ScalaSpecs.java

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 88156eb1..343b3dbe 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -25,35 +25,9 @@
         <option name="WHILE_BRACE_FORCE" value="3" />
         <option name="FOR_BRACE_FORCE" value="3" />
         <option name="FIELD_ANNOTATION_WRAP" value="0" />
-        <ScalaCodeStyleSettings>
-          <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="2" />
-          <option name="ADD_FULL_QUALIFIED_IMPORTS" value="true" />
-        </ScalaCodeStyleSettings>
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
         </XML>
-        <ADDITIONAL_INDENT_OPTIONS fileType="clj">
-          <option name="INDENT_SIZE" value="2" />
-          <option name="TAB_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="feature">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="haml">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="rb">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="sass">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="yml">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
         <codeStyleSettings language="ECMA Script Level 4">
           <option name="IF_BRACE_FORCE" value="3" />
           <option name="DOWHILE_BRACE_FORCE" value="3" />
@@ -61,6 +35,11 @@
           <option name="FOR_BRACE_FORCE" value="3" />
           <option name="PARENT_SETTINGS_INSTALLED" value="true" />
         </codeStyleSettings>
+        <codeStyleSettings language="GSP">
+          <indentOptions>
+            <option name="INDENT_SIZE" value="2" />
+          </indentOptions>
+        </codeStyleSettings>
         <codeStyleSettings language="Groovy">
           <option name="BLANK_LINES_AROUND_CLASS" value="0" />
           <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
@@ -125,6 +104,13 @@
             <option name="TAB_SIZE" value="8" />
           </indentOptions>
         </codeStyleSettings>
+        <codeStyleSettings language="ruby">
+          <indentOptions>
+            <option name="CONTINUATION_INDENT_SIZE" value="8" />
+            <option name="TAB_SIZE" value="4" />
+            <option name="USE_RELATIVE_INDENTS" value="false" />
+          </indentOptions>
+        </codeStyleSettings>
       </value>
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ac8e2832..a4a4ae3e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,6 +2,22 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
+    <excludeFromCompile>
+      <directory url="file://$PROJECT_DIR$/test-utils/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/dist/launcher/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/dimdwarf-api-internal/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/end-to-end-tests/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/dimdwarf-aop/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/dimdwarf-api/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/dimdwarf-core/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/dimdwarf-api-internal/target/generated-sources/annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/test-utils/target/generated-sources/annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/dimdwarf-core/target/generated-sources/annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/dist/launcher/target/generated-sources/annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/dimdwarf-aop/target/generated-sources/annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/end-to-end-tests/target/generated-sources/annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/dimdwarf-api/target/generated-sources/annotations" includeSubdirectories="true" />
+    </excludeFromCompile>
     <resourceExtensions>
       <entry name=".+\.(properties|xml|html|dtd|tld)" />
       <entry name=".+\.(gif|png|jpeg|jpg)" />
@@ -9,10 +25,34 @@
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
     </wildcardResourcePatterns>
-    <annotationProcessing enabled="false" useClasspath="true" />
-  </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+      <profile default="false" name="Maven default annotation processors profile" enabled="false">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <processorPath useClasspath="true" />
+        <module name="dimdwarf-aop" />
+        <module name="dimdwarf-api" />
+        <module name="dimdwarf-api-internal" />
+        <module name="dimdwarf-core" />
+        <module name="end-to-end-tests" />
+        <module name="launcher" />
+        <module name="test-utils" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="agent" target="1.7" />
+      <module name="dimdwarf-aop" target="1.7" />
+      <module name="dimdwarf-api" target="1.7" />
+      <module name="dimdwarf-api-internal" target="1.7" />
+      <module name="dimdwarf-core" target="1.7" />
+      <module name="dimdwarf-dist" target="1.7" />
+      <module name="end-to-end-tests" target="1.7" />
+      <module name="launcher" target="1.7" />
+      <module name="parent" target="1.7" />
+      <module name="test-utils" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
 </project>
 
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 47985718..7ecf6749 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,6 +2,16 @@
 <project version="4">
   <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dimdwarf-aop" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dimdwarf-api" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dimdwarf-api-internal" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dimdwarf-core" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dist/agent" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dist/dimdwarf-dist" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dist/launcher" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/end-to-end-tests" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/parent" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/test-utils" charset="UTF-8" />
   </component>
 </project>
 
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index ff6938ab..8ea90996 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -43,10 +43,7 @@
     <inspection_tool class="PointlessArithmeticExpression" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="m_ignoreExpressionsContainingConstants" value="true" />
     </inspection_tool>
-    <inspection_tool class="RawUseOfParameterizedType" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreObjectConstruction" value="true" />
-      <option name="ignoreTypeCasts" value="false" />
-    </inspection_tool>
+    <inspection_tool class="RawUseOfParameterizedType" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="RedundantSuppression" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="RedundantThrowsDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SerialPersistentFieldsWithWrongSignature" enabled="true" level="WARNING" enabled_by_default="true" />
diff --git a/.idea/libraries/Maven__fi_jumi_jumi_actors_0_1_196.xml b/.idea/libraries/Maven__fi_jumi_jumi_actors_0_1_196.xml
new file mode 100644
index 00000000..9a913e4d
--- /dev/null
+++ b/.idea/libraries/Maven__fi_jumi_jumi_actors_0_1_196.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: fi.jumi:jumi-actors:0.1.196">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/fi/jumi/jumi-actors/0.1.196/jumi-actors-0.1.196.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/fi/jumi/jumi-actors/0.1.196/jumi-actors-0.1.196-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/fi/jumi/jumi-actors/0.1.196/jumi-actors-0.1.196-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__fi_jumi_jumi_api_0_2_235.xml b/.idea/libraries/Maven__fi_jumi_jumi_api_0_2_235.xml
new file mode 100644
index 00000000..7db95c86
--- /dev/null
+++ b/.idea/libraries/Maven__fi_jumi_jumi_api_0_2_235.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: fi.jumi:jumi-api:0.2.235">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/fi/jumi/jumi-api/0.2.235/jumi-api-0.2.235.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/fi/jumi/jumi-api/0.2.235/jumi-api-0.2.235-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/fi/jumi/jumi-api/0.2.235/jumi-api-0.2.235-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__fi_jumi_jumi_core_0_2_235.xml b/.idea/libraries/Maven__fi_jumi_jumi_core_0_2_235.xml
new file mode 100644
index 00000000..02aa5b1f
--- /dev/null
+++ b/.idea/libraries/Maven__fi_jumi_jumi_core_0_2_235.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: fi.jumi:jumi-core:0.2.235">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/fi/jumi/jumi-core/0.2.235/jumi-core-0.2.235.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/fi/jumi/jumi-core/0.2.235/jumi-core-0.2.235-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/fi/jumi/jumi-core/0.2.235/jumi-core-0.2.235-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__fi_jumi_jumi_launcher_0_2_235.xml b/.idea/libraries/Maven__fi_jumi_jumi_launcher_0_2_235.xml
new file mode 100644
index 00000000..f3ed8480
--- /dev/null
+++ b/.idea/libraries/Maven__fi_jumi_jumi_launcher_0_2_235.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: fi.jumi:jumi-launcher:0.2.235">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/fi/jumi/jumi-launcher/0.2.235/jumi-launcher-0.2.235.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/fi/jumi/jumi-launcher/0.2.235/jumi-launcher-0.2.235-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/fi/jumi/jumi-launcher/0.2.235/jumi-launcher-0.2.235-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_scala_lang_scala_compiler_bundle_2_9_2.xml b/.idea/libraries/Maven__org_scala_lang_scala_compiler_bundle_2_9_2.xml
new file mode 100644
index 00000000..6f0b58a6
--- /dev/null
+++ b/.idea/libraries/Maven__org_scala_lang_scala_compiler_bundle_2_9_2.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="Maven: org.scala-lang:scala-compiler-bundle:2.9.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.9.2/scala-compiler-2.9.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_specsy_specsy_core_2_1_0.xml b/.idea/libraries/Maven__org_specsy_specsy_core_2_1_0.xml
new file mode 100644
index 00000000..6e90cd18
--- /dev/null
+++ b/.idea/libraries/Maven__org_specsy_specsy_core_2_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.specsy:specsy-core:2.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/specsy/specsy-core/2.1.0/specsy-core-2.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/specsy/specsy-core/2.1.0/specsy-core-2.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/specsy/specsy-core/2.1.0/specsy-core-2.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_specsy_specsy_scala_2_9_2_2_1_0.xml b/.idea/libraries/Maven__org_specsy_specsy_scala_2_9_2_2_1_0.xml
new file mode 100644
index 00000000..146dc136
--- /dev/null
+++ b/.idea/libraries/Maven__org_specsy_specsy_scala_2_9_2_2_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.specsy:specsy-scala_2.9.2:2.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/specsy/specsy-scala_2.9.2/2.1.0/specsy-scala_2.9.2-2.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/specsy/specsy-scala_2.9.2/2.1.0/specsy-scala_2.9.2-2.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/specsy/specsy-scala_2.9.2/2.1.0/specsy-scala_2.9.2-2.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 09c2392c..ba0d3ce3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -45,32 +45,10 @@
       </list>
     </option>
   </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
-    <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
-    <option name="myNullables">
-      <value>
-        <list size="3">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="3">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
diff --git a/.idea/runConfigurations/Clean_build.xml b/.idea/runConfigurations/Clean_build.xml
index 1b090343..206133d2 100644
--- a/.idea/runConfigurations/Clean_build.xml
+++ b/.idea/runConfigurations/Clean_build.xml
@@ -8,6 +8,7 @@
           <option name="localRepository" value="" />
           <option name="mavenHome" value="" />
           <option name="nonRecursive" value="false" />
+          <option name="outputLevel" value="INFO" />
           <option name="pluginUpdatePolicy" value="DO_NOT_UPDATE" />
           <option name="printErrorStackTraces" value="false" />
           <option name="snapshotUpdatePolicy" value="ALWAYS_UPDATE" />
@@ -29,14 +30,17 @@
       </option>
       <option name="myRunnerParameters">
         <MavenRunnerParameters>
+          <option name="profiles">
+            <set />
+          </option>
           <option name="goals">
             <list>
               <option value="clean" />
               <option value="verify" />
             </list>
           </option>
-          <option name="profiles">
-            <set />
+          <option name="profilesMap">
+            <map />
           </option>
           <option name="workingDirPath" value="$PROJECT_DIR$" />
         </MavenRunnerParameters>
diff --git a/.idea/runConfigurations/End_to_end_tests__JRE_7_.xml b/.idea/runConfigurations/End_to_end_tests__JRE_7_.xml
deleted file mode 100644
index 82d76ae6..00000000
--- a/.idea/runConfigurations/End_to_end_tests__JRE_7_.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="End-to-end tests (JRE 7)" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" per_test_coverage_enabled="false" track_test_folders="true" runner="idea">
-      <pattern>
-        <option name="PATTERN" value="net.orfjackal.dimdwarf.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-      <pattern>
-        <option name="PATTERN" value="end2endtests.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <module name="end-to-end-tests" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="C:/Program Files/Java/jdk1.7.0" />
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/end-to-end-tests" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method>
-      <option name="Maven.BeforeRunTask" enabled="true" file="$PROJECT_DIR$/pom.xml" goal="pre-integration-test" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/End_to_end_tests__no_rebuild_.xml b/.idea/runConfigurations/End_to_end_tests__no_rebuild_.xml
index a2b2543a..67523a4f 100644
--- a/.idea/runConfigurations/End_to_end_tests__no_rebuild_.xml
+++ b/.idea/runConfigurations/End_to_end_tests__no_rebuild_.xml
@@ -29,8 +29,6 @@
     <patterns />
     <RunnerSettings RunnerId="Run" />
     <ConfigurationWrapper RunnerId="Run" />
-    <method>
-      <option name="Maven.BeforeRunTask" enabled="false" file="$PROJECT_DIR$/pom.xml" goal="pre-integration-test" />
-    </method>
+    <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/End_to_end_tests__no_rebuild__JRE_7_.xml b/.idea/runConfigurations/End_to_end_tests__no_rebuild__JRE_7_.xml
deleted file mode 100644
index 8b663c3b..00000000
--- a/.idea/runConfigurations/End_to_end_tests__no_rebuild__JRE_7_.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="End-to-end tests (no rebuild, JRE 7)" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" per_test_coverage_enabled="false" track_test_folders="true" runner="idea">
-      <pattern>
-        <option name="PATTERN" value="net.orfjackal.dimdwarf.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-      <pattern>
-        <option name="PATTERN" value="end2endtests.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <module name="end-to-end-tests" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="C:/Program Files/Java/jdk1.7.0" />
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/end-to-end-tests" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method>
-      <option name="Maven.BeforeRunTask" enabled="false" file="$PROJECT_DIR$/pom.xml" goal="pre-integration-test" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Unit_tests__JRE_7_.xml b/.idea/runConfigurations/Unit_tests__JRE_7_.xml
deleted file mode 100644
index eab9af2c..00000000
--- a/.idea/runConfigurations/Unit_tests__JRE_7_.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Unit tests (JRE 7)" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" per_test_coverage_enabled="false" track_test_folders="true" runner="idea">
-      <pattern>
-        <option name="PATTERN" value="net.orfjackal.dimdwarf.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-      <pattern>
-        <option name="PATTERN" value="end2endtests.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <module name="dimdwarf-core" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="C:/Program Files/Java/jdk1.7.0" />
-    <option name="PACKAGE_NAME" value="net.orfjackal.dimdwarf" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -Dsun.io.serialization.extendedDebugInfo=true" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/dimdwarf-core" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
-    </option>
-    <envs />
-    <patterns />
-    <RunnerSettings RunnerId="Cover" />
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Cover" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/dimdwarf-aop/dimdwarf-aop.iml b/dimdwarf-aop/dimdwarf-aop.iml
index 83fb8dd8..4420773f 100644
--- a/dimdwarf-aop/dimdwarf-aop.iml
+++ b/dimdwarf-aop/dimdwarf-aop.iml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module MavenProjectsManager.isMavenModule="true" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
@@ -27,9 +27,15 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-scala_2.9.2:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-core:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-api:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-launcher:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-core:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-actors:0.1.196" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.orfjackal.specsy:specsy:1.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-tools.testing:specs_2.9.1:1.6.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-compiler:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scalatest:scalatest_2.9.1:1.6.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.8.5" level="project" />
diff --git a/dimdwarf-api-internal/dimdwarf-api-internal.iml b/dimdwarf-api-internal/dimdwarf-api-internal.iml
index 354c1e09..af48f3d6 100644
--- a/dimdwarf-api-internal/dimdwarf-api-internal.iml
+++ b/dimdwarf-api-internal/dimdwarf-api-internal.iml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module MavenProjectsManager.isMavenModule="true" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
@@ -25,9 +25,15 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-scala_2.9.2:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-core:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-api:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-launcher:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-core:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-actors:0.1.196" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.orfjackal.specsy:specsy:1.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-tools.testing:specs_2.9.1:1.6.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-compiler:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scalatest:scalatest_2.9.1:1.6.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.8.5" level="project" />
diff --git a/dimdwarf-api/dimdwarf-api.iml b/dimdwarf-api/dimdwarf-api.iml
index 61d8b108..c5ae603f 100644
--- a/dimdwarf-api/dimdwarf-api.iml
+++ b/dimdwarf-api/dimdwarf-api.iml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module MavenProjectsManager.isMavenModule="true" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
@@ -25,9 +25,15 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-scala_2.9.2:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-core:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-api:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-launcher:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-core:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-actors:0.1.196" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.orfjackal.specsy:specsy:1.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-tools.testing:specs_2.9.1:1.6.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-compiler:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scalatest:scalatest_2.9.1:1.6.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.8.5" level="project" />
diff --git a/dimdwarf-core/dimdwarf-core.iml b/dimdwarf-core/dimdwarf-core.iml
index 979b3483..bb8166f2 100644
--- a/dimdwarf-core/dimdwarf-core.iml
+++ b/dimdwarf-core/dimdwarf-core.iml
@@ -10,16 +10,16 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/scala" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/scala" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/target/jdave" />
       <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
@@ -60,6 +60,12 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-scala_2.9.2:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-core:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-api:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-launcher:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-core:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-actors:0.1.196" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.orfjackal.specsy:specsy:1.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-tools.testing:specs_2.9.1:1.6.9" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scalatest:scalatest_2.9.1:1.6.1" level="project" />
diff --git a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/actors/ScalaSpecs.java b/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/actors/ScalaSpecs.java
deleted file mode 100644
index 3baec4a7..00000000
--- a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/actors/ScalaSpecs.java
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright © 2008-2010 Esko Luontola <www.orfjackal.net>
-// This software is released under the Apache License 2.0.
-// The license text is at http://dimdwarf.sourceforge.net/LICENSE
-
-package net.orfjackal.dimdwarf.actors;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-        InstallingActorsSpec.class,
-        ActorStarterSpec.class
-})
-public class ScalaSpecs {
-}
diff --git a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/auth/ScalaSpecs.java b/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/auth/ScalaSpecs.java
deleted file mode 100644
index 0d1b17b0..00000000
--- a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/auth/ScalaSpecs.java
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright © 2008-2010 Esko Luontola <www.orfjackal.net>
-// This software is released under the Apache License 2.0.
-// The license text is at http://dimdwarf.sourceforge.net/LICENSE
-
-package net.orfjackal.dimdwarf.auth;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-        AuthenticatorSpec.class
-})
-public class ScalaSpecs {
-}
diff --git a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/controller/ScalaSpecs.java b/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/controller/ScalaSpecs.java
deleted file mode 100644
index cef0ed3e..00000000
--- a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/controller/ScalaSpecs.java
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright © 2008-2010 Esko Luontola <www.orfjackal.net>
-// This software is released under the Apache License 2.0.
-// The license text is at http://dimdwarf.sourceforge.net/LICENSE
-
-package net.orfjackal.dimdwarf.controller;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-        ControllerHubSpec.class
-})
-public class ScalaSpecs {
-}
diff --git a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/domain/ScalaSpecs.java b/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/domain/ScalaSpecs.java
deleted file mode 100644
index 32be0c5d..00000000
--- a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/domain/ScalaSpecs.java
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright © 2008-2011 Esko Luontola <www.orfjackal.net>
-// This software is released under the Apache License 2.0.
-// The license text is at http://dimdwarf.sourceforge.net/LICENSE
-
-package net.orfjackal.dimdwarf.domain;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-        ClockSpec.class,
-        SessionIdFactorySpec.class,
-        SimpleTimestampSpec.class
-})
-public class ScalaSpecs {
-}
diff --git a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/mq/ScalaSpecs.java b/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/mq/ScalaSpecs.java
deleted file mode 100644
index 99b2cb0e..00000000
--- a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/mq/ScalaSpecs.java
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright © 2008-2010 Esko Luontola <www.orfjackal.net>
-// This software is released under the Apache License 2.0.
-// The license text is at http://dimdwarf.sourceforge.net/LICENSE
-
-package net.orfjackal.dimdwarf.mq;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-        MessageQueueSpec.class
-})
-public class ScalaSpecs {
-}
diff --git a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/net/ScalaSpecs.java b/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/net/ScalaSpecs.java
deleted file mode 100644
index 1a7b208c..00000000
--- a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/net/ScalaSpecs.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright © 2008-2010 Esko Luontola <www.orfjackal.net>
-// This software is released under the Apache License 2.0.
-// The license text is at http://dimdwarf.sourceforge.net/LICENSE
-
-package net.orfjackal.dimdwarf.net;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-        ClientSessionsSpec.class,
-        LoginLogoutSpec.class,
-        NetworkActorSpec.class,
-        SessionMessagesSpec.class
-})
-public class ScalaSpecs {
-}
diff --git a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/net/sgs/ScalaSpecs.java b/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/net/sgs/ScalaSpecs.java
deleted file mode 100644
index e27875ec..00000000
--- a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/net/sgs/ScalaSpecs.java
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright © 2008-2010 Esko Luontola <www.orfjackal.net>
-// This software is released under the Apache License 2.0.
-// The license text is at http://dimdwarf.sourceforge.net/LICENSE
-
-package net.orfjackal.dimdwarf.net.sgs;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-        SimpleSgsProtocolSpec.class
-})
-public class ScalaSpecs {
-}
diff --git a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/server/ScalaSpecs.java b/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/server/ScalaSpecs.java
deleted file mode 100644
index 982f7e65..00000000
--- a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/server/ScalaSpecs.java
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright © 2008-2010 Esko Luontola <www.orfjackal.net>
-// This software is released under the Apache License 2.0.
-// The license text is at http://dimdwarf.sourceforge.net/LICENSE
-
-package net.orfjackal.dimdwarf.server;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-        ApplicationLoadingSpec.class,
-        CommandLineArgumentsSpec.class,
-        ModuleConfigurationSpec.class
-})
-public class ScalaSpecs {
-}
diff --git a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/tasks2/ScalaSpecs.java b/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/tasks2/ScalaSpecs.java
deleted file mode 100644
index 8e5f2b94..00000000
--- a/dimdwarf-core/src/test/java/net/orfjackal/dimdwarf/tasks2/ScalaSpecs.java
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright © 2008-2011 Esko Luontola <www.orfjackal.net>
-// This software is released under the Apache License 2.0.
-// The license text is at http://dimdwarf.sourceforge.net/LICENSE
-
-package net.orfjackal.dimdwarf.tasks2;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-        TaskExecutorSpec.class
-})
-public class ScalaSpecs {
-}
diff --git a/dist/agent/agent.iml b/dist/agent/agent.iml
index 817afd97..23d2efa9 100644
--- a/dist/agent/agent.iml
+++ b/dist/agent/agent.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -22,9 +22,15 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-scala_2.9.2:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-core:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-api:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-launcher:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-core:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-actors:0.1.196" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.orfjackal.specsy:specsy:1.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-tools.testing:specs_2.9.1:1.6.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-compiler:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scalatest:scalatest_2.9.1:1.6.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.8.5" level="project" />
diff --git a/dist/dimdwarf-dist/dimdwarf-dist.iml b/dist/dimdwarf-dist/dimdwarf-dist.iml
index 666f2064..7218fda6 100644
--- a/dist/dimdwarf-dist/dimdwarf-dist.iml
+++ b/dist/dimdwarf-dist/dimdwarf-dist.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -39,6 +39,12 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-scala_2.9.2:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-core:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-api:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-launcher:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-core:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-actors:0.1.196" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.orfjackal.specsy:specsy:1.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-tools.testing:specs_2.9.1:1.6.9" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-compiler:2.9.1" level="project" />
diff --git a/dist/launcher/launcher.iml b/dist/launcher/launcher.iml
index ffb80e57..38d3a099 100644
--- a/dist/launcher/launcher.iml
+++ b/dist/launcher/launcher.iml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
@@ -24,9 +24,15 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-scala_2.9.2:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-core:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-api:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-launcher:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-core:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-actors:0.1.196" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.orfjackal.specsy:specsy:1.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-tools.testing:specs_2.9.1:1.6.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-compiler:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scalatest:scalatest_2.9.1:1.6.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.8.5" level="project" />
diff --git a/end-to-end-tests/end-to-end-tests.iml b/end-to-end-tests/end-to-end-tests.iml
index bcda8bab..3e44c868 100644
--- a/end-to-end-tests/end-to-end-tests.iml
+++ b/end-to-end-tests/end-to-end-tests.iml
@@ -10,15 +10,15 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target/antrun" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/target/dependency-maven-plugin-markers" />
@@ -59,6 +59,12 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-scala_2.9.2:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-core:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-api:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-launcher:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-core:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-actors:0.1.196" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.orfjackal.specsy:specsy:1.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-tools.testing:specs_2.9.1:1.6.9" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-compiler:2.9.1" level="project" />
diff --git a/parent/parent.iml b/parent/parent.iml
index ef4c8c21..dc96d232 100644
--- a/parent/parent.iml
+++ b/parent/parent.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -19,9 +19,15 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-scala_2.9.2:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-core:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-api:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-launcher:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-core:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-actors:0.1.196" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.orfjackal.specsy:specsy:1.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-tools.testing:specs_2.9.1:1.6.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-compiler:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scalatest:scalatest_2.9.1:1.6.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.8.5" level="project" />
diff --git a/parent/pom.xml b/parent/pom.xml
index 43b37701..47146636 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -120,6 +120,19 @@
             -->
         </dependency>
 
+        <dependency>
+            <groupId>org.specsy</groupId>
+            <artifactId>specsy-scala_2.9.2</artifactId>
+            <version>2.1.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <!-- TODO: remove me after Jumi has IDE and Maven support -->
+            <groupId>fi.jumi</groupId>
+            <artifactId>jumi-launcher</artifactId>
+            <version>0.2.235</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>net.orfjackal.specsy</groupId>
             <artifactId>specsy</artifactId>
@@ -357,8 +370,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
 
diff --git a/project.iml b/project.iml
index 7e528363..790e9f19 100644
--- a/project.iml
+++ b/project.iml
@@ -3,7 +3,7 @@
   <component name="FacetManager">
     <facet type="JRUBY" name="JRuby">
       <configuration>
-        <JRUBY_FACET_CONFIG_ID NAME="JRUBY_SDK_NAME" VALUE="jruby-1.6.2-p330" />
+        <JRUBY_FACET_CONFIG_ID NAME="JRUBY_SDK_NAME" VALUE="" />
         <LOAD_PATH number="0" />
         <I18N_FOLDERS number="0" />
       </configuration>
diff --git a/test-utils/test-utils.iml b/test-utils/test-utils.iml
index 8355c6ee..9d35e1ee 100644
--- a/test-utils/test-utils.iml
+++ b/test-utils/test-utils.iml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
@@ -27,9 +27,15 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-scala_2.9.2:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.specsy:specsy-core:2.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-api:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-launcher:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-core:0.2.235" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: fi.jumi:jumi-actors:0.1.196" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.orfjackal.specsy:specsy:1.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-tools.testing:specs_2.9.1:1.6.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-library:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-compiler:2.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.scalatest:scalatest_2.9.1:1.6.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.8.5" level="project" />