diff --git a/samples/.springBeans b/samples/.springBeans
index 2a26a18aa..aea75188f 100644
--- a/samples/.springBeans
+++ b/samples/.springBeans
@@ -22,5 +22,108 @@
 		<config>src/main/resources/data-source-context-init.xml</config>
 	</configs>
 	<configSets>
+		<configSet>
+			<name><![CDATA[multilineOrder]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>/execution/src/test/resources/simple-container-definition.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/jobs/multilineOrderInputDescriptors.xml</config>
+				<config>src/main/resources/jobs/multilineOrderIo.xml</config>
+				<config>src/main/resources/jobs/multilineOrderJob.xml</config>
+				<config>src/main/resources/jobs/multilineOrderOutputDescriptors.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[adhocLoop]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/jobs/adhocLoopJob.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[beanWrapper]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/jobs/beanWrapperMapperSampleJob.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[fixedLengthImport]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/jobs/fixedLengthImportJob.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[infiniteLoop]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/jobs/infiniteLoopJob.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[multiline]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/jobs/multilineJob.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[restart]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/jobs/restartSample.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[trade]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/jobs/tradeJob.xml</config>
+				<config>src/main/resources/jobs/tradeJobIo.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[xml]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/jobs/xmlJob.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
 	</configSets>
 </beansProjectDescription>
diff --git a/samples/src/main/resources/log4j.properties b/samples/src/test/resources/log4j.properties
similarity index 100%
rename from samples/src/main/resources/log4j.properties
rename to samples/src/test/resources/log4j.properties