diff --git a/.gitignore b/.gitignore
index 201222052..87c71f917 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,7 @@ target
 .project
 .classpath
 .svn
+
+/out
+/.idea/workspace.xml
+/citrus.iws
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 000000000..5b32b2111
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+citrus
\ No newline at end of file
diff --git a/.idea/ant.xml b/.idea/ant.xml
new file mode 100644
index 000000000..2581ca3fe
--- /dev/null
+++ b/.idea/ant.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AntConfiguration">
+    <defaultAnt bundledAnt="true" />
+  </component>
+</project>
+
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 000000000..9178b389f
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+      </value>
+    </option>
+  </component>
+</project>
+
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 000000000..ef7bf86ef
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="?*.properties" />
+      <entry name="?*.xml" />
+      <entry name="?*.gif" />
+      <entry name="?*.png" />
+      <entry name="?*.jpeg" />
+      <entry name="?*.jpg" />
+      <entry name="?*.html" />
+      <entry name="?*.dtd" />
+      <entry name="?*.tld" />
+      <entry name="?*.ftl" />
+    </wildcardResourcePatterns>
+    <annotationProcessing enabled="false" useClasspath="true" />
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />
+  </component>
+</project>
+
diff --git a/.idea/copyright/Alibaba_Open_Sources.xml b/.idea/copyright/Alibaba_Open_Sources.xml
new file mode 100644
index 000000000..e63f314b6
--- /dev/null
+++ b/.idea/copyright/Alibaba_Open_Sources.xml
@@ -0,0 +1,9 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Copyright © 1999 - &amp;#36;{today.year} Alibaba Group Holding Limited.&#10;All rights reserved.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;   http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+    <option name="keyword" value="Copyright" />
+    <option name="allowReplaceKeyword" value="" />
+    <option name="myName" value="Alibaba Open Sources" />
+    <option name="myLocal" value="true" />
+  </copyright>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 000000000..01f497e18
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="CopyrightManager">
+  <settings default="">
+    <module2copyright>
+      <element module="All" copyright="Alibaba Open Sources" />
+    </module2copyright>
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 000000000..e206d70d8
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
new file mode 100644
index 000000000..30ff5cb79
--- /dev/null
+++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: aopalliance:aopalliance:1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__cglib_cglib_nodep_2_2.xml b/.idea/libraries/Maven__cglib_cglib_nodep_2_2.xml
new file mode 100644
index 000000000..a8b52958a
--- /dev/null
+++ b/.idea/libraries/Maven__cglib_cglib_nodep_2_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: cglib:cglib-nodep:2.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib-nodep/2.2/cglib-nodep-2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib-nodep/2.2/cglib-nodep-2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib-nodep/2.2/cglib-nodep-2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_0_9_24.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_0_9_24.xml
new file mode 100644
index 000000000..758010f94
--- /dev/null
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_0_9_24.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-classic:0.9.24">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/0.9.24/logback-classic-0.9.24.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/0.9.24/logback-classic-0.9.24-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/0.9.24/logback-classic-0.9.24-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_0_9_24.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_0_9_24.xml
new file mode 100644
index 000000000..21e51d466
--- /dev/null
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_0_9_24.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-core:0.9.24">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/0.9.24/logback-core-0.9.24.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/0.9.24/logback-core-0.9.24-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/0.9.24/logback-core-0.9.24-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_3.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_3.xml
new file mode 100644
index 000000000..36880019d
--- /dev/null
+++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-codec:commons-codec:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.3/commons-codec-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml
new file mode 100644
index 000000000..3caee7e54
--- /dev/null
+++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-collections:commons-collections:3.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_1.xml
new file mode 100644
index 000000000..e59b3ef50
--- /dev/null
+++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-fileupload:commons-fileupload:1.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_1_4.xml b/.idea/libraries/Maven__commons_io_commons_io_1_4.xml
new file mode 100644
index 000000000..054eda88e
--- /dev/null
+++ b/.idea/libraries/Maven__commons_io_commons_io_1_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-io:commons-io:1.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/1.4/commons-io-1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/1.4/commons-io-1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/1.4/commons-io-1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
new file mode 100644
index 000000000..5e8b8d335
--- /dev/null
+++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-lang:commons-lang:2.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.4/commons-lang-2.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml
new file mode 100644
index 000000000..b770f56aa
--- /dev/null
+++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-logging:commons-logging:1.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
new file mode 100644
index 000000000..14681ee84
--- /dev/null
+++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: dom4j:dom4j:1.6.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ecs_ecs_1_4_2.xml b/.idea/libraries/Maven__ecs_ecs_1_4_2.xml
new file mode 100644
index 000000000..09ee71cb0
--- /dev/null
+++ b/.idea/libraries/Maven__ecs_ecs_1_4_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ecs:ecs:1.4.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ecs/ecs/1.4.2/ecs-1.4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ecs/ecs/1.4.2/ecs-1.4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ecs/ecs/1.4.2/ecs-1.4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__httpunit_httpunit_1_7.xml b/.idea/libraries/Maven__httpunit_httpunit_1_7.xml
new file mode 100644
index 000000000..f25d6aef6
--- /dev/null
+++ b/.idea/libraries/Maven__httpunit_httpunit_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: httpunit:httpunit:1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/httpunit/httpunit/1.7/httpunit-1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/httpunit/httpunit/1.7/httpunit-1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/httpunit/httpunit/1.7/httpunit-1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml
new file mode 100644
index 000000000..180d58756
--- /dev/null
+++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.activation:activation:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_1.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_1.xml
new file mode 100644
index 000000000..2c155f3a1
--- /dev/null
+++ b/.idea/libraries/Maven__javax_mail_mail_1_4_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.mail:mail:1.4.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.1/mail-1.4.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.1/mail-1.4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml b/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
new file mode 100644
index 000000000..679e09a1d
--- /dev/null
+++ b/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.servlet:servlet-api:2.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.5/servlet-api-2.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_8_2.xml b/.idea/libraries/Maven__junit_junit_4_8_2.xml
new file mode 100644
index 000000000..663900e99
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_8_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit:4.8.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.8.2/junit-4.8.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.8.2/junit-4.8.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.8.2/junit-4.8.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_16.xml b/.idea/libraries/Maven__log4j_log4j_1_2_16.xml
new file mode 100644
index 000000000..11837b5f9
--- /dev/null
+++ b/.idea/libraries/Maven__log4j_log4j_1_2_16.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: log4j:log4j:1.2.16">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__nekohtml_nekohtml_1_9_6.xml b/.idea/libraries/Maven__nekohtml_nekohtml_1_9_6.xml
new file mode 100644
index 000000000..d5d6717e2
--- /dev/null
+++ b/.idea/libraries/Maven__nekohtml_nekohtml_1_9_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: nekohtml:nekohtml:1.9.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/nekohtml/nekohtml/1.9.6/nekohtml-1.9.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/nekohtml/nekohtml/1.9.6/nekohtml-1.9.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/nekohtml/nekohtml/1.9.6/nekohtml-1.9.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_jexl_2_0_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_jexl_2_0_1.xml
new file mode 100644
index 000000000..f76ee0471
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_jexl_2_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-jexl:2.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-jexl/2.0.1/commons-jexl-2.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-jexl/2.0.1/commons-jexl-2.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-jexl/2.0.1/commons-jexl-2.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_annotations_api_6_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_annotations_api_6_0_33.xml
new file mode 100644
index 000000000..c888eb3ad
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_annotations_api_6_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat:annotations-api:6.0.33">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/annotations-api/6.0.33/annotations-api-6.0.33.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/annotations-api/6.0.33/annotations-api-6.0.33-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/annotations-api/6.0.33/annotations-api-6.0.33-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_catalina_6_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_catalina_6_0_33.xml
new file mode 100644
index 000000000..00996c065
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_catalina_6_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat:catalina:6.0.33">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/catalina/6.0.33/catalina-6.0.33.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/catalina/6.0.33/catalina-6.0.33-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/catalina/6.0.33/catalina-6.0.33-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_el_api_6_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_el_api_6_0_33.xml
new file mode 100644
index 000000000..3f9b7f2fd
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_el_api_6_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat:el-api:6.0.33">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/el-api/6.0.33/el-api-6.0.33.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/el-api/6.0.33/el-api-6.0.33-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/el-api/6.0.33/el-api-6.0.33-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_jasper_6_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_jasper_6_0_33.xml
new file mode 100644
index 000000000..af9bba916
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_jasper_6_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat:jasper:6.0.33">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/jasper/6.0.33/jasper-6.0.33.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/jasper/6.0.33/jasper-6.0.33-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/jasper/6.0.33/jasper-6.0.33-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_jasper_el_6_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_jasper_el_6_0_33.xml
new file mode 100644
index 000000000..8fe507dcd
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_jasper_el_6_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat:jasper-el:6.0.33">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/jasper-el/6.0.33/jasper-el-6.0.33.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/jasper-el/6.0.33/jasper-el-6.0.33-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/jasper-el/6.0.33/jasper-el-6.0.33-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_jsp_api_6_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_jsp_api_6_0_33.xml
new file mode 100644
index 000000000..fbcdf33ec
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_jsp_api_6_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat:jsp-api:6.0.33">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/jsp-api/6.0.33/jsp-api-6.0.33.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/jsp-api/6.0.33/jsp-api-6.0.33-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/jsp-api/6.0.33/jsp-api-6.0.33-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_juli_6_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_juli_6_0_33.xml
new file mode 100644
index 000000000..ae8476492
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_juli_6_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat:juli:6.0.33">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/juli/6.0.33/juli-6.0.33.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/juli/6.0.33/juli-6.0.33-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/juli/6.0.33/juli-6.0.33-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_servlet_api_6_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_servlet_api_6_0_33.xml
new file mode 100644
index 000000000..58a6f585a
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_servlet_api_6_0_33.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat:servlet-api:6.0.33">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/servlet-api/6.0.33/servlet-api-6.0.33.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/servlet-api/6.0.33/servlet-api-6.0.33-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/servlet-api/6.0.33/servlet-api-6.0.33-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_velocity_velocity_1_6_4.xml b/.idea/libraries/Maven__org_apache_velocity_velocity_1_6_4.xml
new file mode 100644
index 000000000..319a79f66
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_velocity_velocity_1_6_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.velocity:velocity:1.6.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity/1.6.4/velocity-1.6.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity/1.6.4/velocity-1.6.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity/1.6.4/velocity-1.6.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_all_1_6_3.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_all_1_6_3.xml
new file mode 100644
index 000000000..05827359d
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_all_1_6_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.groovy:groovy-all:1.6.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/1.6.3/groovy-all-1.6.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/1.6.3/groovy-all-1.6.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/1.6.3/groovy-all-1.6.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_easymock_easymock_3_0.xml b/.idea/libraries/Maven__org_easymock_easymock_3_0.xml
new file mode 100644
index 000000000..d15ecb038
--- /dev/null
+++ b/.idea/libraries/Maven__org_easymock_easymock_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.easymock:easymock:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/easymock/easymock/3.0/easymock-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/easymock/easymock/3.0/easymock-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/easymock/easymock/3.0/easymock-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_easymock_easymockclassextension_3_0.xml b/.idea/libraries/Maven__org_easymock_easymockclassextension_3_0.xml
new file mode 100644
index 000000000..7f9093b3d
--- /dev/null
+++ b/.idea/libraries/Maven__org_easymock_easymockclassextension_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.easymock:easymockclassextension:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/easymock/easymockclassextension/3.0/easymockclassextension-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/easymock/easymockclassextension/3.0/easymockclassextension-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/easymock/easymockclassextension/3.0/easymockclassextension-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_3_3_1.xml b/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_3_3_1.xml
new file mode 100644
index 000000000..4c2580666
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_3_3_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jdt.core.compiler:ecj:3.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jdt/core/compiler/ecj/3.3.1/ecj-3.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jdt/core/compiler/ecj/3.3.1/ecj-3.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jdt/core/compiler/ecj/3.3.1/ecj-3.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_16.xml b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_16.xml
new file mode 100644
index 000000000..165c734a1
--- /dev/null
+++ b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_16.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.freemarker:freemarker:2.3.16">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.16/freemarker-2.3.16.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.16/freemarker-2.3.16-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.16/freemarker-2.3.16-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
new file mode 100644
index 000000000..acdf44300
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-core:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml
new file mode 100644
index 000000000..010812aef
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-library:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jvnet_mock_javamail_mock_javamail_1_7.xml b/.idea/libraries/Maven__org_jvnet_mock_javamail_mock_javamail_1_7.xml
new file mode 100644
index 000000000..37aa9ff62
--- /dev/null
+++ b/.idea/libraries/Maven__org_jvnet_mock_javamail_mock_javamail_1_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jvnet.mock-javamail:mock-javamail:1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jvnet/mock-javamail/mock-javamail/1.7/mock-javamail-1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jvnet/mock-javamail/mock-javamail/1.7/mock-javamail-1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jvnet/mock-javamail/mock-javamail/1.7/mock-javamail-1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml
new file mode 100644
index 000000000..74d2abc6f
--- /dev/null
+++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.objenesis:objenesis:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.2/objenesis-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.2/objenesis-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.2/objenesis-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_6_1.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_6_1.xml
new file mode 100644
index 000000000..55545f247
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_6_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:jcl-over-slf4j:1.6.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_1.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_1.xml
new file mode 100644
index 000000000..38036e9fd
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-api:1.6.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_6_1.xml b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_6_1.xml
new file mode 100644
index 000000000..2fbfdab3b
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_6_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-log4j12:1.6.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_2_5_6_SEC03.xml b/.idea/libraries/Maven__org_springframework_spring_aop_2_5_6_SEC03.xml
new file mode 100644
index 000000000..b0ff23d89
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_aop_2_5_6_SEC03.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-aop:2.5.6.SEC03">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/2.5.6.SEC03/spring-aop-2.5.6.SEC03.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/2.5.6.SEC03/spring-aop-2.5.6.SEC03-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/2.5.6.SEC03/spring-aop-2.5.6.SEC03-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_2_5_6_SEC03.xml b/.idea/libraries/Maven__org_springframework_spring_beans_2_5_6_SEC03.xml
new file mode 100644
index 000000000..2980b172c
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_beans_2_5_6_SEC03.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-beans:2.5.6.SEC03">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/2.5.6.SEC03/spring-beans-2.5.6.SEC03.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/2.5.6.SEC03/spring-beans-2.5.6.SEC03-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/2.5.6.SEC03/spring-beans-2.5.6.SEC03-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_2_5_6_SEC03.xml b/.idea/libraries/Maven__org_springframework_spring_context_2_5_6_SEC03.xml
new file mode 100644
index 000000000..810b059ea
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_context_2_5_6_SEC03.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-context:2.5.6.SEC03">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/2.5.6.SEC03/spring-context-2.5.6.SEC03.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/2.5.6.SEC03/spring-context-2.5.6.SEC03-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/2.5.6.SEC03/spring-context-2.5.6.SEC03-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_2_5_6_SEC03.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_2_5_6_SEC03.xml
new file mode 100644
index 000000000..d0a08d656
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_context_support_2_5_6_SEC03.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-context-support:2.5.6.SEC03">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/2.5.6.SEC03/spring-context-support-2.5.6.SEC03.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/2.5.6.SEC03/spring-context-support-2.5.6.SEC03-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/2.5.6.SEC03/spring-context-support-2.5.6.SEC03-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_core_2_5_6_SEC03.xml b/.idea/libraries/Maven__org_springframework_spring_core_2_5_6_SEC03.xml
new file mode 100644
index 000000000..245c5edba
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_core_2_5_6_SEC03.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-core:2.5.6.SEC03">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/2.5.6.SEC03/spring-core-2.5.6.SEC03.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/2.5.6.SEC03/spring-core-2.5.6.SEC03-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/2.5.6.SEC03/spring-core-2.5.6.SEC03-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_2_5_6_SEC03.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_2_5_6_SEC03.xml
new file mode 100644
index 000000000..c40f8947c
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_2_5_6_SEC03.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/2.5.6.SEC03/spring-jdbc-2.5.6.SEC03.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/2.5.6.SEC03/spring-jdbc-2.5.6.SEC03-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/2.5.6.SEC03/spring-jdbc-2.5.6.SEC03-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_2_5_6_SEC03.xml b/.idea/libraries/Maven__org_springframework_spring_orm_2_5_6_SEC03.xml
new file mode 100644
index 000000000..518af3671
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_orm_2_5_6_SEC03.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-orm:2.5.6.SEC03">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/2.5.6.SEC03/spring-orm-2.5.6.SEC03.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/2.5.6.SEC03/spring-orm-2.5.6.SEC03-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/2.5.6.SEC03/spring-orm-2.5.6.SEC03-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_test_2_5_6_SEC03.xml b/.idea/libraries/Maven__org_springframework_spring_test_2_5_6_SEC03.xml
new file mode 100644
index 000000000..a3b0fe889
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_test_2_5_6_SEC03.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-test:2.5.6.SEC03">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/2.5.6.SEC03/spring-test-2.5.6.SEC03.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/2.5.6.SEC03/spring-test-2.5.6.SEC03-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/2.5.6.SEC03/spring-test-2.5.6.SEC03-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_2_5_6_SEC03.xml b/.idea/libraries/Maven__org_springframework_spring_tx_2_5_6_SEC03.xml
new file mode 100644
index 000000000..724646df2
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_tx_2_5_6_SEC03.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-tx:2.5.6.SEC03">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/2.5.6.SEC03/spring-tx-2.5.6.SEC03.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/2.5.6.SEC03/spring-tx-2.5.6.SEC03-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/2.5.6.SEC03/spring-tx-2.5.6.SEC03-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_web_2_5_6_SEC03.xml b/.idea/libraries/Maven__org_springframework_spring_web_2_5_6_SEC03.xml
new file mode 100644
index 000000000..21ddd72c0
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_web_2_5_6_SEC03.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-web:2.5.6.SEC03">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/2.5.6.SEC03/spring-web-2.5.6.SEC03.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/2.5.6.SEC03/spring-web-2.5.6.SEC03-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/2.5.6.SEC03/spring-web-2.5.6.SEC03-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_2_5_6_SEC03.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_2_5_6_SEC03.xml
new file mode 100644
index 000000000..c1fd068c7
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_2_5_6_SEC03.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/2.5.6.SEC03/spring-webmvc-2.5.6.SEC03.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/2.5.6.SEC03/spring-webmvc-2.5.6.SEC03-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/2.5.6.SEC03/spring-webmvc-2.5.6.SEC03-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__oro_oro_2_0_8.xml b/.idea/libraries/Maven__oro_oro_2_0_8.xml
new file mode 100644
index 000000000..25203a04f
--- /dev/null
+++ b/.idea/libraries/Maven__oro_oro_2_0_8.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: oro:oro:2.0.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/oro/oro/2.0.8/oro-2.0.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/oro/oro/2.0.8/oro-2.0.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/oro/oro/2.0.8/oro-2.0.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__rhino_js_1_7R1.xml b/.idea/libraries/Maven__rhino_js_1_7R1.xml
new file mode 100644
index 000000000..f01dbf8ea
--- /dev/null
+++ b/.idea/libraries/Maven__rhino_js_1_7R1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: rhino:js:1.7R1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/rhino/js/1.7R1/js-1.7R1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/rhino/js/1.7R1/js-1.7R1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/rhino/js/1.7R1/js-1.7R1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xalan_serializer_2_7_1.xml b/.idea/libraries/Maven__xalan_serializer_2_7_1.xml
new file mode 100644
index 000000000..8891e3c18
--- /dev/null
+++ b/.idea/libraries/Maven__xalan_serializer_2_7_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: xalan:serializer:2.7.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/xalan/serializer/2.7.1/serializer-2.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/xalan/serializer/2.7.1/serializer-2.7.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/xalan/serializer/2.7.1/serializer-2.7.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xalan_xalan_2_7_1.xml b/.idea/libraries/Maven__xalan_xalan_2_7_1.xml
new file mode 100644
index 000000000..4149f4f6c
--- /dev/null
+++ b/.idea/libraries/Maven__xalan_xalan_2_7_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: xalan:xalan:2.7.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/xalan/xalan/2.7.1/xalan-2.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/xalan/xalan/2.7.1/xalan-2.7.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml b/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
new file mode 100644
index 000000000..19d39dba8
--- /dev/null
+++ b/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: xerces:xercesImpl:2.9.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 000000000..175da4880
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CfmlProjectConfiguration">
+    <mappings2>
+      <CfmlMappingsConfig />
+    </mappings2>
+    <mappings>
+      <CfmlMappingsConfig />
+    </mappings>
+  </component>
+  <component name="IdProvider" IDEtalkID="0C58EF44EB787474CECA7A0005D550ED" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectDictionaryState">
+    <dictionary name="baobao" />
+  </component>
+  <component name="ProjectInspectionProfilesVisibleTreeState">
+    <entry key="Project Default">
+      <profile-state>
+        <expanded-state>
+          <State>
+            <id />
+          </State>
+        </expanded-state>
+        <selected-state>
+          <State>
+            <id>Abstraction issues</id>
+          </State>
+        </selected-state>
+      </profile-state>
+    </entry>
+  </component>
+  <component name="ProjectKey">
+    <option name="state" value="git@github.com:webx/citrus.git" />
+  </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.7" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+  <component name="WebServicesPlugin" addRequiredLibraries="true" />
+</project>
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 000000000..b6420caae
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/common/expr/citrus-common-expr.iml" filepath="$PROJECT_DIR$/common/expr/citrus-common-expr.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common/generictype/citrus-common-generictype.iml" filepath="$PROJECT_DIR$/common/generictype/citrus-common-generictype.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common/hessian/citrus-common-hessian.iml" filepath="$PROJECT_DIR$/common/hessian/citrus-common-hessian.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common/logconfig/citrus-common-logconfig.iml" filepath="$PROJECT_DIR$/common/logconfig/citrus-common-logconfig.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common/springext/citrus-common-springext.iml" filepath="$PROJECT_DIR$/common/springext/citrus-common-springext.iml" />
+      <module fileurl="file://$PROJECT_DIR$/common/util/citrus-common-util.iml" filepath="$PROJECT_DIR$/common/util/citrus-common-util.iml" />
+      <module fileurl="file://$PROJECT_DIR$/citrus-parent.iml" filepath="$PROJECT_DIR$/citrus-parent.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/base/citrus-service-base.iml" filepath="$PROJECT_DIR$/service/base/citrus-service-base.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/configuration/citrus-service-configuration.iml" filepath="$PROJECT_DIR$/service/configuration/citrus-service-configuration.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/dataresolver/citrus-service-dataresolver.iml" filepath="$PROJECT_DIR$/service/dataresolver/citrus-service-dataresolver.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/form/citrus-service-form.iml" filepath="$PROJECT_DIR$/service/form/citrus-service-form.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/freemarker/citrus-service-freemarker.iml" filepath="$PROJECT_DIR$/service/freemarker/citrus-service-freemarker.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/jsp/citrus-service-jsp.iml" filepath="$PROJECT_DIR$/service/jsp/citrus-service-jsp.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/mail/citrus-service-mail.iml" filepath="$PROJECT_DIR$/service/mail/citrus-service-mail.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/mappingrule/citrus-service-mappingrule.iml" filepath="$PROJECT_DIR$/service/mappingrule/citrus-service-mappingrule.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/moduleloader/citrus-service-moduleloader.iml" filepath="$PROJECT_DIR$/service/moduleloader/citrus-service-moduleloader.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/pipeline/citrus-service-pipeline.iml" filepath="$PROJECT_DIR$/service/pipeline/citrus-service-pipeline.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/pull/citrus-service-pull.iml" filepath="$PROJECT_DIR$/service/pull/citrus-service-pull.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/requestcontext/citrus-service-requestcontext.iml" filepath="$PROJECT_DIR$/service/requestcontext/citrus-service-requestcontext.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/resource/citrus-service-resource.iml" filepath="$PROJECT_DIR$/service/resource/citrus-service-resource.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/template/citrus-service-template.iml" filepath="$PROJECT_DIR$/service/template/citrus-service-template.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/upload/citrus-service-upload.iml" filepath="$PROJECT_DIR$/service/upload/citrus-service-upload.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/uribroker/citrus-service-uribroker.iml" filepath="$PROJECT_DIR$/service/uribroker/citrus-service-uribroker.iml" />
+      <module fileurl="file://$PROJECT_DIR$/service/velocity/citrus-service-velocity.iml" filepath="$PROJECT_DIR$/service/velocity/citrus-service-velocity.iml" />
+      <module fileurl="file://$PROJECT_DIR$/dist/test/citrus-test-all.iml" filepath="$PROJECT_DIR$/dist/test/citrus-test-all.iml" />
+      <module fileurl="file://$PROJECT_DIR$/test/util/citrus-test-util.iml" filepath="$PROJECT_DIR$/test/util/citrus-test-util.iml" />
+      <module fileurl="file://$PROJECT_DIR$/test/webx/citrus-test-webx.iml" filepath="$PROJECT_DIR$/test/webx/citrus-test-webx.iml" />
+      <module fileurl="file://$PROJECT_DIR$/dist/webx/citrus-webx-all.iml" filepath="$PROJECT_DIR$/dist/webx/citrus-webx-all.iml" />
+      <module fileurl="file://$PROJECT_DIR$/webx/dev/citrus-webx-dev.iml" filepath="$PROJECT_DIR$/webx/dev/citrus-webx-dev.iml" />
+      <module fileurl="file://$PROJECT_DIR$/webx/framework/citrus-webx-framework.iml" filepath="$PROJECT_DIR$/webx/framework/citrus-webx-framework.iml" />
+      <module fileurl="file://$PROJECT_DIR$/webx/turbine/citrus-webx-turbine.iml" filepath="$PROJECT_DIR$/webx/turbine/citrus-webx-turbine.iml" />
+    </modules>
+  </component>
+</project>
+
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
new file mode 100644
index 000000000..922003b84
--- /dev/null
+++ b/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 000000000..3b0002030
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
+
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..c80f2198b
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
+
diff --git a/citrus-parent.iml b/citrus-parent.iml
new file mode 100644
index 000000000..80877d898
--- /dev/null
+++ b/citrus-parent.iml
@@ -0,0 +1,16 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+  </component>
+</module>
+
diff --git a/common/expr/citrus-common-expr.iml b/common/expr/citrus-common-expr.iml
new file mode 100644
index 000000000..b307089b1
--- /dev/null
+++ b/common/expr/citrus-common-expr.iml
@@ -0,0 +1,39 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <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" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl:2.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+  </component>
+</module>
+
diff --git a/common/generictype/citrus-common-generictype.iml b/common/generictype/citrus-common-generictype.iml
new file mode 100644
index 000000000..f7cf60dd6
--- /dev/null
+++ b/common/generictype/citrus-common-generictype.iml
@@ -0,0 +1,37 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <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" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+  </component>
+</module>
+
diff --git a/common/hessian/citrus-common-hessian.iml b/common/hessian/citrus-common-hessian.iml
new file mode 100644
index 000000000..2e404a28c
--- /dev/null
+++ b/common/hessian/citrus-common-hessian.iml
@@ -0,0 +1,18 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+  </component>
+</module>
+
diff --git a/common/logconfig/citrus-common-logconfig.iml b/common/logconfig/citrus-common-logconfig.iml
new file mode 100644
index 000000000..d96e98dfe
--- /dev/null
+++ b/common/logconfig/citrus-common-logconfig.iml
@@ -0,0 +1,30 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.6.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+  </component>
+</module>
+
diff --git a/common/springext/citrus-common-springext.iml b/common/springext/citrus-common-springext.iml
new file mode 100644
index 000000000..37aa54b26
--- /dev/null
+++ b/common/springext/citrus-common-springext.iml
@@ -0,0 +1,53 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+  </component>
+</module>
+
diff --git a/common/util/citrus-common-util.iml b/common/util/citrus-common-util.iml
new file mode 100644
index 000000000..ae2dede22
--- /dev/null
+++ b/common/util/citrus-common-util.iml
@@ -0,0 +1,39 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: oro:oro:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" scope="TEST" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+  </component>
+</module>
+
diff --git a/dist/test/citrus-test-all.iml b/dist/test/citrus-test-all.iml
new file mode 100644
index 000000000..a21ad9413
--- /dev/null
+++ b/dist/test/citrus-test-all.iml
@@ -0,0 +1,86 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-webx-all" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-expr" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl:2.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-service-dataresolver" />
+    <orderEntry type="module" module-name="citrus-service-form" />
+    <orderEntry type="library" name="Maven: ecs:ecs:1.4.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-service-resource" />
+    <orderEntry type="module" module-name="citrus-service-requestcontext" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-service-pull" />
+    <orderEntry type="module" module-name="citrus-service-pipeline" />
+    <orderEntry type="module" module-name="citrus-service-mappingrule" />
+    <orderEntry type="module" module-name="citrus-service-template" />
+    <orderEntry type="module" module-name="citrus-service-moduleloader" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.groovy:groovy-all:1.6.3" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="module" module-name="citrus-service-jsp" />
+    <orderEntry type="module" module-name="citrus-service-velocity" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.6.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+    <orderEntry type="module" module-name="citrus-service-freemarker" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.16" level="project" />
+    <orderEntry type="module" module-name="citrus-service-uribroker" />
+    <orderEntry type="module" module-name="citrus-service-mail" />
+    <orderEntry type="module" module-name="citrus-webx-framework" />
+    <orderEntry type="module" module-name="citrus-webx-turbine" />
+    <orderEntry type="module" module-name="citrus-webx-dev" />
+    <orderEntry type="module" module-name="citrus-test-webx" />
+    <orderEntry type="module" module-name="citrus-test-util" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:2.5.6.SEC03" level="project" />
+  </component>
+</module>
+
diff --git a/dist/webx/citrus-webx-all.iml b/dist/webx/citrus-webx-all.iml
new file mode 100644
index 000000000..f2b023d1d
--- /dev/null
+++ b/dist/webx/citrus-webx-all.iml
@@ -0,0 +1,83 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-expr" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl:2.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-service-dataresolver" />
+    <orderEntry type="module" module-name="citrus-service-form" />
+    <orderEntry type="library" name="Maven: ecs:ecs:1.4.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-service-resource" />
+    <orderEntry type="module" module-name="citrus-service-requestcontext" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-service-pull" />
+    <orderEntry type="module" module-name="citrus-service-pipeline" />
+    <orderEntry type="module" module-name="citrus-service-mappingrule" />
+    <orderEntry type="module" module-name="citrus-service-template" />
+    <orderEntry type="module" module-name="citrus-service-moduleloader" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.groovy:groovy-all:1.6.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-jsp" />
+    <orderEntry type="module" module-name="citrus-service-velocity" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.6.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+    <orderEntry type="module" module-name="citrus-service-freemarker" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.16" level="project" />
+    <orderEntry type="module" module-name="citrus-service-uribroker" />
+    <orderEntry type="module" module-name="citrus-service-mail" />
+    <orderEntry type="module" module-name="citrus-webx-framework" />
+    <orderEntry type="module" module-name="citrus-webx-turbine" />
+    <orderEntry type="module" module-name="citrus-webx-dev" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.activation:activation:1.1" level="project" />
+  </component>
+</module>
+
diff --git a/pom.xml b/pom.xml
index a939c1f5c..8ade22624 100644
--- a/pom.xml
+++ b/pom.xml
@@ -572,7 +572,7 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.6</source>
+                    <source>${java.version}</source>
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
diff --git a/service/base/citrus-service-base.iml b/service/base/citrus-service-base.iml
new file mode 100644
index 000000000..980addf7c
--- /dev/null
+++ b/service/base/citrus-service-base.iml
@@ -0,0 +1,53 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+  </component>
+</module>
+
diff --git a/service/configuration/citrus-service-configuration.iml b/service/configuration/citrus-service-configuration.iml
new file mode 100644
index 000000000..81bf10932
--- /dev/null
+++ b/service/configuration/citrus-service-configuration.iml
@@ -0,0 +1,55 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+  </component>
+</module>
+
diff --git a/service/dataresolver/citrus-service-dataresolver.iml b/service/dataresolver/citrus-service-dataresolver.iml
new file mode 100644
index 000000000..82fdc0759
--- /dev/null
+++ b/service/dataresolver/citrus-service-dataresolver.iml
@@ -0,0 +1,54 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+  </component>
+</module>
+
diff --git a/service/form/citrus-service-form.iml b/service/form/citrus-service-form.iml
new file mode 100644
index 000000000..1cacfb28a
--- /dev/null
+++ b/service/form/citrus-service-form.iml
@@ -0,0 +1,66 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" name="Maven: ecs:ecs:1.4.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-common-expr" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl:2.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-service-resource" />
+    <orderEntry type="module" module-name="citrus-service-requestcontext" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-service-pull" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+  </component>
+</module>
+
diff --git a/service/freemarker/citrus-service-freemarker.iml b/service/freemarker/citrus-service-freemarker.iml
new file mode 100644
index 000000000..5a5eb53e1
--- /dev/null
+++ b/service/freemarker/citrus-service-freemarker.iml
@@ -0,0 +1,58 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-template" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-service-resource" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.16" level="project" />
+  </component>
+</module>
+
diff --git a/service/jsp/citrus-service-jsp.iml b/service/jsp/citrus-service-jsp.iml
new file mode 100644
index 000000000..41c9dd487
--- /dev/null
+++ b/service/jsp/citrus-service-jsp.iml
@@ -0,0 +1,72 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-resource" />
+    <orderEntry type="module" module-name="citrus-service-requestcontext" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-service-template" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.tomcat:jasper:6.0.33" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.tomcat:servlet-api:6.0.33" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.tomcat:juli:6.0.33" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.tomcat:jsp-api:6.0.33" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.tomcat:el-api:6.0.33" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.tomcat:catalina:6.0.33" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.tomcat:annotations-api:6.0.33" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jdt.core.compiler:ecj:3.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.tomcat:jasper-el:6.0.33" level="project" />
+  </component>
+</module>
+
diff --git a/service/mail/citrus-service-mail.iml b/service/mail/citrus-service-mail.iml
new file mode 100644
index 000000000..62336f0b1
--- /dev/null
+++ b/service/mail/citrus-service-mail.iml
@@ -0,0 +1,75 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-resource" />
+    <orderEntry type="module" module-name="citrus-service-pull" />
+    <orderEntry type="module" module-name="citrus-service-requestcontext" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-service-template" />
+    <orderEntry type="module" module-name="citrus-service-velocity" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.velocity:velocity:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: oro:oro:2.0.8" level="project" />
+    <orderEntry type="module" module-name="citrus-service-freemarker" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.freemarker:freemarker:2.3.16" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.mail:mail:1.4.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.jvnet.mock-javamail:mock-javamail:1.7" level="project" />
+  </component>
+</module>
+
diff --git a/service/mappingrule/citrus-service-mappingrule.iml b/service/mappingrule/citrus-service-mappingrule.iml
new file mode 100644
index 000000000..73fc53f63
--- /dev/null
+++ b/service/mappingrule/citrus-service-mappingrule.iml
@@ -0,0 +1,67 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-resource" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="module" module-name="citrus-service-template" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-service-moduleloader" />
+    <orderEntry type="module" module-name="citrus-service-requestcontext" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-service-dataresolver" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.groovy:groovy-all:1.6.3" level="project" />
+  </component>
+</module>
+
diff --git a/service/moduleloader/citrus-service-moduleloader.iml b/service/moduleloader/citrus-service-moduleloader.iml
new file mode 100644
index 000000000..f069f362f
--- /dev/null
+++ b/service/moduleloader/citrus-service-moduleloader.iml
@@ -0,0 +1,64 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-requestcontext" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-service-dataresolver" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.groovy:groovy-all:1.6.3" level="project" />
+  </component>
+</module>
+
diff --git a/service/pipeline/citrus-service-pipeline.iml b/service/pipeline/citrus-service-pipeline.iml
new file mode 100644
index 000000000..92c4011da
--- /dev/null
+++ b/service/pipeline/citrus-service-pipeline.iml
@@ -0,0 +1,57 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="module" module-name="citrus-common-expr" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl:2.0.1" level="project" />
+  </component>
+</module>
+
diff --git a/service/pull/citrus-service-pull.iml b/service/pull/citrus-service-pull.iml
new file mode 100644
index 000000000..dabc25fc3
--- /dev/null
+++ b/service/pull/citrus-service-pull.iml
@@ -0,0 +1,62 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-requestcontext" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+  </component>
+</module>
+
diff --git a/service/requestcontext/citrus-service-requestcontext.iml b/service/requestcontext/citrus-service-requestcontext.iml
new file mode 100644
index 000000000..664605a37
--- /dev/null
+++ b/service/requestcontext/citrus-service-requestcontext.iml
@@ -0,0 +1,60 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+  </component>
+</module>
+
diff --git a/service/resource/citrus-service-resource.iml b/service/resource/citrus-service-resource.iml
new file mode 100644
index 000000000..1f213135e
--- /dev/null
+++ b/service/resource/citrus-service-resource.iml
@@ -0,0 +1,55 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+  </component>
+</module>
+
diff --git a/service/template/citrus-service-template.iml b/service/template/citrus-service-template.iml
new file mode 100644
index 000000000..3734ba3e9
--- /dev/null
+++ b/service/template/citrus-service-template.iml
@@ -0,0 +1,55 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+  </component>
+</module>
+
diff --git a/service/upload/citrus-service-upload.iml b/service/upload/citrus-service-upload.iml
new file mode 100644
index 000000000..d66da2584
--- /dev/null
+++ b/service/upload/citrus-service-upload.iml
@@ -0,0 +1,56 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+  </component>
+</module>
+
diff --git a/service/uribroker/citrus-service-uribroker.iml b/service/uribroker/citrus-service-uribroker.iml
new file mode 100644
index 000000000..cb52f5b10
--- /dev/null
+++ b/service/uribroker/citrus-service-uribroker.iml
@@ -0,0 +1,65 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-resource" />
+    <orderEntry type="module" module-name="citrus-service-pull" scope="PROVIDED" />
+    <orderEntry type="module" module-name="citrus-service-requestcontext" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="module" module-name="citrus-service-template" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+  </component>
+</module>
+
diff --git a/service/velocity/citrus-service-velocity.iml b/service/velocity/citrus-service-velocity.iml
new file mode 100644
index 000000000..e634ae4d9
--- /dev/null
+++ b/service/velocity/citrus-service-velocity.iml
@@ -0,0 +1,62 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-template" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-service-resource" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.6.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+  </component>
+</module>
+
diff --git a/test/util/citrus-test-util.iml b/test/util/citrus-test-util.iml
new file mode 100644
index 000000000..10adf5f8f
--- /dev/null
+++ b/test/util/citrus-test-util.iml
@@ -0,0 +1,36 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+  </component>
+</module>
+
diff --git a/test/webx/citrus-test-webx.iml b/test/webx/citrus-test-webx.iml
new file mode 100644
index 000000000..ea2566515
--- /dev/null
+++ b/test/webx/citrus-test-webx.iml
@@ -0,0 +1,67 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="citrus-webx-framework" />
+    <orderEntry type="module" module-name="citrus-service-resource" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-requestcontext" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-service-pipeline" />
+    <orderEntry type="module" module-name="citrus-common-expr" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl:2.0.1" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:2.5.6.SEC03" level="project" />
+  </component>
+</module>
+
diff --git a/webx/dev/citrus-webx-dev.iml b/webx/dev/citrus-webx-dev.iml
new file mode 100644
index 000000000..416a4191d
--- /dev/null
+++ b/webx/dev/citrus-webx-dev.iml
@@ -0,0 +1,84 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="module" module-name="citrus-webx-turbine" />
+    <orderEntry type="module" module-name="citrus-webx-framework" />
+    <orderEntry type="module" module-name="citrus-service-resource" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-requestcontext" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-service-pipeline" />
+    <orderEntry type="module" module-name="citrus-common-expr" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl:2.0.1" level="project" />
+    <orderEntry type="module" module-name="citrus-service-moduleloader" />
+    <orderEntry type="module" module-name="citrus-service-dataresolver" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.groovy:groovy-all:1.6.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="module" module-name="citrus-service-pull" />
+    <orderEntry type="module" module-name="citrus-service-form" />
+    <orderEntry type="library" name="Maven: ecs:ecs:1.4.2" level="project" />
+    <orderEntry type="module" module-name="citrus-service-mappingrule" />
+    <orderEntry type="module" module-name="citrus-service-template" />
+    <orderEntry type="module" module-name="citrus-service-uribroker" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+    <orderEntry type="module" module-name="citrus-service-jsp" />
+    <orderEntry type="module" module-name="citrus-service-velocity" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.6.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+    <orderEntry type="module" module-name="citrus-service-freemarker" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.16" level="project" />
+    <orderEntry type="module" module-name="citrus-service-mail" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+  </component>
+</module>
+
diff --git a/webx/framework/citrus-webx-framework.iml b/webx/framework/citrus-webx-framework.iml
new file mode 100644
index 000000000..826ac2d55
--- /dev/null
+++ b/webx/framework/citrus-webx-framework.iml
@@ -0,0 +1,66 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="module" module-name="citrus-service-resource" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-requestcontext" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-service-pipeline" />
+    <orderEntry type="module" module-name="citrus-common-expr" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl:2.0.1" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+  </component>
+</module>
+
diff --git a/webx/turbine/citrus-webx-turbine.iml b/webx/turbine/citrus-webx-turbine.iml
new file mode 100644
index 000000000..ac03e48e0
--- /dev/null
+++ b/webx/turbine/citrus-webx-turbine.iml
@@ -0,0 +1,83 @@
+<?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">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="module" module-name="citrus-webx-framework" />
+    <orderEntry type="module" module-name="citrus-service-resource" />
+    <orderEntry type="module" module-name="citrus-common-util" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-service-base" />
+    <orderEntry type="module" module-name="citrus-common-springext" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="module" module-name="citrus-common-generictype" />
+    <orderEntry type="module" module-name="citrus-common-logconfig" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:2.5.6.SEC03" level="project" />
+    <orderEntry type="module" module-name="citrus-service-requestcontext" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="module" module-name="citrus-service-upload" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+    <orderEntry type="module" module-name="citrus-service-configuration" />
+    <orderEntry type="module" module-name="citrus-common-hessian" />
+    <orderEntry type="module" module-name="citrus-service-pipeline" />
+    <orderEntry type="module" module-name="citrus-common-expr" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl:2.0.1" level="project" />
+    <orderEntry type="module" module-name="citrus-service-moduleloader" />
+    <orderEntry type="module" module-name="citrus-service-dataresolver" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.groovy:groovy-all:1.6.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+    <orderEntry type="module" module-name="citrus-service-pull" />
+    <orderEntry type="module" module-name="citrus-service-form" />
+    <orderEntry type="library" name="Maven: ecs:ecs:1.4.2" level="project" />
+    <orderEntry type="module" module-name="citrus-service-velocity" scope="TEST" />
+    <orderEntry type="module" module-name="citrus-service-template" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.velocity:velocity:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+    <orderEntry type="module" module-name="citrus-test-util" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:0.9.24" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:0.9.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: httpunit:httpunit:1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: rhino:js:1.7R1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+    <orderEntry type="module" module-name="citrus-service-mappingrule" />
+    <orderEntry type="module" module-name="citrus-service-uribroker" />
+    <orderEntry type="module" module-name="citrus-test-webx" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:2.5.6.SEC03" level="project" />
+  </component>
+</module>
+