From c7c0e28f00636593ce0042593ae990171391ef98 Mon Sep 17 00:00:00 2001
From: Jaco de Groot <jaco.de.groot@ibissource.org>
Date: Sat, 5 Jul 2014 20:21:52 +0200
Subject: [PATCH] Add support for jetty-maven-plugin

---
 README.md                                     |  11 +-
 RELEASES.md                                   |   8 +-
 core/src/main/resources/springCommon.xml      | 725 ++++++++++--------
 .../src/main/resources/springContextJBOSS.xml |  21 +-
 .../main/resources/springContextJETTYMVN.xml  |  11 +
 .../main/resources/springContextTIBCOAMX.xml  |  12 +-
 .../main/resources/springContextTOMCAT6.xml   |  21 +-
 .../main/resources/springContextTOMCATBTM.xml |  21 +-
 core/src/main/resources/springContextWAS5.xml |  22 +-
 core/src/main/resources/springContextWAS6.xml |  22 +-
 .../main/resources/springEjbDeployment.xml    | 147 ++--
 core/src/main/resources/springJBOSS.xml       |  10 +-
 core/src/main/resources/springJETTYMVN.xml    |  43 ++
 core/src/main/resources/springTIBCOAMX.xml    |  23 +-
 core/src/main/resources/springTOMCAT6.xml     |  30 +-
 .../resources/springUnmanagedDeployment.xml   | 113 +--
 core/src/main/resources/springWAS5.xml        |  48 +-
 core/src/main/resources/springWAS6.xml        |  79 +-
 example/pom.xml                               |  21 +
 19 files changed, 810 insertions(+), 578 deletions(-)
 create mode 100644 core/src/main/resources/springContextJETTYMVN.xml
 create mode 100644 core/src/main/resources/springJETTYMVN.xml

diff --git a/README.md b/README.md
index f78840ab502..8a876fc0ce0 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,15 @@ IntelliJ
 Command-line interface
 ======================
 
+Initial:
+
 - git clone https://github.com/ibissource/iaf
-- cd iaf/core
+- cd iaf
 - mvn
