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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -61,6 +35,11 @@
+
+
+
+
+
@@ -125,6 +104,13 @@
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -9,10 +25,34 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
-
-
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
-
-
-
-
-
-
http://www.w3.org/1999/xhtml
-
+
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 @@
+
@@ -29,14 +30,17 @@
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
-
+
-
+
@@ -27,9 +27,15 @@
+
+
+
+
+
+
+
-
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 @@
-
+
-
+
@@ -25,9 +25,15 @@
+
+
+
+
+
+
+
-
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 @@
-
+
-
+
@@ -25,9 +25,15 @@
+
+
+
+
+
+
+
-
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 @@
-
+
+
+
-
-
@@ -60,6 +60,12 @@
+
+
+
+
+
+
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
-// 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
-// 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
-// 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
-// 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
-// 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
-// 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
-// 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
-// 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
-// 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 @@
-
+
@@ -22,9 +22,15 @@
+
+
+
+
+
+
+
-
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 @@
-
+
@@ -39,6 +39,12 @@
+
+
+
+
+
+
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 @@
-
+
-
+
@@ -24,9 +24,15 @@
+
+
+
+
+
+
+
-
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 @@
-
+
+
+
-
-
@@ -59,6 +59,12 @@
+
+
+
+
+
+
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 @@
-
+
@@ -19,9 +19,15 @@
+
+
+
+
+
+
+
-
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 @@
-->
+
+ org.specsy
+ specsy-scala_2.9.2
+ 2.1.0
+ test
+
+
+
+ fi.jumi
+ jumi-launcher
+ 0.2.235
+ test
+
net.orfjackal.specsy
specsy
@@ -357,8 +370,8 @@
maven-compiler-plugin
2.3.2
-
- 1.6
+
+ 1.7
diff --git a/project.iml b/project.iml
index 7e528363..790e9f19 100644
--- a/project.iml
+++ b/project.iml
@@ -3,7 +3,7 @@
-
+
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 @@
-
+
-
-
+
+
@@ -27,9 +27,15 @@
+
+
+
+
+
+
+
-