+- cd example
+- mvn jetty:run
+
+After modifying a project file:
+
+- ctrl-c
+- cd .. ; mvn clean install ; cd example ; mvn jetty:run
diff --git a/RELEASES.md b/RELEASES.md
index 552748aea18..1a8abcc02e6 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -12,21 +12,23 @@ Upcoming
 [Commits](https://github.com/ibissource/iaf/compare/v5.5...HEAD)
 [![Build Status](https://travis-ci.org/ibissource/iaf.png)](https://travis-ci.org/ibissource/iaf)
 
-- ...
+- Add support for jetty-maven-plugin
 
 
 
 5.6
 ---
 
-[Commits](https://github.com/ibissource/iaf/compare/v5_5...v5_6)
+[Commits](https://github.com/ibissource/iaf/compare/v5.5...v5.6)
 [![Build Status](https://travis-ci.org/ibissource/iaf.png?branch=v5.6)](https://travis-ci.org/ibissource/iaf)
 
 - Move missing errorStorage warning from MessageKeeper (at adapter level) and logfile to ConfigurationWarnings (top of console main page).
 - Replace (broken) enforceMQCompliancy on JmsSender with MQSender.
 - Remove FXF 1 and 2 support.
+- Fix Ibis name and DTAP stage in Bootstrap theme.
 - Add theme switch button.
 - Add stream support to FilePipe and FileSender.
+- Add permission rules to FileViewerServlet.
 - Added the possibility for enabling LDAP authentication and authorization without a deployment descriptor
 - Added functionality for unit testing (TestTool)
 - Added some MS SQL support
@@ -45,7 +47,7 @@ Upcoming
 5.5
 ---
 
-[Commits](https://github.com/ibissource/iaf/compare/v5_4...v5_5)
+[Commits](https://github.com/ibissource/iaf/compare/v5.4...v5.5)
 [![Build Status](https://travis-ci.org/ibissource/iaf.png?branch=v5.5)](https://travis-ci.org/ibissource/iaf)
 
 - Also when not transacted don't retrow exception caught in JMS listener (caused connection to be closed and caused possible other threads on the same listener to experience "javax.jms.IllegalStateException: Consumer closed").
diff --git a/core/src/main/resources/springCommon.xml b/core/src/main/resources/springCommon.xml
index e52b2523d42..4dd0996a506 100644
--- a/core/src/main/resources/springCommon.xml
+++ b/core/src/main/resources/springCommon.xml
@@ -1,323 +1,410 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans
-    xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    default-autowire="byName"
-    xsi:schemaLocation=
-        "http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
-		 "
-    >
-
-  <bean
-      name="appConstantsPropertyPlaceholderConfigurer"
-      class="nl.nn.adapterframework.configuration.AppConstantsPropertyPlaceholderConfigurer"
-      autowire="byName"
-      />
-
-  <bean
-      name="lowerCasePropertyPlaceholderConfigurer"
-      class="nl.nn.adapterframework.configuration.LowerCasePropertyPlaceholderConfigurer"
-      autowire="byName"
-      />
-
-  <bean
-      name="jndiContextPrefixPropertyPlaceholderConfigurer"
-      class="nl.nn.adapterframework.configuration.OverwritePropertyPlaceholderConfigurer"
-      autowire="byName"
-      >
-    <property name="propertyName" value="jndiContextPrefix"/>
-    <property name="propertyValue" value=""/>
-  </bean>
-
-  <bean
-      name="fxfPropertyPlaceholderConfigurer"
-      class="nl.nn.adapterframework.extensions.fxf.FxfPropertyPlaceholderConfigurer"
-      autowire="byName"
-      />
-
-  <bean id="adapterService" class="nl.nn.adapterframework.configuration.BasicAdapterServiceImpl"/>
-  <!--
-  <bean id="adapterService" class="nl.nn.adapterframework.configuration.DirectoryScanningAdapterServiceImpl">
-    <constructor-arg value="${adapterServiceWatchedDirectory}" />
-    <property name="rateInSeconds" value="${adapterServiceCheckRateInSeconds}" />
-  </bean>
-  -->
-
-  <bean name="configuration" class="nl.nn.adapterframework.configuration.Configuration"
-        autowire="byName"
-        init-method="init">
-    <constructor-arg ref="adapterService"/>
-  </bean>
-
-  <bean name="configurationDigester" class="nl.nn.adapterframework.configuration.ConfigurationDigester"
-        autowire="byName">
-    <lookup-method name="createDigester" bean="digester"/>
-  </bean>
-
-  <bean name="digester" class="org.apache.commons.digester.Digester"
-        autowire="byName" scope="prototype">
-    <property name="substitutor">
-      <bean class="org.apache.commons.digester.substitution.VariableSubstitutor">
-        <constructor-arg ref="variableExpander"/>
-      </bean>
-    </property>
-    <property name="useContextClassLoader" value="true"/>
-    <property name="entityResolver">
-      <bean class="nl.nn.adapterframework.util.ClassPathEntityResolver"/>
-    </property>
-  </bean>
-
-  <bean name="variableExpander" class="nl.nn.adapterframework.configuration.IbisMultiSourceExpander">
-    <property name="environmentFallback" value="false"/>
-    <property name="sources">
-      <list>
-        <bean class="java.lang.System" factory-method="getProperties"/>
-        <ref bean="appConstants"/>
-      </list>
-    </property>
-  </bean>
-
-  <bean name="appConstants" class="nl.nn.adapterframework.util.AppConstants"
-        autowire="byName"
-        factory-method="getInstance">
-  </bean>
-
-  <bean name="jmsRealmsFactory" class="nl.nn.adapterframework.jms.JmsRealmFactory"
-        autowire="byName"
-        factory-method="getInstance">
-  </bean>
-
-  <bean name="proto-jmsRealm" class="nl.nn.adapterframework.jms.JmsRealm"
-        autowire="byName" scope="prototype">
-    <property name="jndiContextPrefix" value="${jndiContextPrefix}"/>
-  </bean>
-
-  <bean name="listenerContainer" class="nl.nn.adapterframework.receivers.PullingListenerContainer"
-        autowire="byName" scope="prototype">
-  </bean>
-
-  <bean id="schedulerHelper" class="nl.nn.adapterframework.scheduler.SchedulerHelper"
-        autowire="byName" lazy-init="true">
-  </bean>
-
-  <bean id="txManagerProxy" class="nl.nn.adapterframework.util.SpringTxManagerProxy">
-    <property name="realTxManagerBeanName">
-      <idref bean="txManagerReal"/>
-    </property>
-  </bean>
-
-  <alias name="txManagerProxy" alias="txManager"/>
-
-  <bean name="isolatedServiceCaller" class="nl.nn.adapterframework.pipes.IsolatedServiceCaller"
-        autowire="byName" scope="singleton">
-  </bean>
-
-  <bean
-      name="pipeLineProcessor"
-      class="nl.nn.adapterframework.processors.InputOutputPipeLineProcessor"
-      autowire="byName"
-      scope="prototype"
-      >
-    <property name="pipeLineProcessor">
-      <bean
-          class="nl.nn.adapterframework.processors.CachePipeLineProcessor"
-          autowire="byName"
-          scope="prototype"
-          >
-        <property name="pipeLineProcessor">
-          <bean
-              class="nl.nn.adapterframework.processors.TransactionAttributePipeLineProcessor"
-              autowire="byName"
-              scope="prototype"
-              >
-            <property name="pipeLineProcessor">
-              <bean
-                  class="nl.nn.adapterframework.processors.LockerPipeLineProcessor"
-                  autowire="byName"
-                  scope="prototype"
-                  >
-                <property name="pipeLineProcessor">
-                  <bean
-                      class="nl.nn.adapterframework.processors.CorePipeLineProcessor"
-                      autowire="byName"
-                      scope="prototype"
-                      />
-                </property>
-              </bean>
-            </property>
-          </bean>
-        </property>
-      </bean>
-    </property>
-  </bean>
-
-  <bean
-      name="pipeProcessor,inputValidatorProcessor,outputValidatorProcessor,inputWrapperProcessor,outputWrapperProcessor"
-      class="nl.nn.adapterframework.processors.TracingEventsPipeProcessor"
-      autowire="byName"
-      scope="prototype"
-      >
-    <property name="pipeProcessor">
-      <bean
-          class="nl.nn.adapterframework.processors.InputOutputPipeProcessor"
-          autowire="byName"
-          scope="prototype"
-          >
-        <property name="pipeProcessor">
-          <bean
-              class="nl.nn.adapterframework.processors.CheckSemaphorePipeProcessor"
-              autowire="byName"
-              scope="prototype"
-              >
-            <property name="pipeProcessor">
-              <bean
-                  class="nl.nn.adapterframework.processors.TransactionAttributePipeProcessor"
-                  autowire="byName"
-                  scope="prototype"
-                  >
-                <property name="pipeProcessor">
-                  <bean
-                      class="nl.nn.adapterframework.processors.LockerPipeProcessor"
-                      autowire="byName"
-                      scope="prototype"
-                      >
-                    <property name="pipeProcessor">
-                      <bean
-                          class="nl.nn.adapterframework.processors.CheckMessageSizePipeProcessor"
-                          autowire="byName"
-                          scope="prototype"
-                          >
-                        <property name="pipeProcessor">
-                          <bean
-                              class="nl.nn.adapterframework.processors.CorePipeProcessor"
-                              autowire="byName"
-                              scope="prototype"
-                              />
-                        </property>
-                      </bean>
-                    </property>
-                  </bean>
-                </property>
-              </bean>
-            </property>
-          </bean>
-        </property>
-      </bean>
-    </property>
-  </bean>
-
-  <bean
-      name="senderWrapperProcessor"
-      class="nl.nn.adapterframework.processors.InputOutputSenderWrapperProcessor"
-      autowire="byName"
-      scope="prototype"
-      >
-    <property name="senderWrapperProcessor">
-      <bean
-          class="nl.nn.adapterframework.processors.CacheSenderWrapperProcessor"
-          autowire="byName"
-          scope="prototype"
-          >
-        <property name="senderWrapperProcessor">
-          <bean
-              class="nl.nn.adapterframework.processors.CoreSenderWrapperProcessor"
-              autowire="byName"
-              scope="prototype"
-              >
-          </bean>
-        </property>
-      </bean>
-    </property>
-  </bean>
-
-  <bean
-      name="listenerProcessor"
-      class="nl.nn.adapterframework.processors.CoreListenerProcessor"
-      autowire="byName"
-      scope="prototype"
-      />
-
-  <!-- Beans created from Configuration.xml, but prototyped here for
-extra dependencies which cannot be created otherwise.
-Bean names are prefixed with 'proto-' so that autowiring by
-name doesn't create unnessecary instances. -->
-  <bean name="proto-adapter" class="nl.nn.adapterframework.core.Adapter"
-        autowire="byName" scope="prototype">
-  </bean>
-
-  <bean name="proto-pipeline" class="nl.nn.adapterframework.core.PipeLine"
-        autowire="byName" scope="prototype">
-  </bean>
-
-  <bean name="proto-param" class="nl.nn.adapterframework.parameters.Parameter"
-        autowire="byName" scope="prototype">
-  </bean>
-
-  <bean name="proto-receiver" class="nl.nn.adapterframework.receivers.GenericReceiver"
-        autowire="byName" scope="prototype">
-  </bean>
-
-  <!-- Default pipe is a message-sending pipe -->
-  <bean name="proto-pipe" class="nl.nn.adapterframework.pipes.GenericMessageSendingPipe"
-        autowire="byName" scope="prototype">
-  </bean>
-
-  <bean name="proto-sender" class="nl.nn.adapterframework.core.ISender"
-        autowire="byName" scope="prototype">
-  </bean>
-
-  <bean name="proto-RecordHandlingFlow" class="nl.nn.adapterframework.batch.RecordHandlingFlow"
-        autowire="byName" scope="prototype">
-  </bean>
-
-  <bean name="proto-monitor" class="nl.nn.adapterframework.monitoring.Monitor"
-        autowire="byName" scope="prototype">
-  </bean>
-  <bean name="proto-trigger" class="nl.nn.adapterframework.monitoring.Trigger"
-        autowire="byName" scope="prototype">
-  </bean>
-  <bean name="proto-alarm" class="nl.nn.adapterframework.monitoring.Trigger"
-        autowire="byName" scope="prototype">
-  </bean>
-  <bean name="proto-clearing" class="nl.nn.adapterframework.monitoring.Trigger"
-        autowire="byName" scope="prototype">
-  </bean>
-
-  <bean name="proto-job" class="nl.nn.adapterframework.scheduler.JobDef"
-        autowire="byName" scope="prototype">
-  </bean>
-
-  <bean name="proto-statisticsHandlers"
-        class="nl.nn.adapterframework.statistics.StatisticsKeeperIterationHandlerCollection"
-        autowire="byName" scope="prototype">
-  </bean>
-
-  <bean name="proto-statisticsHandler" class="nl.nn.adapterframework.statistics.StatisticsKeeperIterationHandler"
-        autowire="byName" scope="prototype">
-  </bean>
-
-  <bean name="proto-cache" class="nl.nn.adapterframework.cache.EhCache"
-        autowire="byName" scope="prototype">
-  </bean>
-
-  <bean name="taskExecutor" class="org.springframework.core.task.SimpleAsyncTaskExecutor"
-        scope="singleton">
-  </bean>
-
-  <bean name="messageListenerClassName" class="java.lang.String">
-    <constructor-arg value="org.springframework.jms.listener.DefaultMessageListenerContainer"/>
-  </bean>
-
-  <bean id="dbmsSupportFactoryDefault" class="nl.nn.adapterframework.jdbc.dbms.DbmsSupportFactory"
-      >
-    <property name="dbmsSupportMap">
-      <props>
-        <prop key="Oracle">nl.nn.adapterframework.jdbc.dbms.OracleDbmsSupport</prop>
-        <prop key="Microsoft SQL Server">nl.nn.adapterframework.jdbc.dbms.MsSqlServerDbmsSupport</prop>
-        <prop key="DB2/NT">nl.nn.adapterframework.jdbc.dbms.Db2DbmsSupport</prop>
-        <prop key="DB2/LINUXX8664">nl.nn.adapterframework.jdbc.dbms.Db2DbmsSupport</prop>
-      </props>
-    </property>
-  </bean>
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	default-autowire="byName"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd"
+	>
+
+	<bean
+		name="appConstantsPropertyPlaceholderConfigurer"
+		class="nl.nn.adapterframework.configuration.AppConstantsPropertyPlaceholderConfigurer"
+		autowire="byName"
+	/>
+
+	<bean
+		name="lowerCasePropertyPlaceholderConfigurer"
+		class="nl.nn.adapterframework.configuration.LowerCasePropertyPlaceholderConfigurer"
+		autowire="byName"
+	/>
+
+	<bean
+		name="jndiContextPrefixPropertyPlaceholderConfigurer"
+		class="nl.nn.adapterframework.configuration.OverwritePropertyPlaceholderConfigurer"
+		autowire="byName"
+		>
+		<property name="propertyName" value="jndiContextPrefix"/>
+		<property name="propertyValue" value=""/>
+	</bean>
+
+	<bean
+		name="fxfPropertyPlaceholderConfigurer"
+		class="nl.nn.adapterframework.extensions.fxf.FxfPropertyPlaceholderConfigurer"
+		autowire="byName"
+	/>
+
+	<bean id="adapterService" class="nl.nn.adapterframework.configuration.BasicAdapterServiceImpl"/>
+	<!--
+	<bean id="adapterService" class="nl.nn.adapterframework.configuration.DirectoryScanningAdapterServiceImpl">
+		<constructor-arg value="${adapterServiceWatchedDirectory}" />
+		<property name="rateInSeconds" value="${adapterServiceCheckRateInSeconds}" />
+	</bean>
+	-->
+
+	<bean
+		name="configuration"
+		class="nl.nn.adapterframework.configuration.Configuration"
+		autowire="byName"
+		init-method="init"
+		>
+		<constructor-arg ref="adapterService"/>
+	</bean>
+
+	<bean
+		name="configurationDigester"
+		class="nl.nn.adapterframework.configuration.ConfigurationDigester"
+		autowire="byName"
+		>
+		<lookup-method name="createDigester" bean="digester"/>
+	</bean>
+
+	<bean
+		name="digester"
+		class="org.apache.commons.digester.Digester"
+		autowire="byName"
+		scope="prototype"
+		>
+		<property name="substitutor">
+			<bean class="org.apache.commons.digester.substitution.VariableSubstitutor">
+				<constructor-arg ref="variableExpander"/>
+			</bean>
+		</property>
+		<property name="useContextClassLoader" value="true"/>
+		<property name="entityResolver">
+			<bean class="nl.nn.adapterframework.util.ClassPathEntityResolver"/>
+		</property>
+	</bean>
+
+	<bean
+		name="variableExpander"
+		class="nl.nn.adapterframework.configuration.IbisMultiSourceExpander"
+		>
+		<property name="environmentFallback" value="false"/>
+		<property name="sources">
+			<list>
+				<bean class="java.lang.System" factory-method="getProperties"/>
+				<ref bean="appConstants"/>
+			</list>
+		</property>
+	</bean>
+
+	<bean
+		name="appConstants"
+		class="nl.nn.adapterframework.util.AppConstants"
+		autowire="byName"
+		factory-method="getInstance"
+	/>
+
+	<bean
+		name="jmsRealmsFactory"
+		class="nl.nn.adapterframework.jms.JmsRealmFactory"
+		autowire="byName"
+		factory-method="getInstance"
+	/>
+
+	<bean
+		name="proto-jmsRealm"
+		class="nl.nn.adapterframework.jms.JmsRealm"
+		autowire="byName"
+		scope="prototype"
+		>
+		<property name="jndiContextPrefix" value="${jndiContextPrefix}"/>
+	</bean>
+
+	<bean
+		name="listenerContainer"
+		class="nl.nn.adapterframework.receivers.PullingListenerContainer"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		id="schedulerHelper"
+		class="nl.nn.adapterframework.scheduler.SchedulerHelper"
+		autowire="byName"
+		lazy-init="true"
+	/>
+
+	<bean
+		id="txManagerProxy"
+		class="nl.nn.adapterframework.util.SpringTxManagerProxy"
+		>
+		<property name="realTxManagerBeanName">
+			<idref bean="txManagerReal"/>
+		</property>
+	</bean>
+
+	<alias name="txManagerProxy" alias="txManager"/>
+
+	<bean
+		name="isolatedServiceCaller"
+		class="nl.nn.adapterframework.pipes.IsolatedServiceCaller"
+		autowire="byName"
+		scope="singleton"
+	/>
+
+	<bean
+		name="pipeLineProcessor"
+		class="nl.nn.adapterframework.processors.InputOutputPipeLineProcessor"
+		autowire="byName"
+		scope="prototype"
+		>
+		<property name="pipeLineProcessor">
+			<bean
+				class="nl.nn.adapterframework.processors.CachePipeLineProcessor"
+				autowire="byName"
+				scope="prototype"
+				>
+				<property name="pipeLineProcessor">
+					<bean
+						class="nl.nn.adapterframework.processors.TransactionAttributePipeLineProcessor"
+						autowire="byName"
+						scope="prototype"
+						>
+						<property name="pipeLineProcessor">
+							<bean
+								class="nl.nn.adapterframework.processors.LockerPipeLineProcessor"
+								autowire="byName"
+								scope="prototype"
+								>
+								<property name="pipeLineProcessor">
+									<bean
+										class="nl.nn.adapterframework.processors.CorePipeLineProcessor"
+										autowire="byName"
+										scope="prototype"
+									/>
+								</property>
+							</bean>
+						</property>
+					</bean>
+				</property>
+			</bean>
+		</property>
+	</bean>
+
+	<bean
+		name="pipeProcessor,inputValidatorProcessor,outputValidatorProcessor,inputWrapperProcessor,outputWrapperProcessor"
+		class="nl.nn.adapterframework.processors.TracingEventsPipeProcessor"
+		autowire="byName"
+		scope="prototype"
+		>
+		<property name="pipeProcessor">
+			<bean
+				class="nl.nn.adapterframework.processors.InputOutputPipeProcessor"
+				autowire="byName"
+				scope="prototype"
+				>
+				<property name="pipeProcessor">
+					<bean
+						class="nl.nn.adapterframework.processors.CheckSemaphorePipeProcessor"
+						autowire="byName"
+						scope="prototype"
+						>
+						<property name="pipeProcessor">
+							<bean
+								class="nl.nn.adapterframework.processors.TransactionAttributePipeProcessor"
+								autowire="byName"
+								scope="prototype"
+								>
+								<property name="pipeProcessor">
+									<bean
+										class="nl.nn.adapterframework.processors.LockerPipeProcessor"
+										autowire="byName"
+										scope="prototype"
+										>
+										<property name="pipeProcessor">
+											<bean
+												class="nl.nn.adapterframework.processors.CheckMessageSizePipeProcessor"
+												autowire="byName"
+												scope="prototype"
+												>
+												<property name="pipeProcessor">
+													<bean
+														class="nl.nn.adapterframework.processors.CorePipeProcessor"
+														autowire="byName"
+														scope="prototype"
+													/>
+												</property>
+											</bean>
+										</property>
+									</bean>
+								</property>
+							</bean>
+						</property>
+					</bean>
+				</property>
+			</bean>
+		</property>
+	</bean>
+
+	<bean
+		name="senderWrapperProcessor"
+		class="nl.nn.adapterframework.processors.InputOutputSenderWrapperProcessor"
+		autowire="byName"
+		scope="prototype"
+		>
+		<property name="senderWrapperProcessor">
+			<bean
+				class="nl.nn.adapterframework.processors.CacheSenderWrapperProcessor"
+				autowire="byName"
+				scope="prototype"
+				>
+				<property name="senderWrapperProcessor">
+					<bean
+						class="nl.nn.adapterframework.processors.CoreSenderWrapperProcessor"
+						autowire="byName"
+						scope="prototype"
+						>
+					</bean>
+				</property>
+			</bean>
+		</property>
+	</bean>
+
+	<bean
+		name="listenerProcessor"
+		class="nl.nn.adapterframework.processors.CoreListenerProcessor"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<!--
+	Beans created from Configuration.xml, but prototyped here for
+	extra dependencies which cannot be created otherwise.
+	Bean names are prefixed with 'proto-' so that autowiring by
+	name doesn't create unnessecary instances.
+	-->
+	<bean
+		name="proto-adapter"
+		class="nl.nn.adapterframework.core.Adapter"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="proto-pipeline"
+		class="nl.nn.adapterframework.core.PipeLine"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="proto-param"
+		class="nl.nn.adapterframework.parameters.Parameter"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="proto-receiver"
+		class="nl.nn.adapterframework.receivers.GenericReceiver"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<!-- Default pipe is a message-sending pipe -->
+	<bean
+		name="proto-pipe"
+		class="nl.nn.adapterframework.pipes.GenericMessageSendingPipe"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="proto-sender"
+		class="nl.nn.adapterframework.core.ISender"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="proto-RecordHandlingFlow"
+		class="nl.nn.adapterframework.batch.RecordHandlingFlow"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="proto-monitor"
+		class="nl.nn.adapterframework.monitoring.Monitor"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="proto-trigger"
+		class="nl.nn.adapterframework.monitoring.Trigger"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="proto-alarm"
+		class="nl.nn.adapterframework.monitoring.Trigger"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="proto-clearing"
+		class="nl.nn.adapterframework.monitoring.Trigger"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="proto-job"
+		class="nl.nn.adapterframework.scheduler.JobDef"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="proto-statisticsHandlers"
+		class="nl.nn.adapterframework.statistics.StatisticsKeeperIterationHandlerCollection"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="proto-statisticsHandler"
+		class="nl.nn.adapterframework.statistics.StatisticsKeeperIterationHandler"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="proto-cache"
+		class="nl.nn.adapterframework.cache.EhCache"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<bean
+		name="taskExecutor"
+		class="org.springframework.core.task.SimpleAsyncTaskExecutor"
+		scope="singleton"
+	/>
+
+	<bean
+		name="messageListenerClassName"
+		class="java.lang.String"
+		>
+		<constructor-arg value="org.springframework.jms.listener.DefaultMessageListenerContainer"/>
+	</bean>
+
+	<bean
+		id="dbmsSupportFactoryDefault"
+		class="nl.nn.adapterframework.jdbc.dbms.DbmsSupportFactory"
+		>
+		<property name="dbmsSupportMap">
+			<props>
+				<prop key="Oracle">nl.nn.adapterframework.jdbc.dbms.OracleDbmsSupport</prop>
+				<prop key="Microsoft SQL Server">nl.nn.adapterframework.jdbc.dbms.MsSqlServerDbmsSupport</prop>
+				<prop key="DB2/NT">nl.nn.adapterframework.jdbc.dbms.Db2DbmsSupport</prop>
+				<prop key="DB2/LINUXX8664">nl.nn.adapterframework.jdbc.dbms.Db2DbmsSupport</prop>
+			</props>
+		</property>
+	</bean>
 
 </beans>
diff --git a/core/src/main/resources/springContextJBOSS.xml b/core/src/main/resources/springContextJBOSS.xml
index 7dd4926a12f..a96d67a7ae6 100644
--- a/core/src/main/resources/springContextJBOSS.xml
+++ b/core/src/main/resources/springContextJBOSS.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-            http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
-            ">
-
-    <import resource="springUnmanagedDeployment.xml"/>
-    <!-- <import resource="springEjbDeployment.xml"/> -->
-    <import resource="springCommon.xml"/>
-    <import resource="springJBOSS.xml"/>
-    <import resource="springCustom.xml"/>
-    
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd"
+	>
+	<import resource="springUnmanagedDeployment.xml"/>
+	<import resource="springCommon.xml"/>
+	<import resource="springJBOSS.xml"/>
+	<import resource="springCustom.xml"/>
 </beans>
diff --git a/core/src/main/resources/springContextJETTYMVN.xml b/core/src/main/resources/springContextJETTYMVN.xml
new file mode 100644
index 00000000000..daa48f305e7
--- /dev/null
+++ b/core/src/main/resources/springContextJETTYMVN.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd"
+	>
+	<import resource="springUnmanagedDeployment.xml"/>
+	<import resource="springCommon.xml"/>
+	<import resource="springJETTYMVN.xml"/>
+	<import resource="springCustom.xml"/>
+</beans>
diff --git a/core/src/main/resources/springContextTIBCOAMX.xml b/core/src/main/resources/springContextTIBCOAMX.xml
index e7e6b28331d..b8720b585fe 100644
--- a/core/src/main/resources/springContextTIBCOAMX.xml
+++ b/core/src/main/resources/springContextTIBCOAMX.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-            http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
-            ">
-
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd"
+	>
 	<import resource="springUnmanagedDeployment.xml" />
-	<!-- <import resource="springEjbDeployment.xml"/> -->
 	<import resource="springCommon.xml" />
 	<import resource="springTIBCOAMX.xml" />
 	<import resource="springCustom.xml" />
-
 </beans>
diff --git a/core/src/main/resources/springContextTOMCAT6.xml b/core/src/main/resources/springContextTOMCAT6.xml
index 7da604717d5..93fcb0460a8 100644
--- a/core/src/main/resources/springContextTOMCAT6.xml
+++ b/core/src/main/resources/springContextTOMCAT6.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-            http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
-            ">
-
-    <import resource="springUnmanagedDeployment.xml"/>
-    <!-- <import resource="springEjbDeployment.xml"/> -->
-    <import resource="springCommon.xml"/>
-    <import resource="springTOMCAT6.xml"/>
-    <import resource="springCustom.xml"/>
-    
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd"
+	>
+	<import resource="springUnmanagedDeployment.xml"/>
+	<import resource="springCommon.xml"/>
+	<import resource="springTOMCAT6.xml"/>
+	<import resource="springCustom.xml"/>
 </beans>
diff --git a/core/src/main/resources/springContextTOMCATBTM.xml b/core/src/main/resources/springContextTOMCATBTM.xml
index 902a34c2405..1de5e3228f1 100644
--- a/core/src/main/resources/springContextTOMCATBTM.xml
+++ b/core/src/main/resources/springContextTOMCATBTM.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-            http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
-            ">
-
-    <import resource="springUnmanagedDeployment.xml"/>
-    <!-- <import resource="springEjbDeployment.xml"/> -->
-    <import resource="springCommon.xml"/>
-    <import resource="springTOMCATBTM.xml"/>
-    <import resource="springCustom.xml"/>
-    
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd"
+	>
+	<import resource="springUnmanagedDeployment.xml"/>
+	<import resource="springCommon.xml"/>
+	<import resource="springTOMCATBTM.xml"/>
+	<import resource="springCustom.xml"/>
 </beans>
diff --git a/core/src/main/resources/springContextWAS5.xml b/core/src/main/resources/springContextWAS5.xml
index b8e2ca5a879..ba257a98a79 100644
--- a/core/src/main/resources/springContextWAS5.xml
+++ b/core/src/main/resources/springContextWAS5.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-            http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
-            ">
-
-    <import resource="springUnmanagedDeployment.xml"/>
-    <!-- <import resource="springEjbDeployment.xml"/> -->
-    <import resource="springCommon.xml"/>
-    <import resource="springWAS5.xml"/>
-    <import resource="springCustom.xml"/>
-    
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd"
+	>
+	<import resource="springUnmanagedDeployment.xml"/>
+	<!-- <import resource="springEjbDeployment.xml"/> -->
+	<import resource="springCommon.xml"/>
+	<import resource="springWAS5.xml"/>
+	<import resource="springCustom.xml"/>
 </beans>
diff --git a/core/src/main/resources/springContextWAS6.xml b/core/src/main/resources/springContextWAS6.xml
index 434cf9da39d..ab29fca9c48 100644
--- a/core/src/main/resources/springContextWAS6.xml
+++ b/core/src/main/resources/springContextWAS6.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-            http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
-            ">
-
-    <import resource="springUnmanagedDeployment.xml"/>
-    <!-- <import resource="springEjbDeployment.xml"/> -->
-    <import resource="springCommon.xml"/>
-    <import resource="springWAS6.xml"/>
-    <import resource="springCustom.xml"/>
-    
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd"
+	>
+	<import resource="springUnmanagedDeployment.xml"/>
+	<!-- <import resource="springEjbDeployment.xml"/> -->
+	<import resource="springCommon.xml"/>
+	<import resource="springWAS6.xml"/>
+	<import resource="springCustom.xml"/>
 </beans>
diff --git a/core/src/main/resources/springEjbDeployment.xml b/core/src/main/resources/springEjbDeployment.xml
index 2b3739a96f0..7de4d73803a 100644
--- a/core/src/main/resources/springEjbDeployment.xml
+++ b/core/src/main/resources/springEjbDeployment.xml
@@ -1,64 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="
-            http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
-            http://www.springframework.org/schema/util xml/xsd/spring-util-2.5.xsd
-            ">
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation=
+		"
+		http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/util xml/xsd/spring-util-2.5.xsd
+		"
+	>
 
-    <!-- Prototype-beans for configuration -->
-    <bean id="proto-ifsaProviderListener" class="nl.nn.adapterframework.extensions.ifsa.IfsaProviderListener"
-    	autowire="byName" scope="prototype">
-    	<property name="listenerPortConnector" ref="listenerPortConnector"/>
-    </bean>
-    
-    <!-- IBIS Beans -->
-    <bean id="ibisManager" class="nl.nn.adapterframework.unmanaged.DefaultIbisManager"
-        autowire="byName">
-        <property name="deploymentMode">
-            <util:constant static-field="nl.nn.adapterframework.configuration.IbisManager.DEPLOYMENT_MODE_EJB"/>
-        </property>
-        <property name="transactionManager" ref="txManager"/>
-    </bean>
-    
-    <bean id="listenerPortPoller" class="nl.nn.adapterframework.ejb.ListenerPortPoller"
-        autowire="byName" scope="singleton">
-    </bean>
-    
-    <bean id="jmsConnector" class="nl.nn.adapterframework.ejb.EjbListenerPortConnector"
-        autowire="byName" scope="prototype">
-    </bean>
-    
-    <alias name="jmsConnector" alias="listenerPortConnector"/>
-    
-    <!-- set up Quartz Job to run the ListenerPortPoller every 5 secodns -->
-    <bean id="portPollerJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"
-         lazy-init="true">
-        <property name="targetObject" ref="listenerPortPoller" />
-        <property name="targetMethod" value="poll" />
-    </bean>
-    
-    <bean id="portPollerTrigger" class="org.springframework.scheduling.quartz.SimpleTriggerBean"
-         lazy-init="true">
-        <!-- see the job definition above -->
-        <property name="jobDetail" ref="portPollerJob" />
-        <!-- 10 seconds -->
-        <property name="startDelay" value="10000" />
-        <!-- repeat every 5 seconds -->
-        <property name="repeatInterval" value="5000" />
-    </bean>
+	<!-- Prototype-beans for configuration -->
+	<bean
+		id="proto-ifsaProviderListener"
+		class="nl.nn.adapterframework.extensions.ifsa.IfsaProviderListener"
+		autowire="byName"
+		scope="prototype"
+		>
+		<property name="listenerPortConnector" ref="listenerPortConnector"/>
+	</bean>
+
+	<!-- IBIS Beans -->
+	<bean
+		id="ibisManager"
+		class="nl.nn.adapterframework.unmanaged.DefaultIbisManager"
+		autowire="byName"
+		>
+		<property name="deploymentMode">
+			<util:constant static-field="nl.nn.adapterframework.configuration.IbisManager.DEPLOYMENT_MODE_EJB"/>
+		</property>
+		<property name="transactionManager" ref="txManager"/>
+	</bean>
+
+	<bean
+		id="listenerPortPoller"
+		class="nl.nn.adapterframework.ejb.ListenerPortPoller"
+		autowire="byName"
+		scope="singleton"
+	/>
+
+	<bean
+		id="jmsConnector"
+		class="nl.nn.adapterframework.ejb.EjbListenerPortConnector"
+		autowire="byName"
+		scope="prototype"
+	/>
+
+	<alias name="jmsConnector" alias="listenerPortConnector"/>
+
+	<!-- set up Quartz Job to run the ListenerPortPoller every 5 secodns -->
+	<bean
+		id="portPollerJob"
+		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"
+		lazy-init="true"
+		>
+		<property name="targetObject" ref="listenerPortPoller" />
+		<property name="targetMethod" value="poll" />
+	</bean>
+
+	<bean
+		id="portPollerTrigger"
+		class="org.springframework.scheduling.quartz.SimpleTriggerBean"
+		lazy-init="true"
+		>
+		<!-- see the job definition above -->
+		<property name="jobDetail" ref="portPollerJob" />
+		<!-- 10 seconds -->
+		<property name="startDelay" value="10000" />
+		<!-- repeat every 5 seconds -->
+		<property name="repeatInterval" value="5000" />
+	</bean>
+
+	<!-- Scheduler (Quartz) -->
+	<bean
+		id="scheduler"
+		class="org.springframework.scheduling.quartz.SchedulerFactoryBean"
+		autowire="byName"
+		lazy-init="true"
+		>
+		<!-- Auto-wiring wires up bean named taskExecutor as threadpool implementation -->
+		<property name="autoStartup" value="false"/>
+		<!--<property name="transactionManager" ref="txManager"/>-->
+		<property name="triggers">
+			<list>
+				<ref bean="portPollerTrigger" />
+			</list>
+		</property>
+	</bean>
 
-    <!-- Scheduler (Quartz) -->
-    <bean id="scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean"
-        autowire="byName" lazy-init="true">
-        <!-- Auto-wiring wires up bean named taskExecutor as threadpool implementation -->
-        <property name="autoStartup" value="false"/>
-        <!--<property name="transactionManager" ref="txManager"/>-->
-        <property name="triggers">
-            <list>
-                <ref bean="portPollerTrigger" />
-            </list>
-        </property>
-    </bean>
 </beans>
diff --git a/core/src/main/resources/springJBOSS.xml b/core/src/main/resources/springJBOSS.xml
index 3a97084c35d..313e0b43b78 100644
--- a/core/src/main/resources/springJBOSS.xml
+++ b/core/src/main/resources/springJBOSS.xml
@@ -10,11 +10,11 @@
 		"
 	>
 
-	<!-- Transaction stuff -->
-	<!-- In order to properly handle 'Propagation: Supports', set property
-		 'transactionSynchronization' to 'Synchronize on actual transaction'. -->
-
-	<!-- Defining a open source transaction manager -->
+	<!--
+	An open source transaction manager.
+	In order to properly handle 'Propagation: Supports', set property
+	'transactionSynchronization' to 'Synchronize on actual transaction'.
+	-->
 	<bean
 		id="txManagerReal"
 		class="org.springframework.transaction.jta.JtaTransactionManager"
diff --git a/core/src/main/resources/springJETTYMVN.xml b/core/src/main/resources/springJETTYMVN.xml
new file mode 100644
index 00000000000..36acfd647fd
--- /dev/null
+++ b/core/src/main/resources/springJETTYMVN.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation=
+		"
+		http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/util xml/xsd/spring-util-2.5.xsd
+		"
+	>
+
+	<bean id="txManagerReal" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+		<property name="dataSource">
+			<ref bean="defaultDataSource"/>
+		</property>
+		<property name="transactionSynchronization">
+			<util:constant static-field="org.springframework.transaction.support.AbstractPlatformTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION"/>
+		</property>
+	</bean>
+
+	<bean id="defaultDataSource" class="org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy">
+		<property name="targetDataSource">
+			<ref bean="h2DataSource"/>
+		</property>
+	</bean>
+
+	<bean id="h2DataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+		<property name="driverClassName" value="org.h2.Driver"/>
+		<property name="url" value="jdbc:h2:mem:"/>
+	</bean>
+
+	<bean id="proxiedDataSources" class="java.util.HashMap">
+		<constructor-arg>
+			<map>
+				<entry key="jdbc/${instance.name.lc}">
+					<ref bean="defaultDataSource"/>
+				</entry>
+			</map>
+		</constructor-arg>
+	</bean>
+
+</beans>
diff --git a/core/src/main/resources/springTIBCOAMX.xml b/core/src/main/resources/springTIBCOAMX.xml
index 8e6469e15ee..d0138326d0d 100644
--- a/core/src/main/resources/springTIBCOAMX.xml
+++ b/core/src/main/resources/springTIBCOAMX.xml
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
-		">
+	xsi:schemaLocation=
+		"
+			http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+		"
+	>
 
-	<bean id="txManagerReal" class="org.springframework.transaction.jta.JtaTransactionManager"
-		lazy-init="true">
+	<bean
+		id="txManagerReal"
+		class="org.springframework.transaction.jta.JtaTransactionManager"
+		lazy-init="true"
+		>
 		<property name="transactionSynchronization">
 			<util:constant
 				static-field="org.springframework.transaction.support.AbstractPlatformTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION" />
 		</property>
 	</bean>
 
-	<bean name="jndiContextPrefixPropertyPlaceholderConfigurer"
+	<bean
+		name="jndiContextPrefixPropertyPlaceholderConfigurer"
 		class="nl.nn.adapterframework.configuration.OverwritePropertyPlaceholderConfigurer"
-		autowire="byName">
+		autowire="byName"
+		>
 		<property name="propertyName" value="jndiContextPrefix" />
 		<property name="propertyValue" value="java:" />
 	</bean>
diff --git a/core/src/main/resources/springTOMCAT6.xml b/core/src/main/resources/springTOMCAT6.xml
index cfe88649bbb..648e161354e 100644
--- a/core/src/main/resources/springTOMCAT6.xml
+++ b/core/src/main/resources/springTOMCAT6.xml
@@ -10,17 +10,18 @@
 		"
 	>
 
-	<!-- Transaction stuff -->
-	<!-- In order to properly handle 'Propagation: Supports', set property
-		 'transactionSynchronization' to 'Synchronize on actual transaction'. -->
-
-	<!-- Use Spring DataSourceTransactionManager which is good enough in case
-		 only one data source needs to be managed by the transaction manager.
-		 Otherwise a transaction manager like Atomikos, Bitronix or JOTM needs
-		 to be used (will need some integration with Tomcat). In case no
-		 database is needed the DataSourceTransactionManager can be used in
-		 combination with an in-memory database like H2. -->
-	<bean id="txManagerReal" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+	<!--
+	Use Spring DataSourceTransactionManager which is good enough in case only
+	one data source needs to be managed by the transaction manager.
+	In case no database is available configure an in-memory database like H2 in
+	Tomcat to still be able to use this configuration.
+	In order to properly handle 'Propagation: Supports', set property
+	'transactionSynchronization' to 'Synchronize on actual transaction'.
+	-->
+	<bean
+		id="txManagerReal"
+		class="org.springframework.jdbc.datasource.DataSourceTransactionManager"
+		>
 		<property name="dataSource">
 			<ref bean="defaultDataSource"/>
 		</property>
@@ -28,13 +29,18 @@
 			<util:constant static-field="org.springframework.transaction.support.AbstractPlatformTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION"/>
 		</property>
 	</bean>
-	<bean id="defaultDataSource" class="org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy">
+
+	<bean
+		id="defaultDataSource"
+		class="org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy"
+		>
 		<property name="targetDataSource">
 			<bean class="org.springframework.jndi.JndiObjectFactoryBean">
 				<property name="jndiName" value="java:comp/env/jdbc/${instance.name.lc}"/>
 			</bean>
 		</property>
 	</bean>
+
 	<!-- Make the proxied data source available to the JdbcFacade -->
 	<bean id="proxiedDataSources" class="java.util.HashMap">
 		<constructor-arg>
diff --git a/core/src/main/resources/springUnmanagedDeployment.xml b/core/src/main/resources/springUnmanagedDeployment.xml
index bbeff7cdd37..427581935ce 100644
--- a/core/src/main/resources/springUnmanagedDeployment.xml
+++ b/core/src/main/resources/springUnmanagedDeployment.xml
@@ -1,49 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="
-       		http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
-            http://www.springframework.org/schema/util xml/xsd/spring-util-2.5.xsd
-            ">
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation=
+		"
+		http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/util xml/xsd/spring-util-2.5.xsd
+		"
+	>
+
+	<!-- Scheduler (Quartz) -->
+	<bean
+		id="scheduler"
+		class="org.springframework.scheduling.quartz.SchedulerFactoryBean"
+		autowire="byName"
+		lazy-init="true"
+		>
+		<!-- Auto-wiring wires up bean named taskExecutor as threadpool implementation -->
+		<property name="autoStartup" value="false"/>
+		<property name="transactionManager" ref="txManager"/>
+		<!-- Prevent a dataSource bean being wired up when present (causing Quartz to look for table QRTZ_LOCKS) -->
+		<property name="dataSource"><null/></property>
+	</bean>
+
+	<!-- IBIS Beans -->
+	<bean
+		name="ibisManager"
+		class="nl.nn.adapterframework.unmanaged.DefaultIbisManager"
+		autowire="byName"
+		>
+		<property name="deploymentMode">
+			<util:constant static-field="nl.nn.adapterframework.configuration.IbisManager.DEPLOYMENT_MODE_UNMANAGED"/>
+		</property>
+		<property name="transactionManager" ref="txManager"/>
+	</bean>
+
+	<bean
+		name="jmsConnector"
+		class="nl.nn.adapterframework.unmanaged.SpringJmsConnector"
+		autowire="byName"
+		scope="prototype"
+		>
+		<property name="messageListenerClassName" ref="messageListenerClassName"/>
+	</bean>
+
+	<!--
+	SpringJmsConnector depends on bean definition for proto-jmsContainer below;
+	this bean is not needed in the EJB deployment mode.
+
+	Please note that this definition is intentionally incomplete and can not be
+	instantiated as-is: Runtime-magic will take care of proper & complete
+	instantiation.
+
+	DefaultMessageListenerContainer is supported configuration by IBM; provided
+	however that supported transaction-manager and thread-pooling are used.
+	See:
+	http://www.ibm.com/developerworks/websphere/techjournal/0609_alcott/0609_alcott.html
+	-->
+	<bean
+		name="proto-jmsContainer"
+		class="org.springframework.jms.listener.DefaultMessageListenerContainer"
+		autowire="byName"
+		scope="prototype"
+		>
+		<property name="autoStartup" value="false"/>
+	</bean>
 
-    <!-- Scheduler (Quartz) -->
-    <bean id="scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean"
-        autowire="byName" lazy-init="true">
-        <!-- Auto-wiring wires up bean named taskExecutor as threadpool implementation -->
-        <property name="autoStartup" value="false"/>
-        <property name="transactionManager" ref="txManager"/>
-        <!-- Prevent a dataSource bean being wired up when present (causing Quartz to look for table QRTZ_LOCKS) -->
-        <property name="dataSource"><null/></property>
-    </bean>
-    
-    <!-- IBIS Beans -->
-    <bean name="ibisManager" class="nl.nn.adapterframework.unmanaged.DefaultIbisManager"
-        autowire="byName" >
-        <property name="deploymentMode">
-            <util:constant static-field="nl.nn.adapterframework.configuration.IbisManager.DEPLOYMENT_MODE_UNMANAGED"/>
-        </property>
-        <property name="transactionManager" ref="txManager"/>
-    </bean>
-    
-    <bean name="jmsConnector" class="nl.nn.adapterframework.unmanaged.SpringJmsConnector"
-        autowire="byName" scope="prototype">
-        <property name="messageListenerClassName" ref="messageListenerClassName"/>
-    </bean>
-    
-    <!-- SpringJmsConnector depends on bean definition for proto-jmsContainer below; this bean
-         is not needed in the EJB deployment mode.
-         
-         Please note that this definition is intentionally incomplete and can not be
-         instantiated as-is: Runtime-magic will take care of proper & complete instantiation.
-         
-         DefaultMessageListenerContainer is supported configuration by IBM; provided
-         however that supported transaction-manager and thread-pooling are used.
-         See:
-             http://www.ibm.com/developerworks/websphere/techjournal/0609_alcott/0609_alcott.html
-    -->
-    <bean name="proto-jmsContainer" class="org.springframework.jms.listener.DefaultMessageListenerContainer"
-        autowire="byName" scope="prototype">
-        <property name="autoStartup" value="false"/>
-    </bean>
 </beans>
diff --git a/core/src/main/resources/springWAS5.xml b/core/src/main/resources/springWAS5.xml
index 82d6f068e1b..cd66e273046 100644
--- a/core/src/main/resources/springWAS5.xml
+++ b/core/src/main/resources/springWAS5.xml
@@ -1,26 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="
-            http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
-            http://www.springframework.org/schema/util xml/xsd/spring-util-2.5.xsd
-            ">
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation=
+		"
+			http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/util xml/xsd/spring-util-2.5.xsd
+		"
+	>
 
-    <!-- Transaction stuff -->
-    <!-- In order to properly handle 'Propagation: Supports', set property
-         'transactionSynchronization' to 'Synchronize on actual transaction'. -->
-    
-    <!-- Defining a WAS5 compatible transaction manager -->
-    <bean id="txManagerReal" class="org.springframework.transaction.jta.JtaTransactionManager"
-    	lazy-init="true">
-        <property name="transactionManager">
-            <bean class="org.springframework.transaction.jta.WebSphereTransactionManagerFactoryBean"/>
-        </property>
-        <property name="transactionSynchronization">
-            <util:constant static-field="org.springframework.transaction.support.AbstractPlatformTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION"/>
-        </property>
-    </bean>
+	<!--
+	WAS5 compatible transaction manager.
+	In order to properly handle 'Propagation: Supports', set property
+	'transactionSynchronization' to 'Synchronize on actual transaction'.
+	-->
+	<bean
+		id="txManagerReal"
+		class="org.springframework.transaction.jta.JtaTransactionManager"
+		lazy-init="true"
+		>
+		<property name="transactionManager">
+			<bean class="org.springframework.transaction.jta.WebSphereTransactionManagerFactoryBean"/>
+		</property>
+		<property name="transactionSynchronization">
+			<util:constant static-field="org.springframework.transaction.support.AbstractPlatformTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION"/>
+		</property>
+	</bean>
 
 	<bean id="messageListenerClassName" class="java.lang.String">
 		<constructor-arg value="org.springframework.jms.listener.DefaultMessageListenerContainer102"/>
diff --git a/core/src/main/resources/springWAS6.xml b/core/src/main/resources/springWAS6.xml
index a9848bff044..de0a28173dd 100644
--- a/core/src/main/resources/springWAS6.xml
+++ b/core/src/main/resources/springWAS6.xml
@@ -1,40 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="
-            http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
-            http://www.springframework.org/schema/util xml/xsd/spring-util-2.5.xsd
-            ">
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation=
+		"
+		http://www.springframework.org/schema/beans xml/xsd/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/util xml/xsd/spring-util-2.5.xsd
+		"
+	>
 
-    <!-- Transaction stuff -->
-    <!-- In order to properly handle 'Propagation: Supports', set property
-         'transactionSynchronization' to 'Synchronize on actual transaction'. -->
-    <!-- bean definition below would be preferred txManager for WebSphere V6.0.2.19 or V6.1.0.9 and up
-    (see: 
-    http://www.ibm.com/developerworks/websphere/techjournal/0609_alcott/0609_alcott.html
-    http://static.springframework.org/spring/docs/2.1.x/api/org/springframework/transaction/jta/WebSphereUowTransactionManager.html
-    ) however doesn't work with WAS 5.0 / 5.1
-    -->
-    <bean id="txManagerReal" class="org.springframework.transaction.jta.WebSphereUowTransactionManager"
-    	lazy-init="true">
-        <property name="transactionSynchronization">
-            <util:constant static-field="org.springframework.transaction.support.AbstractPlatformTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION"/>
-        </property>
-    </bean>
-    
-    
-    <!-- Common/J based TaskExecutor for deploying on
-         WebSphere 6.0 or higher. 
-         
-         Set the property 'workManagerName' to the JNDI name of the WorkManager
-         defined to support IBIS; by default I've chosen here 'commonj/IbisWorkManager'
-         but this should probably be changed once WAS6.x is deployed and we have some
-         experience with it.
-         -->
-    <bean name="taskExecutor" class="org.springframework.scheduling.commonj.WorkManagerTaskExecutor"
-        scope="singleton">
-        <property name="workManagerName" value="wm/default"/>
-    </bean>
+	<!--
+	Bean definition below would be preferred txManager for WebSphere V6.0.2.19
+	or V6.1.0.9 and up (see:
+	http://www.ibm.com/developerworks/websphere/techjournal/0609_alcott/0609_alcott.html
+	http://static.springframework.org/spring/docs/2.1.x/api/org/springframework/transaction/jta/WebSphereUowTransactionManager.html
+	) however doesn't work with WAS 5.0 / 5.1.
+	In order to properly handle 'Propagation: Supports', set property
+	'transactionSynchronization' to 'Synchronize on actual transaction'.
+	-->
+	<bean
+		id="txManagerReal"
+		class="org.springframework.transaction.jta.WebSphereUowTransactionManager"
+		lazy-init="true"
+		>
+		<property name="transactionSynchronization">
+			<util:constant static-field="org.springframework.transaction.support.AbstractPlatformTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION"/>
+		</property>
+	</bean>
+
+	<!--
+	Common/J based TaskExecutor for deploying on WebSphere 6.0 or higher.
+	Set the property 'workManagerName' to the JNDI name of the WorkManager
+	defined to support IBIS; by default I've chosen here
+	'commonj/IbisWorkManager' but this should probably be changed once WAS6.x is
+	deployed and we have some experience with it.
+	-->
+	<bean
+		name="taskExecutor"
+		class="org.springframework.scheduling.commonj.WorkManagerTaskExecutor"
+		scope="singleton"
+		>
+		<property name="workManagerName" value="wm/default"/>
+	</bean>
 
 </beans>
diff --git a/example/pom.xml b/example/pom.xml
index 370c6e5ea0a..b2d8b376958 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -43,4 +43,25 @@
       <scope>runtime</scope><!-- Overwrite <scope>provided</scope> in parent pom. -->
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>9.0.7.v20131107</version>
+        <configuration>
+          <systemProperties>
+            <systemProperty>
+              <name>application.server.type</name>
+              <value>JETTYMVN</value>
+            </systemProperty>
+            <systemProperty>
+              <name>log.dir</name>
+              <value>${java.io.tmpdir}</value>
+            </systemProperty>
+          </systemProperties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>