diff --git a/build-spring-webflow/build-continuous.xml b/build-spring-webflow/build-continuous.xml
deleted file mode 100644
index e37f6b19..00000000
--- a/build-spring-webflow/build-continuous.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  =======================================================================
-  Build file containing targets for continuously integrating build
-  =======================================================================
--->
-<project name="build-spring-webflow-continuous" default="upload" xmlns:ivy="antlib:fr.jayasoft.ivy.ant"
-	xmlns:aws="antlib:org.springframework.aws">
-
-	<import file="${basedir}/build.xml"/>
-
-	<!-- targets for uploading binaries, creating snapshots, et cetera -->
-    <target name="upload" depends="upload-s3"/>
-
-	<target name="upload-s3" depends="init, s3.tasks, guard.s3.accessKey, guard.s3.secretKey">
-		<tstamp>
-			<format property="tstamp" pattern="yyyyMMdd"/>
-		</tstamp>
-		<aws:s3 accessKey="${s3.accessKey}" secretKey="${s3.secretKey}">
-			<upload bucketName="dist.springframework.org"
-			        file="${target.release.dir}/${release.zip}"
-			        toFile="snapshot/SWF/spring-webflow-${release.version}-${tstamp}-${build.number}.zip"
-					publicRead="true"/>
-		</aws:s3>
-	</target>
-	
-	<target name="guard.s3.accessKey" unless ="s3.accessKey">
-		<fail message="This target requires the s3.accesskey property to be set"/>
-	</target>
-
-	<target name="guard.s3.secretKey" unless ="s3.secretKey">
-		<fail message="This target requires the s3.secretKey property to be set"/>
-	</target>
-	
-	<target name="s3.tasks">
-		<ivy:settings id="ivy.instance" file="${common.build.dir}/ivysettings.xml" />
-		<property name="main.build.configs" value="global,buildtime,test" />
-		<ivy:resolve file="${basedir}/ivy.xml" conf="${main.build.configs}" />
-		<ivy:retrieve pattern="${ivy.retrieve.pattern}" conf="${main.build.configs}" />
-		<path id="aws.lib.path">
-				<fileset dir="${basedir}/lib" includes="*.jar"/>
-		</path>
-		<taskdef resource="org/springframework/aws/antlib.xml" uri="antlib:org.springframework.aws"
-			classpathref="aws.lib.path" />
-	</target>
-
-</project>
diff --git a/build-spring-webflow/build.xml b/build-spring-webflow/build.xml
index 06e55ab0..d9f36b7e 100644
--- a/build-spring-webflow/build.xml
+++ b/build-spring-webflow/build.xml
@@ -1,245 +1,19 @@
-<?xml version="1.0"?>
-<!--
-  =======================================================================
-  A master build file for creating a release of Spring Web Flow
-  =======================================================================
--->
-<project name="build-spring-webflow" default="release" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="build-spring-webflow" default="precommit">
 
-	<!-- Load local and user build preferences -->
-	<property file="build.properties" />
-	<property file="project.properties" />
-	<property file="${user.home}/build.properties" />
-
-	<!-- Try to load ivy here from local lib dir, in case the user has not already dropped
-		 it into ant's lib dir (note that the latter copy will always take precedence).
-	   	 We will not fail as long as local lib dir exists (it may be empty) and
-		 ivy is in at least one of ant's lib dir or the local lib dir. -->
-	<path id="ivy.lib.path">
-		<fileset dir="${common.build.dir}/lib" includes="*.jar" />
+	<path id="bundles">
+		<pathelement location="../spring-binding"/>
+		<pathelement location="../spring-webflow"/>
+		<pathelement location="../spring-faces"/>
+		<pathelement location="../spring-webflow-samples/booking-faces"/>
+		<pathelement location="../spring-webflow-samples/booking-mvc"/>
 	</path>
 
-	<taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path" />
+	<property file="${basedir}/../build.properties"/>
+	<import file="${basedir}/package-top-level.xml"/>
+	<import file="${basedir}/publish-top-level.xml"/>
+	<import file="${basedir}/../spring-build/multi-bundle/default.xml"/>
 
-	<!-- simplistic pattern for zipping up sources -->
-	<selector id="project.source.zip.includes">
-		<or>
-			<filename name="common-build/**" />
-			<filename name="readme.txt" />
-			<filename name="webflow-architecture.xml" />
-			<filename name="webflow-workspace.xml" />
-			<and>
-				<or>
-					<filename name="build-spring-webflow/**" />
-					<filename name="spring-binding/**" />
-					<filename name="spring-faces/**" />
-					<filename name="spring-webflow/**" />
-					<filename name="spring-webflow-samples/**" />
-				</or>
-				<and>
-					<!-- exclude core project derived artifacts -->
-					<filename name="*/docs/reference/lib/**" negate="true"/>
-					<filename name="*/docs/reference/lib/**" negate="true"/>
-					<filename name="*/docs/reference/docbook-reference-libs.zip" negate="true"/>
-					<filename name="*/docs/reference/target/**" negate="true"/>
-					<filename name="*/target/**" negate="true" />
-					<filename name="*/build.properties" negate="true" />
-					<filename name="*/lib/**" negate="true" />
-				</and>
-				<and>
-					<!-- exclude sample project derived artifacts -->
-					<filename name="*/*/docs/refrence/lib/**" negate="true"/>
-					<filename name="*/*/docs/refrence/docbook-reference-libs.zip" negate="true"/>
-					<filename name="*/*/docs/refrence/target/**" negate="true"/>
-					<filename name="*/*/target/**" negate="true" />
-					<filename name="*/*/build.properties" negate="true" />
-					<filename name="*/*/lib/**" negate="true" />
-				</and>
-			</and>
-		</or>
-	</selector>
+	<target name="precommit" depends="clean,clean-integration,jar,test"/>
 
-	<!--
-        targets:  displays all targets suitable for developer use
-	-->
-	<target name="targets">
-		<echo>
-Master build for Spring Web Flow and Spring Web Flow samples.
-
-Please execute
-	ant -p
-
-to see a list of all relevant targets.
-		</echo>
-	</target>
-
-	<!--
-        init:  initializes some common settings
-	-->
-	<target name="init" unless="init.done" depends="init.pre, init.post" />
-
-	<target name="init.pre">
-
-		<!-- ivy will determine the right order to build web flow main and samples -->
-
-		<property name="ivy.conf.dir" value="${common.build.dir}" />
-
-		<ivy:settings id="ivy.instance" file="${ivy.conf.dir}/ivysettings.xml" />
-
-		<ivy:buildlist reference="modules">
-			<fileset dir="..">
-				<include name="spring-binding/build.xml" />
-				<include name="spring-faces/build.xml" />
-				<include name="spring-webflow/build.xml" />
-				<include name="spring-webflow-samples/*/build.xml" />
-			</fileset>
-		</ivy:buildlist>
-
-		<tstamp>
-			<format property="internal.build.timestamp" pattern="yyyyMMddHHmmss" />
-		</tstamp>
-		<tstamp>
-			<format property="TSTAMPCOL" pattern="hh:mm" />
-		</tstamp>
-
-		<!-- default the release version (used in release archive zips) to the current timestamp -->
-		<property name="release.version" value="${internal.build.timestamp}" />
-
-		<!-- root of build hierarchy -->
-		<property name="target.dir" value="${basedir}/target" />
-
-		<!-- directory for release zips -->
-		<property name="target.release.dir" value="${target.dir}/release" />
-
-		<!-- directory for release zips -->
-		<property name="zip.toplevel.dir" value="spring-webflow-${release.version}" />
-		<property name="release.zip" value="spring-webflow-${release.version}.zip" />
-
-		<echo message='user.dir = "${user.dir}"' />
-		<echo message='ant.file = "${ant.file}"' />
-		<echo message='ant.java.version = "${ant.java.version}"' />
-		<echo message='release.version = "${release.version}"' />
-
-	</target>
-
-	<target name="init.post">
-		<property name="projects" value="modules" />
-		<property name="projects.names" refid="modules" />
-		<property name="init.done" value="true" />
-	</target>
-
-	<target name="clean" depends="init" description="Cleans all build output files from all projects">
-        <delete dir="${target.dir}" />
-		<echo>projects=${projects}</echo>
-		<echo>projects.names=${projects.names}</echo>
-		<subant target="clean" inheritall="false">
-			<buildpath refid="${projects}" />
-		</subant>
-	</target>
-
-	<target name="clean-all" depends="init" description="Cleans all build output files from all projects, and also retrieved libs">
-        <delete dir="${target.dir}" />
-		<echo>projects=${projects}</echo>
-		<subant target="clean-all" inheritall="false">
-			<buildpath refid="${projects}" />
-		</subant>
-	</target>
-
-	<target name="retrieve" depends="init" description="Does a retrieve in all projects">
-        <delete dir="${target.dir}" />
-		<echo>projects=${projects}</echo>
-		<echo>projects.names=${projects.names}</echo>
-		<subant target="retrieve" inheritall="false">
-			<buildpath refid="${projects}" />
-		</subant>
-	</target>
-
-	<target name="publish" depends="init" description="Calls publish targets on each project">
-		<echo>projects=${projects}</echo>
-		<subant target="publish" inheritall="false">
-			<buildpath refid="${projects}" />
-		</subant>
-	</target>
-
-	<target name="dist" depends="init" description="Calls dist targets on each project">
-		<echo>projects=${projects}</echo>
-		<subant target="dist" inheritall="false">
-			<buildpath refid="${projects}" />
-		</subant>
-	</target>
-
-	<target name="build-release-repo" depends="init"
-	        description="Builds repo of all dependencies for all projects">
-		<echo>projects=${projects}</echo>
-		<subant target="retrieve-to-repo" inheritall="false">
-            <property name="retrieve.to.repo.dir" value="${target.dir}/repo" />
-            <property name="retrieve.to.repo.pattern"
-	                  value="${release.repo.ivy.retrieve.pattern}" />
-            <property name="retrieve.to.repo.pattern.ivy" 
-                      value="${release.repo.ivy.retrieve.ivy.pattern}" />
-			<buildpath refid="${projects}" />
-		</subant>
-	</target>
-
-	<target name="tests" depends="init" description="Calls test targets on each project">
-		<echo>projects=${projects}</echo>
-		<subant target="tests" inheritall="false">
-			<buildpath refid="${projects}" />
-		</subant>
-	</target>
-
-	<target name="javadoc" depends="init" description="Calls javadoc targets on each project">
-		<echo>projects=${projects}</echo>
-		<subant target="javadoc" inheritall="false" failonerror="no">
-			<buildpath refid="${projects}" />
-		</subant>
-	</target>
-
-	<target name="doc" depends="init" description="Calls doc targets on applicable projects">
-		<echo>projects=${projects}</echo>
-		<subant target="doc-all" inheritall="false" failonerror="false">
-			<buildpathelement location="../spring-webflow" />
-		</subant>
-	</target>
-
-	<target name="tomcat-copy-war" depends="init" description="Copies all war to tomcat webapp dir">
-		<echo>projects=${projects}</echo>
-		<subant target="tomcat-copy-war" inheritall="false" failonerror="no">
-			<buildpath refid="${projects}" />
-		</subant>
-	</target>
-
-	<target name="release" depends="dist, build-release-repo, javadoc, doc, gen.release.zip"
-	              description="Generate the spring-webflow release archive" />
-
-	<target name="gen.release.zip" depends="init">
-		<mkdir dir="${target.release.dir}" />
-		<delete file="${target.release.dir}/${release.zip}" />
-
-		<zip zipfile="${target.release.dir}/${release.zip}">
-			<!-- important readme, license, and other text files -->
-			<zipfileset file="../spring-webflow/*.txt" prefix="${zip.toplevel.dir}" />
-			<!-- binary files -->
-			<zipfileset dir="../spring-binding/target/dist/jars" prefix="${zip.toplevel.dir}" />
-			<zipfileset dir="../spring-binding/target/dist/ivys" prefix="${zip.toplevel.dir}/ivys" />
-			<zipfileset dir="../spring-binding/target/javadocs"  prefix="${zip.toplevel.dir}/docs/api-binding" />
-			<zipfileset dir="../spring-faces/target/dist/jars"   prefix="${zip.toplevel.dir}" />
-			<zipfileset dir="../spring-faces/target/dist/ivys" prefix="${zip.toplevel.dir}/ivys" />
-			<zipfileset dir="../spring-faces/target/javadocs"  prefix="${zip.toplevel.dir}/docs/api-faces" />
-			<zipfileset dir="../spring-webflow/target/dist/jars" prefix="${zip.toplevel.dir}" />
-			<zipfileset dir="../spring-webflow/target/dist/ivys" prefix="${zip.toplevel.dir}/ivys" />
-			<zipfileset dir="../spring-webflow/target/javadocs"  prefix="${zip.toplevel.dir}/docs/api" />
-			<zipfileset dir="../spring-webflow/docs/reference/target" prefix="${zip.toplevel.dir}/docs/reference">
-				<exclude name="**/html_single/**" />
-				<exclude name="**/pdf/images/**" />
-			</zipfileset>
-			<zipfileset dir="../spring-webflow/docs" includes="upgrade-guide.pdf" prefix="${zip.toplevel.dir}/docs" />
-			<zipfileset dir="${target.dir}/repo" prefix="${zip.toplevel.dir}/projects/repository" />
-			<!-- project sources -->
-			<zipfileset dir=".." prefix="${zip.toplevel.dir}/projects">
-				<selector refid="project.source.zip.includes" />
-			</zipfileset>
-		</zip>
-	</target>
-	
-</project>
\ No newline at end of file
+</project>
diff --git a/build-spring-webflow/package-bundle.xml b/build-spring-webflow/package-bundle.xml
new file mode 100644
index 00000000..ab940737
--- /dev/null
+++ b/build-spring-webflow/package-bundle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="package-bundle">
+
+	<target name="package" depends="ivy.init">
+		<dist-jar/>
+		<src-jar/>
+	</target>
+
+</project>
diff --git a/build-spring-webflow/package-top-level.xml b/build-spring-webflow/package-top-level.xml
new file mode 100644
index 00000000..a5ce5690
--- /dev/null
+++ b/build-spring-webflow/package-top-level.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="package-top-level">
+
+	<target name="package">
+		<delete dir="${package.output.dir}" quiet="true"/>
+		<mkdir dir="${package.output.dir}"/>
+		<delete file="${package.output.file}" quiet="true"/>
+		<mkdir dir="${artifacts.dir}"/>
+
+		<all-bundles target="package">
+			<property name="package.output.dir" value="${package.output.dir}"/>
+		</all-bundles>
+
+		<ant target="javadoc-api" inheritAll="false">
+			<property name="target.dir" value="${package.docs.dir}"/>
+		</ant>
+
+		<ant dir="../spring-webflow-reference" target="doc" inheritAll="false">
+			<property name="package.output.dir" value="${package.output.dir}"/>
+			<propertyset>
+				<propertyref builtin="commandline"/>
+			</propertyset>
+			<property name="timestamp" value="${timestamp}"/>
+		</ant>
+
+		<subant target="package" verbose="true" buildpath="../spring-webflow-reference">
+			<property name="package.output.dir" value="${package.output.dir}"/>
+			<propertyset>
+				<propertyref builtin="commandline"/>
+			</propertyset>
+			<property name="timestamp" value="${timestamp}"/>
+		</subant>
+
+		<copy todir="${package.output.dir}">
+			<fileset dir="${basedir}/resources"/>
+		</copy>
+
+		<copy todir="${package.output.dir}/projects">
+			<fileset dir="${basedir}/..">
+				<exclude name="**/target/**"/>
+				<exclude name="ivy-cache/**"/>
+				<exclude name="integration-repo/**"/>
+				<exclude name="spring-build/lib/docbook/**" />
+			</fileset>
+		</copy>
+
+		<zip destfile="${package.output.file}">
+			<zipfileset dir="${package.output.dir}" prefix="${natural.name}"/>
+		</zip>
+	</target>
+
+</project>
diff --git a/build-spring-webflow/project.properties b/build-spring-webflow/project.properties
deleted file mode 100644
index 02b04e37..00000000
--- a/build-spring-webflow/project.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configurable property values that may be locally overriden by a build.properties file
-
-# The version number of the release that will be built
-release.version=2.0-rc1
-
-# The location of the common build system
-common.build.dir=${basedir}/../common-build
diff --git a/build-spring-webflow/publish-top-level.xml b/build-spring-webflow/publish-top-level.xml
new file mode 100644
index 00000000..213a81ed
--- /dev/null
+++ b/build-spring-webflow/publish-top-level.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="publish-top-level">
+
+	<target name="publish" depends="publish-multi-bundle.publish, publish-package"/>
+
+</project>
diff --git a/spring-webflow/changelog.txt b/build-spring-webflow/resources/changelog.txt
similarity index 100%
rename from spring-webflow/changelog.txt
rename to build-spring-webflow/resources/changelog.txt
diff --git a/spring-webflow/license.txt b/build-spring-webflow/resources/license.txt
similarity index 100%
rename from spring-webflow/license.txt
rename to build-spring-webflow/resources/license.txt
diff --git a/spring-webflow/notice.txt b/build-spring-webflow/resources/notice.txt
similarity index 100%
rename from spring-webflow/notice.txt
rename to build-spring-webflow/resources/notice.txt
diff --git a/spring-webflow/readme.txt b/build-spring-webflow/resources/readme.txt
similarity index 100%
rename from spring-webflow/readme.txt
rename to build-spring-webflow/resources/readme.txt
diff --git a/common-build/.project b/common-build/.project
deleted file mode 100644
index 41d6903f..00000000
--- a/common-build/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>common-build</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/common-build/clover-targets.xml b/common-build/clover-targets.xml
deleted file mode 100644
index 289fc2a3..00000000
--- a/common-build/clover-targets.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2004-2007 the original author or authors.
-  
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- - - -
- Author: Colin Sampaleanu
- Author: Keith Donald
- 
- Ant XML fragment that contains useful targets for working with clover.  These 
- include targets to instrument (cloverize) project code, execute tests with clover,
- and produce test coverage reports.
- 
- This ant XML fragment is meant to be imported into a project build file, along with
- common-targets.xml. This is an optional module, and due to the way the ant import works,
- there is no way to automatically hook this up into the build. The importing project
- must override appropropriate 'hook' targets from common-targets.xml, and then have
- the override targets depend on both the targets from common-targets and those from here.
- 
- Note, for clover to work:
- - Make sure clover.jar and cenquatasks.jar is in your ant lib directory.
- - Make sure clover.jar is expressed as a test dependency for your project.
--->
-
-<project name="clover-targets" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-
-	<import file="common-targets.xml" />
-
-	<target name="clover.tasks" depends="retrieve">
-		<taskdef resource="com/cenqua/ant/antlib.xml" classpath="${test.classpath}" />
-		<taskdef resource="clovertasks" classpath="${test.classpath}" />
-	</target>
-
-	<target name="-check.clover" depends="clover.tasks">
-		<available property="clover.installed" classname="com.cenqua.clover.CloverInstr" />
-	</target>
-
-	<target name="guard.noclover" depends="-check.clover" unless="clover.installed">
-		<fail message="The target you are attempting to run requires Clover, which doesn't appear" />
-	</target>
-
-	<target name="clover.init" depends="guard.noclover">
-		<property name="target.clover.dir" value="${target.dir}/clover" />
-		<mkdir dir="${target.clover.dir}" />
-		<clover-setup initstring="${target.clover.dir}/coverage.db" tmpdir="${target.clover.dir}" preserve="true">
-			<fileset dir="${src.java.main.dir}">
-				<include name="**/*.java" />
-			</fileset>
-		</clover-setup>
-	</target>
-
-	<target name="clover.instrument" depends="clover.init, compile" />
-	
-	<target name="clover-xml" depends="clover.instrument, tests-local" description="Produce a test coverage xml file">
-		<clover-report>
-			<current outfile="${target.clover.dir}/coverage.xml">
-				<format type="xml"/>
-			</current>
-		</clover-report>
-	</target>
-
-	<target name="clover-report" depends="clover.instrument, tests-local" description="Produce a test coverage report">
-		<clover-report>
-			<current outfile="${target.clover.dir}/html">
-				<format type="html" />
-			</current>
-		</clover-report>
-	</target>
-
-	<target name="clover-summary" depends="clover.instrument, tests-local" description="Produce a test coverage summary">
-		<clover-report>
-			<current summary="yes" outfile="${target.clover.dir}/coverage.pdf">
-				<format type="pdf" />
-			</current>
-		</clover-report>
-	</target>
-
-</project>
\ No newline at end of file
diff --git a/common-build/common-targets.xml b/common-build/common-targets.xml
deleted file mode 100644
index ef956fc9..00000000
--- a/common-build/common-targets.xml
+++ /dev/null
@@ -1,934 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2004-2007 the original author or authors.
-  
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- - - -
- Author: Colin Sampaleanu
- - - -
--->
-
-<project name="common-targets" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-
-  <!-- try to load ivy here from local lib dir, in case the user has not already dropped
-       it into ant's lib dir (note that the latter copy will always take precedence).
-       We will not fail as long as local lib dir exists (it may be empty) and
-       ivy is in at least one of ant's lib dir or the local lib dir. -->
-  <path id="ivy.lib.path">
-    <fileset dir="${common.build.dir}/lib" includes="*.jar"/>
-  </path>
-  <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
-           uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/>
-  
-  <!-- targets:  displays all targets suitable for developer use -->
-  <target name="targets" depends="init">
-    <echo>
-      ANT build for ${project.name} ${project.version}.
-
-        Please execute:
-            ant -projecthelp
-              or
-            ant -p
-        to see a list of publically executable targets.
-      </echo>
-  </target>
-
-  <!--
-        init:  initializes some common settings
-  -->
-  <target name="init" unless="init.done" depends="force.env.load,
-                               init.cl.external.props,
-                               init.env.external.props,
-                               init.pre,
-                               init.post,
-                               init.post2">
-
-  </target>
-
-  <target name="init.pre">
-
-    <!-- we default project.version to be ${project.base.version}-${internal.build.timestamp}
-       where project.base.version defaults to 1.0-dev.
-       
-       An importing project or master build should override project.base.version.
-       For a release build which doesn't need the build timestamp, should override
-       project.version itself to just be equal to ${project.base.version} -->
-    <tstamp>
-      <format property="internal.build.timestamp" pattern="yyyyMMddHHmmss" />
-    </tstamp>
-    <tstamp>
-      <format property="TSTAMPCOL" pattern="hh:mm" />
-    </tstamp>
-
-    <property name="ivy.conf.dir" value="${common.build.dir}" />
-
-    <property name="org.name" value="springframework.org" />
-    <property name="org.package.prefix" value="org.springframework" />
-    <property name="project.name" value="${ant.project.name}" />
-    <property name="project.webapp.name" value="${ant.project.name}" />
-  	<property name="project.title" value="${project.name}" />
-   	<property name="project.base.version" value="1.0-dev" />
-    <property name="project.version" value="${project.base.version}-${internal.build.timestamp}" />
-	<property name="project.copyright" value="Copyright &#169; 2004-2007. All Rights Reserved."/>
-  	
-    <property environment="myenv" />
-
-    <!-- Compiler options -->
-    <property name="optimize" value="false" />
-    <property name="debug" value="true" />
-    <property name="deprecation" value="false" />
-    <property name="javac.source" value="1.3" />
-    <property name="javac.target" value="1.3" />
-
-    <!-- vm to use for unit tests, will not override if already set -->
-    <!-- set to a dummy default val which will be ignored if already set -->
-    <property name="unitvm" value="-DzzzDummyVal" />
-
-    <echo message='org.name = "${org.name}"' />
-    <echo message='org.package.prefix = "${org.package.prefix}"' />
-    <echo message='project.name = "${project.name}"' />
-    <echo message='project.webapp.name = "${project.webapp.name}"' />
-    <echo message='project.title = "${project.title}"' />
-   	<echo message='project.base.version = "${project.base.version}"' />
-  	<echo message='project.version = "${project.version}"' />
-    <echo message='ant.file = "${ant.file}"' />
-    <echo message='basedir = "${basedir}"' />
-    <echo message='user.dir = "${user.dir}"' />
-    <echo message='ant.java.version = "${ant.java.version}"' />
-    <echo message='debug = "${debug}"' />
-    <echo message='optimize = "${optimize}"' />
-    <echo message='javac.source = "${javac.source}"' />
-    <echo message='javac.target = "${javac.target}"' />
-    <echo message='target.appserver = "${target.appserver}"' />
-    <echo message='unit test vm: vm arg="${unitvm}"' />
-  </target>
-
-  <target name="init.post" depends="eclipse.configure">
-
-    <!-- set target appserver, default to UNDEFINED. A project should override this
-       if it actually needs to use appserver specific properties -->
-    <property name="target.appserver" value="UNDEFINED" />
-
-    <!-- by default we filter certain file types on copying -->
-    <patternset id="std.files.to.filter">
-      <include name="**/*.xml" />
-      <include name="**/*.properties" />
-      <include name="**/*.conf" />
-      <include name="**/*.sql" />
-      <include name="**/*.txt" />
-      <include name="**/*.email" />
-      <include name="**/*.html" />
-      <include name="**/*.htm" />
-    </patternset>
-
-    <patternset id="std.files.not.to.filter">
-      <exclude name="**/*.xml" />
-      <exclude name="**/*.properties" />
-      <exclude name="**/*.conf" />
-      <exclude name="**/*.sql" />
-      <exclude name="**/*.txt" />
-      <exclude name="**/*.email" />
-      <exclude name="**/*.html" />
-      <exclude name="**/*.htm" />
-    </patternset>
-
-    <patternset id="web.public.content.files">
-      <patternset refid="image.files" />
-      <patternset refid="html.files" />
-      <include name="index.jsp" />
-      <include name="**/*.js" />
-      <exclude name="WEB-INF/**" />
-    </patternset>
-
-    <patternset id="image.files">
-      <include name="**/*.png" />
-      <include name="**/*.gif" />
-      <include name="**/*.jpg" />
-    </patternset>
-
-    <patternset id="html.files">
-      <include name="**/*.html" />
-      <include name="**/*.htm" />
-      <include name="**/*.css" />
-    </patternset>
-
-    <patternset id="web.protected.content.files">
-      <patternset refid="scriptlet.files" />
-      <patternset refid="web.config.files" />
-    </patternset>
-
-    <patternset id="scriptlet.files">
-      <include name="**/*.jsp" />
-      <include name="**/*.vm" />
-    </patternset>
-
-    <patternset id="web.config.files">
-      <include name="WEB-INF/classes/**/*.xml" />
-      <include name="WEB-INF/classes/**/*.properties" />
-      <include name="WEB-INF/classes/**/*.txt" />
-      <include name="WEB-INF/classes/**/*.conf" />
-    </patternset>
-
-    <property name="target.lib.dir" value="${target.artifacts.dir}/lib" />
-    <property name="project.war" value="${target.artifacts.war.dir}/${project.webapp.name}.war" />
-
-    <!-- convert appserver specific properties to final property names -->
-    <echoproperties destfile="properties.tmp">
-      <propertyset id="appserver.specific.properties">
-        <propertyref prefix="${target.appserver}" />
-        <mapper type="glob" from="${target.appserver}.*" to="*" />
-      </propertyset>
-    </echoproperties>
-    <loadproperties srcFile="properties.tmp" />
-    <delete file="properties.tmp" />
-
-  </target>
-
-  <target name="init.post2">
-
-    <path id="compile.classpath">
-      <fileset dir="${lib.dir}/global">
-        <include name="**/*.jar" />
-      </fileset>
-      <fileset dir="${lib.dir}/buildtime">
-        <include name="**/*.jar" />
-      </fileset>
-    </path>
-
-    <path id="test.classpath">
-      <path refid="compile.classpath" />
-      <fileset dir="${lib.dir}/test">
-        <include name="**/*.jar" />
-      </fileset>
-    </path>
-
-    <property name="init.done" value="true" />
-
-  </target>
-
-  <!-- used to assist loading of properties from environment -->
-  <target name="force.env.load">
-    <property environment="myenv" />
-  </target>
-
-  <!-- targets which allow loading a command line or env specified external properties file -->
-  <target name="init.cl.external.props" if="build.prop.file">
-    <property environment="myenv" />
-    <echo message='loading external prop file: ${build.prop.file}' />
-    <property file="${build.prop.file}" />
-  </target>
-
-  <target name="init.env.external.props" if="myenv.STUB.BUILD.PROP.FILE">
-    <property environment="myenv" />
-    <property file="${myenv.STUB.BUILD.PROP.FILE}" />
-    <echo message='loading external prop file: ${myenv.STUB.BUILD.PROP.FILE}' />
-  </target>
-
-  <!-- check.for.optional.packages:  -->
-  <!-- Check to see what optional dependencies are available -->
-  <target name="check.for.optional.packages">
-    <available property="jdk1.2+" classname="java.lang.ThreadLocal" />
-    <available property="jdk1.3+" classname="java.lang.StrictMath" />
-    <available property="xalan.present" classname="org.apache.xalan.xslt.XSLTProcessorFactory" />
-    <available property="junit.present" classname="junit.framework.TestCase" />
-
-    <!-- compiler value may be 'modern', 'classic', or 'jikes' -->
-    <!-- will do nothing if it has already been set for eclipse -->
-    <property name="build.compiler" value="modern" />
-
-  </target>
-
-  <!-- needed so this build can be run properly from Eclipse -->
-  <target name="eclipse.configure" if="eclipse.running">
-    <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-    <echo message="Configuring compiler for Eclipse..." />
-  </target>
-
-  <!-- clean:  Cleans up generated stuff -->
-  <target name="clean" depends="init" description="Scrub build, distribution, and test results directories">
-    <delete dir="${target.dir}" />
-    <!-- also clean up dist.dir, in case it is not under target.dir -->
-    <delete dir="${dist.dir}" />
-  </target>
-
-  <!-- clean-all:  Also cleans lib dir stuff pulled down by ivy -->
-  <target name="clean-all" depends="clean" description="Calls clean, but also cleans lib dir dependencies pulled down by Ivy">
-    <delete dir="${lib.dir}" />
-  </target>
-
-  <!-- build.prepare:  Prepares the build directory -->
-  <target name="build.prepare" unless="build.prepare.done" depends="init, check.for.optional.packages">
-    <tstamp />
-
-    <!-- set up dirs that we need -->
-    <antcall target="build.prepare.make.config.dirs" />
-
-    <mkdir dir="${target.dir}" />
-    <mkdir dir="${target.gen.java.dir}" />
-    <mkdir dir="${target.gen.java.test.dir}" />
-    <mkdir dir="${target.testresults.dir}" />
-    <mkdir dir="${target.classes.dir}" />
-    <mkdir dir="${target.testclasses.dir}" />
-
-    <!-- now we want to create/update file used for filter properties. Other parts of the
-         build can also write properties to this file. Note that we also do some work to put
-         out test results dir in UNIX format since it will go in the log4j.properties file -->
-    <copy file="${src.etc.dir}/filter.properties" overwrite="true" tofile="${target.filter.file}" failonerror="false" />
-    <path id="target.testresults.dir.path" location="${target.testresults.dir}" />
-    <pathconvert targetos="unix" property="target.testresults.dir.unix" refid="target.testresults.dir.path" />
-    <propertyfile file="${target.filter.file}">
-      <entry key="PROJECT_NAME" value="${project.name}" />
-      <entry key="TEST_RESULTS_DIR" value="${target.testresults.dir.unix}" />
-      <entry key="DATABASE_DRIVER" value="${database.driver}" />
-      <entry key="DATABASE_URL" value="${database.url}" />
-      <entry key="DATABASE_SCHEMA" value="${database.schema}" />
-      <entry key="DATABASE_USERNAME" value="${database.username}" />
-      <entry key="DATABASE_PASSWORD" value="${database.password}" />
-      <entry key="DATA_DIR" value="${data.dir}" />
-    </propertyfile>
-    <property name="build.prepare.done" value="true" />
-  </target>
-
-  <target name="build.prepare.make.config.dirs">
-    <mkdir dir="${lib.dir}/global" />
-    <mkdir dir="${lib.dir}/buildtime" />
-    <mkdir dir="${lib.dir}/test" />
-  </target>
-
-  <target name="ivy.configure" depends="init">
-    <echo>reading ivy config</echo>
-    <ivy:settings id="ivy.instance" file="${ivy.conf.dir}/ivysettings.xml" />
-  </target>
-
-  <presetdef name="resolve.conf">
-    <ivy:resolve file="${basedir}/ivy.xml" conf="${conf}" />
-  </presetdef>
-  <presetdef name="resolve.all">
-    <ivy:resolve file="${basedir}/ivy.xml" conf="*" />
-  </presetdef>
-
-  <!-- presetdef to retrieve one or more confs, defaulting to "default" -->
-  <presetdef name="retrieve.conf">
-    <ivy:retrieve pattern="${ivy.retrieve.pattern}" conf="default" />
-  </presetdef>
-  <presetdef name="retrieve.all">
-    <ivy:retrieve pattern="${${ivy.retrieve.pattern}}" conf="*" />
-  </presetdef>
-
-  <target name="retrieve.all" depends="resolve.all">
-    <retrieve.all />
-  </target>
-
-  <target name="resolve.conf" depends="ivy.configure">
-    <resolve.conf />
-  </target>
-
-  <target name="resolve.all" depends="ivy.configure">
-    <resolve.all />
-  </target>
-
-  <!-- resolve: resolve dependencies -->
-  <target name="resolve" depends="build.prepare, ivy.configure, resolve.pre, resolve.main, resolve.post" />
-  <target name="resolve.pre" />
-  <target name="resolve.main">
-    <property name="main.build.configs" value="global,buildtime,test" />
-    <resolve.conf conf="${main.build.configs}" />
-  </target>
-  <target name="resolve.post" />
-
-  <!-- retrieve: retrieve dependencies -->
-  <target name="retrieve" depends="resolve, retrieve.pre, retrieve.main, retrieve.post"
-          description="Retrieve all declared dependencies into the lib dir" />
-  <target name="retrieve.pre" />
-  <target name="retrieve.main">
-    <!-- when we retrieve with revision numbers in jar names, we really have to kill the
-       retrieve dir so we don't get multiple snapshot versions -->
-    <antcall target="clear.lib.dir.before.retrieve" />
-    <retrieve.conf conf="${main.build.configs}" />
-  </target>
-  <target name="retrieve.post" />
-
-  <target name="clear.lib.dir.before.retrieve" if="clear.libs.before.retrieve">
-    <delete dir="${lib.dir}" />
-    <antcall target="build.prepare.make.config.dirs" />
-  </target>
-
-  <!-- retrieve target to pull down deps and ivys to some location, used for building repos -->
-  <target name="retrieve-to-repo" depends="resolve">
-    <property name="retrieve.to.repo.conf" value="*" />
-    <property name="retrieve.to.repo.dir" value="${target.dir}/repo" />
-    <property name="retrieve.to.repo.pattern"
-	          value="[organisation]/[module]/[type]s/[artifact]-[revision].[ext]" />
-    <property name="retrieve.to.repo.pattern.ivy" 
-	          value="[organisation]/[module]/ivy-[revision].xml" />
-    <retrieve.conf conf="${retrieve.to.repo.conf}"
-	               pattern="${retrieve.to.repo.dir}/${retrieve.to.repo.pattern}"
-				   ivypattern="${retrieve.to.repo.dir}/${retrieve.to.repo.pattern.ivy}"/>
-  </target>
-
-  <!-- report: generate a dependencies report -->
-  <target name="report" depends="retrieve" description="Generates a dependencies report">
-  	<ivy:report todir="${target.dir}"/>
-  </target>
-
-  <!-- statics: copies statics files before compiles -->
-  <target name="statics" depends="retrieve, ivy.configure, statics.pre, statics.main, statics.test, statics.web, statics.post" description="Copy static files before compile, replacing tokens as needed">
-  </target>
-
-  <!-- hook target -->
-  <target name="statics.pre" />
-
-  <!-- copy main statics -->
-  <target name="statics.main">
-    <mkdir dir="${target.artifacts.dir}" />
-
-    <!-- copy everything from the source dir, except java and javadoc files. Do not filter. Files that need filtering should go in resources. -->
-    <copy todir="${target.classes.dir}">
-      <fileset dir="${src.java.main.dir}">
-        <exclude name="**/*.java" />
-        <exclude name="**/package.html"/>
-        <exclude name="**/overview.html"/>
-      </fileset>
-    </copy>
-
-    <!-- copy resource files if neccessary, filtering for non-binary types -->
-    <available file="${src.resources.dir}" property="resources.exists" />
-    <antcall target="copy.resources" />
-  </target>
-
-  <target name="copy.resources" if="resources.exists">
-    <copy todir="${target.classes.dir}" filtering="on">
-      <fileset dir="${src.resources.dir}">
-        <patternset refid="std.files.to.filter" />
-      </fileset>
-      <filterset>
-        <filtersfile file="${target.filter.file}" />
-      </filterset>
-    </copy>
-    <copy todir="${target.classes.dir}">
-      <fileset dir="${src.resources.dir}">
-        <patternset refid="std.files.not.to.filter" />
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- copy test statics -->
-  <target name="statics.test">
-
-    <!-- copy everything from the source dir, except java files. Do not filter. Files
-       that need filtering should source from ${src.test.resources.dir} -->
-    <copy todir="${target.testclasses.dir}">
-      <fileset dir="${src.java.test.dir}">
-        <exclude name="**/*.java" />
-      </fileset>
-    </copy>
-
-    <!-- copy test resource files if neccessary, filtering for non-binary types -->
-    <available file="${src.test.resources.dir}" property="test.resources.exists" />
-    <antcall target="copy.test.resources" />
-
-    <!-- write out a test.properties file with common properties -->
-    <propertyfile file="${target.testclasses.dir}/test.properties" comment="Common unit/integration test properties">
-      <entry key="lastupdate" type="date" value="now" />
-    </propertyfile>
-
-  </target>
-
-  <target name="copy.test.resources" if="test.resources.exists">
-    <copy todir="${target.testclasses.dir}" filtering="on">
-      <fileset dir="${src.test.resources.dir}">
-        <patternset refid="std.files.to.filter" />
-      </fileset>
-      <filterset>
-        <filtersfile file="${target.filter.file}" />
-      </filterset>
-    </copy>
-
-    <copy todir="${target.testclasses.dir}">
-      <fileset dir="${src.test.resources.dir}">
-        <patternset refid="std.files.not.to.filter" />
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="resources" depends="build.prepare" description="Force update of filterable resources (property config files, etc) needed at runtime and test time">
-    <copy todir="${target.classes.dir}" filtering="on" overwrite="true">
-      <fileset dir="${src.resources.dir}">
-        <patternset refid="std.files.to.filter" />
-      </fileset>
-      <filterset>
-        <filtersfile file="${target.filter.file}" />
-      </filterset>
-    </copy>
-    <copy todir="${target.classes.dir}" overwrite="true">
-      <fileset dir="${src.resources.dir}">
-        <patternset refid="std.files.not.to.filter" />
-      </fileset>
-    </copy>
-    <antcall target="test-resources"/>
-  </target>
-
-  <target name="test-resources" depends="build.prepare" description="Force update of filterable resources (logging config files, etc) needed at test time">
-    <copy todir="${target.testclasses.dir}" filtering="on" overwrite="true">
-      <fileset dir="${src.test.resources.dir}">
-        <patternset refid="std.files.to.filter" />
-      </fileset>
-      <filterset>
-        <filtersfile file="${target.filter.file}" />
-      </filterset>
-    </copy>
-
-    <copy todir="${target.testclasses.dir}" overwrite="true">
-      <fileset dir="${src.test.resources.dir}">
-        <patternset refid="std.files.not.to.filter" />
-      </fileset>
-    </copy>
-  </target>
-  
-  <!-- hook target -->
-  <target name="statics.post" />
-
-  <!-- gen: hook targets for code generation -->
-  <target name="gen" depends="statics, gen.pre, gen.main, gen.post" description="Generate code artifacts" />
-  <target name="gen.pre" />
-  <target name="gen.main" />
-  <target name="gen.post" />
-
-  <!-- compile:  Compiles the source code -->
-  <target name="compile" depends="gen, compile.pre, compile.main, compile.source, compile.tests, compile.post" description="Compile all source code" />
-
-  <!-- hook target -->
-  <target name="compile.pre" />
-
-  <!-- main compile target -->
-  <target name="compile.main">
-
-    <!-- copy any non-java files from the generated java source dir -->
-    <echo>copying generated resources</echo>
-    <copy todir="${target.classes.dir}">
-      <fileset dir="${target.gen.java.dir}">
-        <exclude name="**/*.java" />
-      </fileset>
-    </copy>
-
-	<!-- copy any non-java files from the generated test java source dir -->
-    <echo>copying generated test resources</echo>
-    <copy todir="${target.testclasses.dir}" >
-      <fileset dir="${target.gen.java.test.dir}">
-        <exclude name="**/*.java" />
-      </fileset>
-    </copy>
-
-    <!-- we also redo this when we actually produce a distribution -->
-    <filter token="VERSION" value="${project.version}" />
-    <filter token="DATE" value="${DSTAMP}" />
-    <filter token="TIME" value="${TSTAMPCOL}" />
-
-    <copy todir="${target.classes.dir}" overwrite="false" filtering="on">
-      <fileset dir="${src.java.main.dir}">
-        <include name="**/version.txt" />
-        <include name="**/defaultManifest.mf" />
-      </fileset>
-      <filterset>
-        <filtersfile file="${target.filter.file}" />
-      </filterset>
-    </copy>
-  </target>
-
-  <target name="compile.source">
-    <echo>compiling main sources</echo>
-    <javac destdir="${target.classes.dir}" debug="${debug}" deprecation="${deprecation}" optimize="${optimize}" source="${javac.source}" target="${javac.target}">
-      <src path="${src.java.main.dir}" />
-      <src path="${target.gen.java.dir}" />
-   	  <classpath refid="compile.classpath" />
-    </javac>
-  </target>
-
-  <target name="compile.tests">
-    <echo>compiling test sources</echo>
-    <javac destdir="${target.testclasses.dir}" debug="${debug}" deprecation="${deprecation}" optimize="${optimize}" source="${javac.source}" target="${javac.target}">
-		<src path="${src.java.test.dir}" />
-		<src path="${target.gen.java.test.dir}" />
-      <classpath>
-        <pathelement location="${target.classes.dir}" />
-        <path refid="test.classpath" />
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- hook target -->
-  <target name="compile.post" />
-
-  <!-- jar:  Creates main jar containing utility and other classes -->
-  <target name="jar" depends="compile, jar.pre, jar.main, jar.post" description="Create project jar containing code artifacts and other resources" />
-
-  <!-- hook target -->
-  <target name="jar.pre" depends="compile">
-    <mkdir dir="${target.lib.dir}" />
-  </target>
-
-  <!-- main jar target -->
-  <target name="jar.main">
-    <jar jarfile="${target.lib.dir}/${project.name}.jar">
-      <manifest>
-        <attribute name="Implementation-Vendor" value="${org.name}" />
-        <attribute name="Implementation-Title" value="${project.title}" />
-        <attribute name="Implementation-Version" value="${project.version}" />
-      </manifest>
-      <fileset dir="${target.classes.dir}">
-        <!-- todo, make this more selective, we don't neccessarily want to include everything here -->
-      </fileset>
-    </jar>
-  </target>
-
-  <target name="jar.post" />
-
-  <target name="source-zip" depends="jar">
-    <zip zipfile="${target.lib.dir}/${project.name}-src.zip">
-      <fileset dir="${src.java.main.dir}" />
-      <fileset dir="${target.gen.java.dir}" />
-    </zip>
-  </target>
-
-  <!-- web:  Creates primary webapp in exploded format -->
-  <target name="web" depends="source-zip, web.pre, web.main, web.post" if="build.web" description="Create this webapp in exploded format" />
-
-  <!-- copy web statics -->
-  <target name="statics.web" if="build.web">
-
-    <propertyfile file="${target.filter.file}">
-      <entry key="PROJECT_WEBAPP_NAME" value="${project.webapp.name}" />
-    </propertyfile>
-
-    <!-- copy statics files for exploded webapps.  This is useful for quick updating of a deployed webapp when
-         only statics files like images, jsps, html (no java code) change.  -->
-    <mkdir dir="${target.war.expanded.dir}" />
-    <copy todir="${target.war.expanded.dir}" filtering="on">
-      <fileset dir="${src.web.dir}">
-        <patternset refid="std.files.to.filter" />
-      </fileset>
-      <filterset>
-        <filtersfile file="${target.filter.file}" />
-      </filterset>
-    </copy>
-
-    <!-- Disable filtering on image and pdf files -->
-    <copy todir="${target.war.expanded.dir}">
-      <fileset dir="${src.web.dir}">
-        <patternset refid="std.files.not.to.filter" />
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- hook target -->
-  <target name="web.pre" if="build.web" />
-
-  <!-- note that we don't copy buildtime or test dependencies to WEB-INF/lib -->
-  <target name="web.main" if="build.web">
-    <antcall target="web.copy.classes" />
-    <antcall target="web.copy.libs" />
-  </target>
-
-  <!-- broken out so derived build can override which classes and libs get copied -->
-  <target name="web.copy.classes">
-    <!-- by default copy all classes -->
-    <copy todir="${target.war.expanded.dir}/WEB-INF/classes">
-      <fileset dir="${target.classes.dir}">
-        <include name="**/*" />
-      </fileset>
-    </copy>
-  </target>
-  <target name="web.copy.libs">
-    <!-- by default copy all classes -->
-    <copy todir="${target.war.expanded.dir}/WEB-INF/lib" flatten="true">
-      <fileset dir="${lib.dir}/global">
-        <include name="**/*.jar" />
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- hook target -->
-  <target name="web.post" if="build.web" />
-
-  <!-- war: Creates primary web-app in war format -->
-  <target name="war" depends="web, war.pre, war.main, war.post" if="build.web" description="Create the webapp in .war format" />
-
-  <!-- hook target -->
-  <target name="war.pre" if="build.web" />
-
-  <!-- main war target -->
-  <target name="war.main" if="build.web">
-    <mkdir dir="${target.artifacts.war.dir}" />
-    <jar jarfile="${project.war}">
-      <fileset dir="${target.war.expanded.dir}">
-        <exclude name="**/*.dependency" />
-      </fileset>
-    </jar>
-  </target>
-
-  <!-- hook target -->
-  <target name="war.post" if="build.web" />
-
-  <!-- TODO: all the EJB stuff still needs to get updated for Ivy -->
-
-  <!-- exp-ear:  Creates an enterprise application (EAR) in exploded format -->
-  <target name="ear-stage" depends="war, ear.stage.pre, ear.stage.main, ear.stage.post" if="build.j2eeapp" description="Create this enterprise application (.ear) in exploded format" />
-
-  <!-- hook target -->
-  <target name="ear.stage.pre" if="build.j2eeapp">
-    <mkdir dir="${target.ear.dir}" />
-  </target>
-
-  <!-- main exp-ear target -->
-  <target name="ear.stage.main" if="build.j2eeapp">
-
-    <!-- copy ear application.xml, replacing tokens as needed -->
-    <copy file="${src.dir}/application/META-INF/application.xml" tofile="${target.ear.dir}/META-INF/application.xml" filtering="on" />
-
-    <!-- copy web-apps -->
-    <mkdir dir="${target.artifacts.dir}/war" />
-    <copy todir="${target.ear.dir}">
-      <fileset dir="${target.artifacts.dir}/war">
-        <include name="${project.name}.war" />
-      </fileset>
-    </copy>
-
-    <!-- note: any EJB 2.1 ejbs are handled by ejb21-targets.xml -->
-
-    <!-- copy special log4j properties jar -->
-    <copy todir="${target.ear.dir}">
-      <fileset dir="${target.lib.dir}">
-        <include name="log4j-properties.jar" />
-      </fileset>
-    </copy>
-
-    <!-- copy support libs -->
-    <pathtofileset2 name="deps.ear.modules.fileset" pathrefid="deps.ear.modules" ignoreNonExistent="false" />
-    <copy todir="${target.ear.dir}" flatten="yes">
-      <fileset dir="${target.lib.dir}">
-        <include name="${project.name}.jar" />
-      </fileset>
-      <fileset refid="deps.ear.modules.fileset" />
-    </copy>
-
-  </target>
-
-  <!-- hook target -->
-  <target name="ear.stage.post" if="build.j2eeapp" />
-
-  <target name="ear" depends="ear-stage, ear.pre, ear.main, ear.post" if="build.j2eeapp" description="Create the enterprise application archive (.ear)" />
-
-  <!-- hook target -->
-  <target name="ear.pre" if="build.j2eeapp" />
-
-  <!-- main ear target -->
-  <target name="ear.main" if="build.j2eeapp">
-    <mkdir dir="${target.artifacts.ear.dir}" />
-    <ear earfile="${target.artifacts.ear.dir}/${project.name}.ear" appxml="${target.ear.dir}/META-INF/application.xml">
-      <fileset dir="${target.ear.dir}">
-        <exclude name="**/application.xml" />
-      </fileset>
-    </ear>
-  </target>
-
-  <!-- hook target -->
-  <target name="ear.post" if="build.j2eeapp" />
-
-  <!-- publish:  Construct and publish the project distributables -->
-  <target name="publish" depends="ear, publish.setup, publish.do.publish"
-          description="Publish this project in the ivy repository"/>
-
-  <target name="publish.setup">
-  
-    <!-- we do physical publish by default, unless do.publish property set to "false" -->
-    <condition property="publish.needed">
-      <or>
-        <not><isset property="do.publish"/></not>
-        <istrue value="${do.publish}"/>
-      </or>
-    </condition>
-
-    <!-- we clean out the deliver dir, since we don't want multiple integration versions
-       to end up in there -->
-    <delete dir="${ivy.distrib.dir}/jars" />
-    <delete dir="${ivy.distrib.dir}/ivys" />
-
-    <tstamp>
-      <format property="pubdate" pattern="yyyyMMddHHmmss" />
-      <!-- default value -->
-    </tstamp>
-
-    <mkdir dir="${ivy.distrib.dir}/jars" />
-    <copy file="${target.lib.dir}/${project.name}.jar" tofile="${ivy.distrib.dir}/jars/${project.name}-${project.version}.jar" />
-    <copy file="${target.lib.dir}/${project.name}-src.zip" tofile="${ivy.distrib.dir}/jars/${project.name}-src-${project.version}.zip" failonerror="no"/>
-  </target>
-  
-  <target name="publish.do.publish" if="publish.needed">
-    <ivy:publish resolver="integration-repo" artifactspattern="${ivy.distrib.dir}/jars/[artifact]-[revision].[ext]" pubrevision="${project.version}" pubdate="${pubdate}" srcivypattern="${ivy.srcivypattern}" />
-    <echo message="project ${project.name} released with version ${project.version}" />
-  </target>
-  
-  <!-- dist:  Construct the project distributables, but really an alias for publish -->
-  <target name="dist" depends="publish, dist.pre, dist.main, dist.post" description="Create all project distributables">
-  </target>
-
-  <!-- hook target -->
-  <target name="dist.pre" />
-  <target name="dist.main" />
-  <target name="dist.post" />
-
-  <!-- javadocs:  Creates the API documentation -->
-  <target name="javadoc" depends="build.prepare" description="Create the project API documentation">
-    <mkdir dir="${target.javadocs.dir}" />
-    <javadoc destdir="${target.javadocs.dir}" author="true" version="true" windowtitle="${project.title} ${project.version} API" doctitle="${project.title} ${project.version}" bottom="${project.copyright}"
-      overview="${src.java.main.dir}/overview.html">
-      <classpath>
-        <pathelement location="${target.classes.dir}" />
-        <pathelement location="${target.testclasses.dir}" />
-        <path refid="compile.classpath"/>
-      </classpath>
-      <sourcepath>
-        <pathelement location="${src.java.main.dir}" />
-      </sourcepath>
-      <packageset dir="${src.java.main.dir}">
-        <include name="**/*" />
-      </packageset>
-    </javadoc>
-  </target>
-
-  <!-- run: allows arbitrary java code to be run -->
-  <target name="run" depends="init,guard.runclass" description="Run a java application">
-    <java classname="${run.class}" fork="true">
-      <classpath>
-        <pathelement location="${target.classes.dir}" />
-        <pathelement location="${target.testclasses.dir}" />
-        <path refid="test.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="guard.runclass" unless="run.class">
-    <fail message="The target you are attempting to run requires the ${run.class} property to be set, which doesn't appear to be" />
-  </target>
-
-  <!-- runp: allows arbitrary java code to be run, prompting for arguments -->
-  <target name="run-with-arguments" depends="init,guard.runclass" description="Run a java application with arguments">
-    <input message="Please enter arguments:" addproperty="run.arguments" />
-
-    <java classname="${run.class}" fork="true">
-      <arg line="${run.arguments}" />
-      <classpath>
-        <pathelement location="${target.classes.dir}" />
-        <pathelement location="${target.testclasses.dir}" />
-        <path refid="test.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <!-- classicvm:  call before any other targets if you want to run unit tests with classic vm  -->
-  <target name="classicvm">
-    <property name="unitvm" value="-classic" />
-  </target>
-
-  <!-- jvm arguments we want tacked on to all unit tests -->
-  <!-- set fake default value, will not override existing setting -->
-  <property name="test.arguments" value="-Dzzz456zzz" />
-
-  <target name="tests.prepare" depends="compile" unless="tests.prepare.done">
-    <mkdir dir="${target.testresults.dir}" />
-    <delete>
-      <fileset dir="${target.testresults.dir}" includes="**/*.txt,**/*.log" />
-    </delete>
-    <property name="tests.prepare.done" value="true" />
-  </target>
-
-  <!-- automatically runs all the junit tests. -->
-  <target name="tests" depends="tests-local" description="Runs all tests, first local then server (if any)">
-    <!-- add code here to run server unit tests if there are any -->
-    <!-- this usually involves starting up the server, and in parallel running tests against it -->
-  </target>
-
-  <!-- automatically runs all the junit tests, with compile dependencies. -->
-  <target name="tests-dist" depends="dist, tests" description="Run all tests after creating a project distribution" />
-
-  <!-- Runs the local unit tests. -->
-  <target name="tests-local" depends="tests.prepare" description="Run all local tests">
-    <!-- for the time being we just halt on failure, since these are
-         local tests and there is no server to shut down, etc. But if
-         we want to optionally run all tests and report on the whole
-         batch, then we need to set a failure property as in the server
-         tests. -->
-    <junit forkmode="perBatch" printsummary="yes" haltonfailure="no" haltonerror="no"
-                    dir="${basedir}">
-      <jvmarg value="${unitvm}" />
-      <jvmarg value="-Djava.security.auth.login.config=${target.testclasses.dir}/auth.conf" />
-      <jvmarg value="${test.arguments}" />
-      <jvmarg value="-XX:MaxPermSize=128m"/>
-      <classpath>
-        <pathelement location="${target.classes.dir}" />
-        <pathelement location="${target.testclasses.dir}" />
-        <pathelement location="${target.genclasses.dir}" />
-        <path refid="test.classpath" />
-      </classpath>
-
-      <formatter type="plain" />
-      <formatter type="xml" />
-
-      <batchtest fork="yes" todir="${target.testresults.dir}">
-        <fileset dir="${target.testclasses.dir}" includes="${test.includes}" excludes="${test.excludes}" />
-      </batchtest>
-    </junit>
-
-  </target>
-
-  <!-- runs one local unit test -->
-  <target name="test" depends="guard.testclass,tests.prepare" description="Runs one local test using the value of the test.class property">
-    <junit forkmode="perBatch" printsummary="yes" haltonfailure="no" haltonerror="no">
-      <jvmarg value="${unitvm}" />
-      <jvmarg value="-Djava.security.auth.login.config=${target.testclasses.dir}/auth.conf" />
-      <jvmarg value="${test.arguments}" />
-      <jvmarg value="-XX:MaxPermSize=128m"/>
-      <classpath>
-        <pathelement location="${target.classes.dir}" />
-        <pathelement location="${target.testclasses.dir}" />
-        <pathelement location="${target.genclasses.dir}" />
-        <path refid="test.classpath" />
-      </classpath>
-      <formatter type="plain" />
-      <formatter type="xml" />
-      <!-- the test case -->
-      <test name="${test.class}" todir="${target.testresults.dir}" />
-    </junit>
-  </target>
-
-  <target name="guard.testclass" unless="test.class">
-    <fail message="The target you are attempting to run requires the ${test.class} property to be set, which doesn't appear to be" />
-  </target>
-
-  <!--
-        test-example - a sample unit test
-        shows how to make a target to run just one specific unit test instead
-        of having to specify the class
-        
-    It can get a lot more elaborate than this, with various properties being
-    set up, etc. Property files can be written out, etc.
-    
-    <target name="test.example" depends="init">
-        <antcall target="test">
-            <param name="test.class" value="com.mycompany.myproject.MyTest"/>
-        </antcall>
-      </target>
-  -->
-</project>
\ No newline at end of file
diff --git a/common-build/db-targets.xml b/common-build/db-targets.xml
deleted file mode 100644
index e010aa67..00000000
--- a/common-build/db-targets.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2004-2007 the original author or authors.
-  
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- - - -
-
- Author: Colin Sampaleanu
- Author: Keith Donald
-
- Ant XML fragment that contains useful targets for working with databases.  These 
- include targets to load the project db schema and test data, as well as export a
- dbunit dtd to facilitate validating xml test data documents.
- 
- This fragment is meant to be imported into a project build file, along with
- common-targets.xml, in order to provide build handling for basic db-properties and
- operations. This is an optional module, and due to the way the ant import works,
- there is no way to automatically hook this up into the build. The importing project
- must override appropropriate 'hook' targets from common-targets.xml, and then have
- the override targets depend on both the targets from common-targets and those from here.
--->
-<project name="db-targets" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-
-	<import file="common-targets.xml" />
-
-	<!-- db.task.init: not to be called directly, but needed by other targets -->
-	<target name="db.task.init" depends="dbunit.presetdef.schema,
-											dbunit.presetdef.noschema,
-											retrieve">
-		<property name="src.db.dir" value="${src.etc.dir}/db"/>
-		<property name="target.db.dir" value="${target.dir}/db"/>
-		<presetdef name="my.sql">
-			<sql driver="${database.driver}" url="${database.url}" userid="${database.username}" password="${database.password}" classpathref="test.classpath" />
-		</presetdef>
-		<presetdef name="my.sqladmin">
-			<sql driver="${database.driver}" url="${database.url}" userid="${database.admin.username}" password="${database.admin.password}" classpathref="test.classpath" />
-		</presetdef>
-	</target>
-
-	<target name="dbunit.presetdef.schema" if="database.schema">
-		<taskdef name="dbunit" classname="org.dbunit.ant.DbUnitTask" classpathref="test.classpath" />
-		<presetdef name="my.dbunit">
-			<dbunit driver="${database.driver}" url="${database.url}" schema="${database.schema}" 
-					userid="${database.username}" password="${database.password}">
-				<classpath>
-					<path refid="test.classpath" />
-					<pathelement location="${src.test.resources.dir}" />
-				</classpath>
-			</dbunit>
-		</presetdef>
-	</target>
-	<target name="dbunit.presetdef.noschema" unless="database.schema">
-		<taskdef name="dbunit" classname="org.dbunit.ant.DbUnitTask" classpathref="test.classpath" />
-		<presetdef name="my.dbunit">
-			<dbunit driver="${database.driver}" url="${database.url}"
-					userid="${database.username}" password="${database.password}">
-				<classpath>
-					<path refid="test.classpath" />
-					<pathelement location="${src.test.resources.dir}" />
-				</classpath>
-			</dbunit>
-		</presetdef>
-	</target>
-
-	<target name="db-schema-create" depends="db.task.init" description="Load the project schema (tables) into the database">
-		<property name="sql.src" value="${src.db.dir}/schema.sql" />
-		<antcall target="db-sql">
-			<param name="onerror" value="continue" />
-			<param name="autocommit" value="true" />
-		</antcall>
-	</target>
-
-	<target name="db-user-create" depends="db.task.init" description="Create the project schema tablespaces and user">
-		<property name="sql.src" value="${target.testclasses.dir}/create-user.sql" />
-		<antcall target="db-sql-admin">
-			<param name="onerror" value="continue" />
-			<param name="autocommit" value="true" />
-		</antcall>
-	</target>
-
-	<target name="db-schema-dtd" depends="db.task.init" description="Export db unit dtd for testdata file">
-		<mkdir dir="${target.db.dir}" />
-		<my.dbunit>
-			<export dest="${target.db.dir}/schema.dtd" format="dtd" />
-		</my.dbunit>
-	</target>
-
-	<target name="db-data-load" depends="db.task.init" description="Load all data contained in a file to the database">
-		<property name="db.data.file" value="${src.db.dir}/data.xml" />
-		<my.dbunit>
-			<operation type="CLEAN_INSERT" src="${db.data.file}" />
-		</my.dbunit>
-	</target>
-
-	<target name="db-sql" depends="guard.sqlsrc, db.task.init" description="Execute sql statements stored in the file defined by the ${sql.src} property">
-		<property name="onerror" value="stop" />
-		<property name="autocommit" value="false" />
-		<echo>User sql.src = '${sql.src}'</echo>
-		<my.sql src="${sql.src}" onerror="${onerror}" autocommit="${autocommit}">
-			<classpath>
-				<path refid="test.classpath" />
-				<pathelement location="${src.test.resources.dir}" />
-			</classpath>
-		</my.sql>
-	</target>
-
-	<target name="db-sql-admin" depends="guard.sqlsrc, guard.admin, db.task.init" description="Execute sql statements stored in the file defined by the ${sql.src} property">
-		<property name="onerror" value="stop" />
-		<property name="autocommit" value="false" />
-		<echo>Admin sql.src = '${sql.src}'</echo>
-		<my.sqladmin src="${sql.src}" onerror="${onerror}" autocommit="${autocommit}">
-			<classpath>
-				<path refid="test.classpath" />
-				<pathelement location="${src.test.resources.dir}" />
-			</classpath>
-		</my.sqladmin>
-	</target>
-
-	<target name="guard.sqlsrc" unless="sql.src">
-		<fail message="The target you are attempting to run requires the ${sql.src} property to be set, but it doesn't appear to be" />
-	</target>
-	
-	<target name="guard.admin" unless="database.admin.username">
-		<fail message="The target you are attempting to run requires the ${database.admin.username} property to be set, but it doesn't appear to be.  Since this is a local admin property, define it in a local (secured) build.properties file" />
-	</target>
-	
-</project>
\ No newline at end of file
diff --git a/common-build/doc-targets.xml b/common-build/doc-targets.xml
deleted file mode 100644
index 140e7c07..00000000
--- a/common-build/doc-targets.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2004-2007 the original author or authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- - - -
- Author: Alef Arendsen
-
- Targets for generating reference documentation.
--->
-
-<project name="doc-targets" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-
-	<import file="common-targets.xml" />
-
-	<target name="doc-targets">
-		<echo>
-Targets for generating reference documentation.
-
-Please execute
-	ant -p
-
-to see a list of all relevant targets.
-		</echo>
-	</target>
-
-	<target name="doc-clean" description="Delete temporary directories for reference docs">
-		<delete quiet="true" dir="${docs.ref.target.dir}" />
-	</target>
-
-	<target name="doc-prepare">
-		<fail message="Supporting libraries needed to generate documentation not found in: ${docs.ref.lib.dir}, please see docs/reference/readme.txt for instructions.">
-			<condition>
-				<not>
-					<available file="${docs.ref.lib.dir}" />
-				</not>
-			</condition>
-		</fail>
-		<copy todir="${docs.ref.target.dir}/images">
-			<fileset dir="${docs.ref.dir}/images">
-				<include name="*.gif" />
-				<include name="*.png" />
-				<include name="*.svg" />
-				<include name="*.jpg" />
-			</fileset>
-			<fileset dir="${docs.ref.dir}/images">
-				<include name="**/*.gif" />
-				<include name="**/*.png" />
-				<include name="**/*.svg" />
-				<include name="**/*.jpg" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="doc-pdf" depends="doc-prepare" description="Generate PDF reference documentation">
-		<mkdir dir="${docs.ref.target.dir}/pdf/images" />
-		<copy todir="${docs.ref.target.dir}/pdf/images">
-			<fileset dir="${docs.ref.src.dir}/images">
-				<include name="*.gif" />
-				<include name="*.png" />
-				<include name="*.svg" />
-				<include name="*.jpg" />
-			</fileset>
-		</copy>
-		
-		<java classname="com.icl.saxon.StyleSheet" fork="true" dir="${docs.ref.dir}" failonerror="true">
-			<classpath>
-				<fileset dir="${docs.ref.lib.dir}">
-					<include name="**/*.jar" />
-				</fileset>
-			</classpath>
-			<arg value="-o" />
-			<arg value="${docs.ref.target.dir}/pdf/docbook_fop.tmp" />
-			<arg value="${docs.ref.src.dir}/index.xml" />
-			<arg value="${docs.ref.dir}/styles/fopdf.xsl" />
-		</java>
-
-		<java classname="org.apache.fop.apps.Fop" fork="true" maxmemory="256m" dir="${docs.ref.dir}" failonerror="true">
-			<classpath>
-				<fileset dir="${docs.ref.lib.dir}">
-					<include name="**/*.jar" />
-				</fileset>
-			</classpath>
-			<arg value="-d"/>
-			<arg value="${docs.ref.target.dir}/pdf/docbook_fop.tmp" />
-			<arg value="${docs.ref.target.dir}/pdf/${ant.project.name}-reference.pdf" />
-		</java>
-		<delete file="${docs.ref.target.dir}/pdf/docbook_fop.tmp" />
-	</target>
-
-	<target name="doc-html" depends="doc-prepare" description="Generate multi-page HTML reference documentation">
-		<mkdir dir="${docs.ref.target.dir}/html/images" />
-		<mkdir dir="${docs.ref.target.dir}/html_single/styles" />
-		<copy todir="${docs.ref.target.dir}/html/images">
-			<fileset dir="${docs.ref.src.dir}/images">
-				<include name="*.gif" />
-				<include name="*.png" />
-				<include name="*.svg" />
-				<include name="*.jpg" />
-			</fileset>
-		</copy>
-		<copy todir="${docs.ref.target.dir}/html/styles" file="${docs.ref.dir}/styles/html.css"/>
-
-		<java classname="com.icl.saxon.StyleSheet" fork="true" dir="${docs.ref.target.dir}/html" failonerror="true">
-			<classpath>
-				<fileset dir="${docs.ref.lib.dir}">
-					<include name="**/*.jar" />
-				</fileset>
-			</classpath>
-			<arg value="${docs.ref.src.dir}/index.xml" />
-			<arg value="${docs.ref.dir}/styles/html_chunk.xsl" />
-		</java>
-		<delete file="${docs.ref.target.dir}/html/docbook_fop.tmp" />
-	</target>
-
-	<target name="doc-htmlsingle" depends="doc-prepare" description="Generate single-page HTML reference documentation">
-		<mkdir dir="${docs.ref.target.dir}/html_single/images" />
-		<mkdir dir="${docs.ref.target.dir}/html_single/styles" />
-		<copy todir="${docs.ref.target.dir}/html_single/images">
-			<fileset dir="${docs.ref.src.dir}/images">
-				<include name="*.gif" />
-				<include name="*.png" />
-				<include name="*.svg" />
-				<include name="*.jpg" />
-			</fileset>
-		</copy>
-		<copy todir="${docs.ref.target.dir}/html_single/styles" file="${docs.ref.dir}/styles/html.css"/>
-
-		<java classname="com.icl.saxon.StyleSheet" fork="true" dir="${docs.ref.target.dir}/html_single"
-				failonerror="true">
-			<classpath>
-				<fileset dir="${docs.ref.lib.dir}">
-					<include name="**/*.jar" />
-				</fileset>
-			</classpath>
-			<arg value="-o" />
-			<arg value="${docs.ref.target.dir}/html_single/index.html" />
-			<arg value="${docs.ref.src.dir}/index.xml" />
-			<arg value="${docs.ref.dir}/styles/html.xsl" />
-		</java>
-		<delete file="${docs.ref.target.dir}/htmlsingle/docbook_fop.tmp" />
-	</target>
-
-	<target name="doc-all" depends="doc-html,doc-htmlsingle,doc-pdf" description="Generate reference documentation in all formats" />
-
-</project>
\ No newline at end of file
diff --git a/common-build/ejb21-targets.xml b/common-build/ejb21-targets.xml
deleted file mode 100644
index b1abb951..00000000
--- a/common-build/ejb21-targets.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2004-2007 the original author or authors.
-  
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- - - -
- Author: Colin Sampaleanu
-
- This ant XML fragment is meant to be imported into a project build file, along with
- common-targets.xml, in order to provide build handling for EJB 2.1 format EJBs. This
- is an optional module, and due to the way the ant import works, there is no way to
- automatically hook this up into the build. The importing project must override
- appropropriate 'hook' targets from common-targets.xml, and then have the override 
- targets depend on both the targets from common-targets and those from here.
-
- TODO: this is currently not finished. It is in the process of being re-organized due
- to use of Ivy.
--->
-
-<project name="ejb21" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-
-	<import file="common-targets.xml" />
-
-	<!--
-        init: this target must be hooked up to after common-targets.init
-  -->
-	<target name="init">
-		<!-- where ejbs go -->
-		<property name="target.ejb.dir" value="${target.artifacts.dir}/ejb" />
-		<!-- where any exploded ejbs go -->
-		<property name="target.ear.expanded.dir" value="${target.artifacts.dir}/ejb-expanded/primary" />
-		<!-- where deployment descriptors go -->
-		<property name="target.ear.expanded.descriptor.dir" value="${target.ear.expanded.dir}/META-INF" />
-	</target>
-
-	<!--
-        copy-target-ejbs: copies ejbs from target.ejb.dir where something like XDoclet
-		has produced them, into target.expear.dir
-		This target must be hooked up to run before or after common-targets.ear.stage.main
-  -->
-	<target name="copy.target.ejbs" if="build.j2eeapp">
-
-		<!-- copy ejb modules -->
-		<mkdir dir="${target.ejb.dir}" />
-		<copy todir="${target.ear.expanded.dir}">
-			<fileset dir="${target.ejb.dir}">
-				<include name="*.jar" />
-			</fileset>
-		</copy>
-	</target>
-
-</project>
\ No newline at end of file
diff --git a/common-build/hibernate-targets.xml b/common-build/hibernate-targets.xml
deleted file mode 100644
index 3b73e69d..00000000
--- a/common-build/hibernate-targets.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2004-2007 the original author or authors.
-  
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- - - -
-
- Author: Colin Sampaleanu
- Author: Keith Donald
-
- Ant XML fragment that contains useful targets for working with hibernate.  These 
- include targets to generate hibernate mappings from xdoclet attributes, as well as 
- export a database schema from the mappings.
- 
- This ant XML fragment is meant to be imported into a project build file, along with
- common-targets.xml. This is an optional module, and due to the way the ant import works,
- there is no way to automatically hook this up into the build. The importing project
- must override appropropriate 'hook' targets from common-targets.xml, and then have
- the override targets depend on both the targets from common-targets and those from here.
-
--->
-
-<project name="hibernate-targets" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-
-	<import file="common-targets.xml" />
-
-	<!-- hooks: these are not optional! -->
-
-	<!-- you must hook build.prepare -->
-	<target name="build.prepare" depends="common-targets.build.prepare">
-		<!-- Make sure hibernatedoclet is necessary -->
-		<uptodate property="hibernatedoclet.unnecessary">
-			<srcfiles dir="${src.java.main.dir}" includes="**/*.java" />
-			<srcfiles dir="${target.gen.java.dir}" includes="**/*.java" />
-			<mapper type="glob" from="*.java" to="${target.classes.dir}/*.class" />
-		</uptodate>
-
-		<propertyfile file="${target.filter.file}">
-			<entry key="HIBERNATE_DIALECT" value="${hibernate.dialect}" />
-			<entry key="HIBERNATE_SHOW_SQL" value="${hibernate.show.sql}" />
-		</propertyfile>
-
-		<path id="xdoclet.classpath">
-			<path refid="test.classpath" />
-		</path>
-
-		<path id="hibernate.classpath">
-			<path refid="test.classpath" />
-			<path location="${target.classes.dir}" />
-			<pathelement location="${target.testclasses.dir}" />
-		</path>
-	</target>
-
-	<!-- you must hook statics! -->
-	<target name="statics" depends="common-targets.statics">
-		<antcall target="hibernatedoclet" />
-	</target>
-
-	<!-- end of hooks -->
-
-	<!-- hibernatedoclet: generates Hibernate mapping files based on XDoclet marked-up Plain Old Java Object (POJO) -->
-	<target name="hibernatedoclet" depends="hibernate.task.init" if="use.hibernatedoclet" unless="hibernatedoclet.unnecessary" description="Generate Persistence and form classes">
-
-		<taskdef name="hibernatedoclet" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="xdoclet.classpath" />
-
-		<!-- generate hibernate files -->
-		<hibernatedoclet destdir="${target.gen.java.dir}" mergedir="${src.etc.dir}/merge" excludedtags="@version,@author" addedtags="@xdoclet-generated at ${TODAY}" force="${xdoclet.force}">
-			<fileset dir="${src.java.main.dir}" />
-			<hibernate validatexml="true" version="3.0" />
-		</hibernatedoclet>
-	</target>
-
-	<target name="hibernate.task.init" depends="retrieve">
-		<taskdef name="schemaexport" classname="org.hibernate.tool.hbm2ddl.SchemaExportTask">
-			<classpath>
-				<path refid="xdoclet.classpath" />
-				<path refid="hibernate.classpath" />
-			</classpath>
-		</taskdef>
-	</target>
-
-	<!-- db-init: generates the database schema and creates tables based on the mapping files  -->
-	<target name="hibernate-schema-create" depends="hibernate.task.init, statics" description="Creates database tables from hibernate mapping files">
-		<mkdir dir="${target.dir}/db" />
-		<antcall target="generate.hibernate.properties" />
-		<schemaexport quiet="no" text="no" drop="no" delimiter=";" properties="${target.dir}/db/database.properties" output="${target.dir}/db/hib-schema.sql">
-			<fileset dir="${target.classes.dir}" includes="**/*.hbm.xml" />
-		</schemaexport>
-	</target>
-
-	<!-- db-init: drops the database tables -->
-	<target name="hibernate-schema-drop" depends="hibernate.task.init, statics" description="Drop database tables created by Hibernate's schema export">
-		<mkdir dir="${target.dir}/db" />
-		<antcall target="generate.hibernate.properties" />
-		<schemaexport quiet="no" text="no" drop="yes" delimiter=";" properties="${target.dir}/db/database.properties" output="${target.dir}/db/hib-drop-tables.sql">
-			<fileset dir="${target.classes.dir}" includes="**/*.hbm.xml" />
-		</schemaexport>
-	</target>
-
-	<!-- this task is called by tasks that need it in build.xml -->
-	<target name="generate.hibernate.properties">
-		<echo>generating database.properties from build.properties</echo>
-		<propertyfile comment="Hibernate Configuration for targets from db-targets.xml" file="${target.dir}/db/database.properties">
-			<entry key="hibernate.connection.driver_class" value="${database.driver}" />
-			<entry key="hibernate.connection.url" value="${database.url}" />
-			<entry key="hibernate.connection.username" value="${database.username}" />
-			<entry key="hibernate.connection.password" value="${database.password}" />
-			<entry key="hibernate.dialect" value="${hibernate.dialect}" />
-			<entry key="hibernate.connection.show_sql" value="${hibernate.show.sql}" />
-		</propertyfile>
-		<property file="database.properties" />
-	</target>
-
-</project>
\ No newline at end of file
diff --git a/common-build/ivyconf.properties b/common-build/ivyconf.properties
deleted file mode 100644
index 19c464b9..00000000
--- a/common-build/ivyconf.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-ivy.checksums=
-repository.dir=${ivy.conf.dir}/../repository
-integration.repo.dir=${ivy.conf.dir}/../integration-repo
diff --git a/common-build/ivysettings.xml b/common-build/ivysettings.xml
deleted file mode 100644
index c20a010d..00000000
--- a/common-build/ivysettings.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivysettings>
-	<properties file="${ivy.conf.dir}/ivyconf.properties"/>
-	<settings defaultResolver="maven"/>
-		<resolvers>
-		<chain name="spring-projects" returnFirst="true">
-			<!-- try developer's local integration repository first -->
-			<filesystem name="integration-repo">
-				<ivy pattern="${integration.repo.dir}/artifacts/[organisation]/[module]/ivy-[revision].xml"/>
-				<artifact pattern="${integration.repo.dir}/artifacts/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
-			</filesystem>
-
-			<!-- try shared local filesystem repository second -->
- 			<filesystem name="filesystem-repo">
-  				<ivy pattern="${repository.dir}/[organisation]/[module]/ivy-[revision].xml" /> 
-				<artifact pattern="${repository.dir}/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" /> 
-			</filesystem>
-
-			<!-- pull from the main release repository third -->
-			<ibiblio name="maven-central" checkconsistency="false" m2compatible="true" root="http://repo1.maven.org/maven2"/>
-
-			<!-- if still not resolved, try release -->
-			<ibiblio name="maven-spring-release" checkconsistency="false" m2compatible="true" root="http://s3.amazonaws.com/maven.springframework.org/release/"/>
-			
-			<!-- if still not resolved, try milestones -->
-			<ibiblio name="maven-spring-milestone" checkconsistency="false" m2compatible="true" root="http://s3.amazonaws.com/maven.springframework.org/milestone/"/>
-
-		</chain>
-
-		<chain name="maven" returnFirst="true">
-			<!-- try shared local filesystem repository first -->
-			<filesystem name="filesystem-repo">
-  				<ivy pattern="${repository.dir}/[organisation]/[module]/ivy-[revision].xml" /> 
-				<artifact pattern="${repository.dir}/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" /> 
-			</filesystem>
-           	
-			<!-- if still not resolved, try external repo -->
-			<url name="spring-repo-ext" m2compatible="true">
-				<ivy pattern="https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/[organisation]/[module]/ivy-[revision].xml" />
-				<artifact pattern="https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
-			</url>
-
-			<!-- try central maven repository -->
-           	<ibiblio name="maven-central" checkconsistency="false" m2compatible="true" root="http://repo1.maven.org/maven2/"/>
-
-			<!-- try jboss maven repo -->
-			<ibiblio name="maven-jboss" checkconsistency="false" m2compatible="true" root="http://repository.jboss.com/maven2/"/>
-			
-			<!-- try the maven java.net maven repo -->
-			<url name="maven-java.net" m2compatible="false">
-				<artifact pattern="http://download.java.net/maven/1/[organisation]/jars/[artifact]-[revision].[ext]" />
-			</url>
-			
-		</chain>
-
-	</resolvers>
-
-	<modules>
-		<!-- Pointing modules at local resolvers speeds resolution performance -->
-		<module organisation="org.springframework" name="spring-agent" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-aop" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-aspects" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-beans" resolver="spring-projects"/>
-       	<module organisation="org.springframework" name="spring-binding" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-context" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-context-support" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-core" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-dao" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-faces" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-hibernate2" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-hibernate3" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-ibatis" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-jca" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-jdbc" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-jdo" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-jms" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-jmx" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-jpa" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-mock" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-obj" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-orm" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-oxm" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-portlet" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-remoting" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-struts" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-support" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-test" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-tomcat-weaver" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-toplink" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-tx" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-web" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-webflow" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-webmvc" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-webmvc-portlet" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-webmvc-struts" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-ws-core" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-ws-security" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-xml" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="spring-ldap" resolver="spring-projects"/>
-		<module organisation="org.springframework" name="various" resolver="spring-projects"/>
-		<module organisation="org.springframework.security" name="spring-security-core" resolver="spring-projects"/>
-		<module organisation="org.springframework.security" name="spring-security-acl" resolver="spring-projects"/>
-		<module organisation="org.springframework.security" name="spring-security-taglibs" resolver="spring-projects"/>
-	</modules>
-</ivysettings>
diff --git a/common-build/lib/ivy-2.0.0-beta1.jar b/common-build/lib/ivy-2.0.0-beta1.jar
deleted file mode 100644
index fec033cc..00000000
Binary files a/common-build/lib/ivy-2.0.0-beta1.jar and /dev/null differ
diff --git a/common-build/project.properties b/common-build/project.properties
deleted file mode 100644
index d76f6920..00000000
--- a/common-build/project.properties
+++ /dev/null
@@ -1,135 +0,0 @@
-# values in here are overriden by build.properties and project.properties in
-# individual projects, and build.properties in this dir, in that order
-
-# default wildcard for finding JUnit tests
-# the convention is that our JUnit test classes have XXXTests-style names
-test.includes=**/*Test.class,**/*Tests.class
-
-# wildcards to exclude among JUnit tests
-test.excludes=**/Abstract*
-
-# we define standard directory locations here
-# these should not normally never have to be overriden
-# we define them here instead of in the XML so that Ant nested property
-# replacement can work for properties overrides by other properties files
-
-# root of any bin files needed during build
-bin.dir=${basedir}/bin
-
-# libs needed for build process. ivy pulls down jars into various dirs under here
-lib.dir=${basedir}/lib
-
-# any static libs that need to be checked in instead of being pulled down by ivy
-# should be placed somehwere under here. The standard build doesn't touch this though
-static.lib.dir=${basedir}/static-lib
-
-# root of sources hierarchy
-src.dir=${basedir}/src
-
-# main sources
-src.java.main.dir=${src.dir}/main/java
-
-# test sources
-src.java.test.dir=${src.dir}/test/java
-
-# root of web-apps sources
-src.web.dir=${basedir}/src/main/webapp
-
-# root of source doc files
-src.doc.dir=${basedir}/src/doc
-
-# root of etc hierarchy, typically used for templated sources and config files
-src.etc.dir=${basedir}/src/etc
-
-# resources get copied into target classes dir with filtering
-src.resources.dir=${src.dir}/main/resources
-src.dtd.dir=${src.etc.dir}/dtd
-src.tld.dir=${src.etc.dir}/tld
-
-# test resources get copied into target test classes dir with filtering
-src.test.resources.dir=${src.etc.dir}/test-resources
-
-# root of build hierarchy
-target.dir=${basedir}/target
-  	
-# any generated java sources go here
-target.gen.java.dir=${target.dir}/gen-java-src
-target.gen.java.test.dir=${target.dir}/gen-java-test-src
-  	
-# where built source class files and resources go
-target.classes.dir=${target.dir}/classes
-
-# where built test class files and resources go
-target.testclasses.dir=${target.dir}/test-classes
-  	
-# where test results end up
-target.testresults.dir=${target.dir}/test-reports
-
-# where JavaDoc generate files go
-target.javadocs.dir=${target.dir}/javadocs
-  	
-# where J2SE/J2EE modules (.jar, .war, .ear) go
-target.artifacts.dir=${target.dir}/artifacts
-
-# where target lib archives (.JARs) go
-target.lib.dir=${target.artifacts.dir}/lib
-
-# where WAR archive goes
-target.artifacts.war.dir=${target.artifacts.dir}/war
-  	
-# where EAR archive goes
-target.artifacts.ear.dir=${target.artifacts.dir}/ear
-
-# where any exploded web-app goes
-target.war.expanded.dir=${target.artifacts.dir}/war-expanded
-    	
-# where any exploded EAR goes
-target.ear.expanded.dir=${target.artifacts.dir}/ear-expanded
-
-# file used to provide token filter values during text file copies
-target.filter.file=${target.dir}/filter.properties
-
-# where all project documentation resides
-docs.dir=${basedir}/docs
-
-# where all project reference documentation resides
-docs.ref.dir=${docs.dir}/reference
-
-# where all project reference documentation sources reside
-docs.ref.src.dir=${docs.dir}/reference/src
-
-# where all DocBook libraries reside
-docs.ref.lib.dir=${docs.dir}/reference/lib
-
-# where the project reference documentation is built
-docs.ref.target.dir=${docs.dir}/reference/target
-
-# where the dist target is saved
-dist.dir=${target.dir}/dist
-
-# sample: set proper packages here, for javadocs
-packages=stub.*
-
-# override default ivy retrieve pattern to include configuration name in path, and no
-# revision number The main advantage of no revision number in the name is that when pulling
-# down subsequent snapshots of the same jar, a newer one will just overwrite a previous
-# version. This means we are not forced to clean the lib dir between retrieves.
-ivy.retrieve.pattern=${lib.dir}/[conf]/[artifact].[ext]
-
-# To add the revision, comment out the previous, and add next 2 to build.properties
-# clear.libs.before.retrieve=anything
-# ivy.retrieve.pattern=${lib.dir}/[conf]/[artifact]-[revision].[ext]
-
-# now define patterns for special retrieve used to build repo for release
-release.repo.ivy.retrieve.pattern=[organisation]/[module]/[revision]/[artifact]-[revision].[ext]
-release.repo.ivy.retrieve.ivy.pattern=[organisation]/[module]/ivy-[revision].xml
-
-# override default ivy distrib dir to go under targets
-ivy.distrib.dir=${target.dir}/dist
-# override where ivy.xml files are placed, so they are hierarchical and are safe
-# to merge from multiple projects
-ivy.srcivypattern=${ivy.distrib.dir}/ivys/[organisation]/[module]/ivy-[revision].xml
-
-# Location where temporary data goes. Only used for Oracle-specific create-user script
-# needs to be customized for the user if location is not appropriate, or always for unix
-data.dir=c:\\temp
\ No newline at end of file
diff --git a/common-build/readme.txt b/common-build/readme.txt
deleted file mode 100644
index d94b2b73..00000000
--- a/common-build/readme.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Contained in this directory is the Spring Jumpstart common build system used 
-to build all Spring projects.
-
-This generic build system is ant 1.6 based and also requires Ivy 1.3 or > for dependency management.
-
-Projects are expected to import master build files contained within 
-this directory as needed for the build targets they require.
-
-Build targets are organized into logical files:
-- common-targets.xml : core targets applicable to all projects
-- clover-targets.xml : for working with clover
-- tomcat-targets.xml : for deploying webapps to the tomcat servlet container
-etc...
-
-As an example, here is Spring Web Flow's project build.xml:
-
-<project name="spring-webflow" default="dist">
-
-  <property file="build.properties"/>
-  <property file="project.properties"/>
-  <property file="${common.build.dir}/build.properties"/>
-  <property file="${common.build.dir}/project.properties"/>
-  <property file="${user.home}/build.properties"/>
-
-  <property name="project.title" value="Spring Web Flow"/>
-  <property name="project.package" value="org.springframework.webflow"/>
-  
-  <import file="${common.build.dir}/common-targets.xml"/>
-
-  <import file="${common.build.dir}/clover-targets.xml"/>
-
-</project>
-
-This build.xml imports the "common-targets.xml" fragment containing
-core targets for compilation, distribution unit creation, and junit 
-testing.  It also imports "clover-targets.xml" to facilitate the 
-generation of test coverage reports with clover.
\ No newline at end of file
diff --git a/common-build/spring-targets.xml b/common-build/spring-targets.xml
deleted file mode 100644
index 681ffb54..00000000
--- a/common-build/spring-targets.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2004-2007 the original author or authors.
-  
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- - - -
- Author: Keith Donald
--->
-
-<project name="spring-targets" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-
-	<import file="common-targets.xml"/>
-
-	<target name="spring-beandoc" depends="init" description="Generate Spring bean documentation">
-
-		<property name="spring.beandoc.input.files" value="${src.web.dir}/WEB-INF/applicationContext.xml"/>
-		<property name="spring.beandoc.output.dir" value="${target.artifacts.dir}/beandoc/"/>
-		<property name="spring.beandoc.properties" value="${common.build.dir}/beandoc.properties"/>
-
-		<mkdir dir="${spring.beandoc.output.dir}"/>
-
-		<path id="beandoc.classpath">
-			<path refid="test.classpath"/>
-		</path>
-
-		<taskdef name="beandoc" classname="org.springframework.beandoc.client.AntTask">
-			<classpath refid="beandoc.classpath"/>
-		</taskdef>
-
-		<beandoc 
-			inputFiles="${spring.beandoc.input.files}" 
-			outputDir="${spring.beandoc.output.dir}"
-	   		beandocProps="${spring.beandoc.properties}"
-		/>
-	</target>
-
-</project>
\ No newline at end of file
diff --git a/common-build/templates/db/data.xml b/common-build/templates/db/data.xml
deleted file mode 100644
index bae3fc3d..00000000
--- a/common-build/templates/db/data.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE dataset SYSTEM "schema.dtd">
-<dataset>
-	<!-- table data rows go here -->
-</dataset>
\ No newline at end of file
diff --git a/common-build/templates/jsp/includeBottom.jsp b/common-build/templates/jsp/includeBottom.jsp
deleted file mode 100644
index b83efd99..00000000
--- a/common-build/templates/jsp/includeBottom.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="copyright">
-	<p>&copy; Copyright 2007, <a href="http://www.springframework.org">www.springframework.org</a>, under the terms of the Apache 2.0 software license.</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/common-build/templates/jsp/includeTop.jsp b/common-build/templates/jsp/includeTop.jsp
deleted file mode 100644
index 5911a810..00000000
--- a/common-build/templates/jsp/includeTop.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%@ page contentType="text/html" %>
-<%@ page session="false" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-
-<html>
-<head>
-<title>@TITLE@</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body>
-
-<div id="logo">
-	<img src="images/spring-logo.jpg" alt="Logo" border="0"> 
-</div>
-
-<div id="navigation">
-
-</div>
\ No newline at end of file
diff --git a/common-build/templates/jsp/pageshell.jsp b/common-build/templates/jsp/pageshell.jsp
deleted file mode 100644
index c60d2bb5..00000000
--- a/common-build/templates/jsp/pageshell.jsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<%@ include file="includeTop.jsp" %>
-
-<div id="content">
-
-</div>
-
-<%@ include file="includeBottom.jsp" %>
\ No newline at end of file
diff --git a/common-build/templates/log4j/log4j.properties b/common-build/templates/log4j/log4j.properties
deleted file mode 100644
index 5223d5b0..00000000
--- a/common-build/templates/log4j/log4j.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-log4j.rootCategory=WARN, stdout, logfile
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=${@PROJECT_NAME@.root}/@PROJECT_NAME@.log
-log4j.appender.logfile.MaxFileSize=512KB
-
-# Keep three backup files
-log4j.appender.logfile.MaxBackupIndex=3
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-
-#Pattern to output : date priority [category] - <message>line_separator
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-# Enable debug interceptor
-#log4j.category.org.springframework.aop.interceptor=DEBUG
\ No newline at end of file
diff --git a/common-build/templates/projects/standard/.classpath b/common-build/templates/projects/standard/.classpath
deleted file mode 100644
index ce8eb525..00000000
--- a/common-build/templates/projects/standard/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry output="target/classes" kind="src" path="src/java"/>
-	<classpathentry output="target/test-classes" kind="src" path="src/test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/global/log4j.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring.jar"/>
-	<classpathentry kind="lib" path="lib/test/easymock.jar"/>
-	<classpathentry kind="lib" path="lib/test/junit.jar"/>
-	<classpathentry kind="lib" path="lib/test/spring-mock.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/common-build/templates/projects/standard/build.xml b/common-build/templates/projects/standard/build.xml
deleted file mode 100644
index c38a109a..00000000
--- a/common-build/templates/projects/standard/build.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="@PROJECT_NAME@" default="dist">
-
-  <!-- you may override default properties for the build by using entries
-       in a build.properties file, or by just adding 'property' elements
-	   here, before the following properties files are loaded -->
-  <property file="build.properties"/>
-  <property file="project.properties"/>
-  <property file="${common.build.dir}/build.properties"/>
-  <property file="${common.build.dir}/project.properties"/>
-  <property file="${user.home}/build.properties"/>
-
-  <import file="${common.build.dir}/common-targets.xml"/>
-
-  <!-- import clover support -->
-  <import file="${common.build.dir}/clover-targets.xml"/>
-
-</project>
\ No newline at end of file
diff --git a/common-build/templates/projects/standard/ivy.xml b/common-build/templates/projects/standard/ivy.xml
deleted file mode 100644
index 6bb7d161..00000000
--- a/common-build/templates/projects/standard/ivy.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<ivy-module version="1.1">
-
-    <info organisation="@ORGANISATION@" module="@PROJECT_NAME@"/>
-
-    <configurations>
-		<!-- default configuration that 'by default' pulls in the global configuration -->
-		<conf name="default" extends="global"/>
-
-		<!-- core dependencies needed at compile-time, test-time, and runtime -->
-		<conf name="global" visibility="private"/>
-
-		<!-- additional dependencies needed only at build-time -->
-		<conf name="buildtime" visibility="private"/>
-
-		<!-- additional dependencies needed only at test-time -->
-		<conf name="test" visibility="private"/>
-    </configurations>
-
-    <dependencies defaultconf="global->default">
-    	<!-- global (compile, test, runtime) dependencies -->
-	    <dependency org="apache" name="commons-logging" rev="1.1"/>
-    	<dependency org="apache" name="log4j" rev="1.2.13"/>
-		<dependency	org="org.springframework" name="spring-beans" rev="2.0-rc3"/>
-		<dependency	org="org.springframework" name="spring-core" rev="2.0-rc3"/>
-		<dependency	org="org.springframework" name="spring-context"	rev="2.0-rc3"/>
-
-		<!-- build time only dependencies -->
-        
-        <!-- test time only dependencies -->
-        <dependency org="easymock" name="easymock" rev="1.1" conf="test->default"/>
-        <dependency org="cenqua" name="clover" rev="1.3.11" conf="test->default"/>
-        <dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/>
-        <dependency org="springframework" name="spring-mock" rev="2.0-rc3" conf="test->default"/>
-    </dependencies>
-</ivy-module>
\ No newline at end of file
diff --git a/common-build/templates/projects/standard/project.properties b/common-build/templates/projects/standard/project.properties
deleted file mode 100644
index 1fecca74..00000000
--- a/common-build/templates/projects/standard/project.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# to override these or other properties with local user settings,
-# create a unversioned build.properties file
-
-# The location of the common build system
-common.build.dir=${basedir}/../common-build
\ No newline at end of file
diff --git a/common-build/templates/projects/standard/src/etc/filter.properties b/common-build/templates/projects/standard/src/etc/filter.properties
deleted file mode 100644
index c54e5880..00000000
--- a/common-build/templates/projects/standard/src/etc/filter.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Header$
-
-# Contains filterable project settings.  Setting placeholders in filterable project text
-# files will be replaced with these values when the 'statics' build target is run.
-#
-# You may add static settings directly to this source file in the format:
-#    setting=value  e.g MY_SETTING=myvalue
-# This is appropriate usage if you know the setting value will never change.
-#
-# At build time this source file is copied to the ${target.dir} where additional 
-# dynamic settings may be appended using the <propertyfile> task.  Use this approach
-# when a setting value depends on the build or the local user's environment.
-#
-# An example of this approach is shown below:
-#
-# build.xml
-# <target name="build.prepare" depends="common-targets.build.prepare">
-#   <!-- Append additional local settings that are applicable to this project -->
-#  	<propertyfile file="${target.filter.file}">
-#  		 <!-- key=the name of the setting
-#             value=the property in your build.properties file that has the local setting value -->
-#  	     <entry key="MY_LOCAL_SETTING" value="${my.local.setting}" />
-#  	</propertyfile>
-# </target>
-#
-# This allows for dynamic replacement values that are sourced from local properties files to facilitate
-# local user settings.
-#
-# To refer to filterable settings within project source files like config files, JSPs, or
-# other text files use the standard ant placeholder format:
-#     @SETTING_NAME@ e.g, @MY_SETTING@ and @MY_LOCAL_SETTING@
-#
-# Your settings:
diff --git a/common-build/templates/projects/standard/src/etc/test-resources/log4j.properties b/common-build/templates/projects/standard/src/etc/test-resources/log4j.properties
deleted file mode 100644
index c6d11b4d..00000000
--- a/common-build/templates/projects/standard/src/etc/test-resources/log4j.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-log4j.rootCategory=WARN, stdout, logfile
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=${@PROJECT_NAME@.root}/@PROJECT_NAME@.log
-log4j.appender.logfile.MaxFileSize=512KB
-
-# Keep three backup files
-log4j.appender.logfile.MaxBackupIndex=3
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-
-#Pattern to output : date priority [category] - <message>line_separator
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n
diff --git a/common-build/templates/projects/standard/src/etc/test-resources/readme.txt b/common-build/templates/projects/standard/src/etc/test-resources/readme.txt
deleted file mode 100644
index 5ae540d8..00000000
--- a/common-build/templates/projects/standard/src/etc/test-resources/readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-test-resources
----------
-Test-time related configuration files (*.properties, *.xml) and other resources reside in this directory.  These files are copied into the test classpath, they are not included in the project distribution unit.
-
-You may remove this file once you understand the project structure and the purpose of this directory: this file also serves as a "empty directory" placeholder so CVS won't prune the directory.
\ No newline at end of file
diff --git a/common-build/templates/projects/standard/src/main/java/readme.txt b/common-build/templates/projects/standard/src/main/java/readme.txt
deleted file mode 100644
index d13c5d57..00000000
--- a/common-build/templates/projects/standard/src/main/java/readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-java
-------
-Project source code resides in this directory.  Files here are compiled into classes placed in ${project.dir}/target/classes and added to the compile classpath.
-
-You may remove this file once you understand the project structure and the purpose of this directory: this file also serves as a "empty directory" placeholder so CVS won't prune the directory.
diff --git a/common-build/templates/projects/standard/src/main/resources/readme.txt b/common-build/templates/projects/standard/src/main/resources/readme.txt
deleted file mode 100644
index b354a2ba..00000000
--- a/common-build/templates/projects/standard/src/main/resources/readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-resources
----------
-Tweakable application configuration files (*.properties) and other resources reside in this directory.
-
-You may remove this file once you understand the project structure and the purpose of this directory: this file also serves as a "empty directory" placeholder so CVS won't prune the directory.
\ No newline at end of file
diff --git a/common-build/templates/projects/standard/src/test/java/readme.txt b/common-build/templates/projects/standard/src/test/java/readme.txt
deleted file mode 100644
index 4a11f99e..00000000
--- a/common-build/templates/projects/standard/src/test/java/readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-test
-------
-Project unit and integration tests reside within this directory.  Files here are compiled into classes placed in ${project.dir}/target/test-classes and added to the test classpath.
-
-You may remove this file once you understand the project structure and the purpose of this directory: this file also serves as a "empty directory" placeholder so CVS won't prune the directory.
diff --git a/common-build/templates/projects/webapp/WEB-INF/classes/log4j.properties b/common-build/templates/projects/webapp/WEB-INF/classes/log4j.properties
deleted file mode 100644
index 5223d5b0..00000000
--- a/common-build/templates/projects/webapp/WEB-INF/classes/log4j.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-log4j.rootCategory=WARN, stdout, logfile
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=${@PROJECT_NAME@.root}/@PROJECT_NAME@.log
-log4j.appender.logfile.MaxFileSize=512KB
-
-# Keep three backup files
-log4j.appender.logfile.MaxBackupIndex=3
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-
-#Pattern to output : date priority [category] - <message>line_separator
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-# Enable debug interceptor
-#log4j.category.org.springframework.aop.interceptor=DEBUG
\ No newline at end of file
diff --git a/common-build/templates/projects/webapp/WEB-INF/dispatcher-servlet-config.xml b/common-build/templates/projects/webapp/WEB-INF/dispatcher-servlet-config.xml
deleted file mode 100644
index d32bf1cd..00000000
--- a/common-build/templates/projects/webapp/WEB-INF/dispatcher-servlet-config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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
-       http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-</beans>
\ No newline at end of file
diff --git a/common-build/templates/projects/webapp/WEB-INF/web.xml b/common-build/templates/projects/webapp/WEB-INF/web.xml
deleted file mode 100644
index 8c924b9e..00000000
--- a/common-build/templates/projects/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-    version="2.4">
-	
-	<!--
-	  - Location of the Spring bean definition files, for initialization of
-	  - root spring application context
-	  -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			<!-- Service layer config files go here, space delimited -->
-		</param-value>
-	</context-param>
-
-	<!--
-	  - Load the spring root application context from the paths define by
-	  - the contextConfigLocation param.
-	  -->	
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	
-	<servlet>
-		<servlet-name>@PROJECT_NAME@</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<init-param>
-			<param-name>contextConfigLocation</param-name>
-			<param-value>/WEB-INF/dispatcher-servlet-config.xml</param-value>
-		</init-param>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>@PROJECT_NAME@</servlet-name>
-		<url-pattern>*.htm</url-pattern>
-	</servlet-mapping>
-	
-</web-app>
\ No newline at end of file
diff --git a/common-build/templates/projects/webapp/index.html b/common-build/templates/projects/webapp/index.html
deleted file mode 100644
index b37b2a3f..00000000
--- a/common-build/templates/projects/webapp/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<title>Shell</title>
-</head>
-
-<body>
-
-</body>
-
-</html>
diff --git a/common-build/templates/readme.txt b/common-build/templates/readme.txt
deleted file mode 100644
index cd23c818..00000000
--- a/common-build/templates/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Contained in this directory are useful templates for projects, configuration files, 
-and Java artifacts for products such as Spring, Spring Web Flow, and log4j.
\ No newline at end of file
diff --git a/common-build/templates/spring-webflow/FlowExecutionTestTemplate.java b/common-build/templates/spring-webflow/FlowExecutionTestTemplate.java
deleted file mode 100644
index a387ed55..00000000
--- a/common-build/templates/spring-webflow/FlowExecutionTestTemplate.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package webflow.templates;
-
-import java.util.Map;
-
-import org.springframework.webflow.definition.registry.FlowDefinitionResource;
-import org.springframework.webflow.test.execution.AbstractXmlFlowExecutionTests;
-import org.springframework.webflow.test.execution.MockFlowServiceLocator;
-
-public class FlowExecutionTestTemplate extends AbstractXmlFlowExecutionTests {
-
-	public void testStartFlow() {
-		
-	}
-	
-	@Override
-	protected FlowDefinitionResource getFlowDefinitionResource() {
-        return createFlowDefinitionResource("/path/to/myflow.xml");
-	}
-
-	@Override
-	protected void registerMockServices(MockFlowServiceLocator serviceRegistry) {
-
-	}
-}
\ No newline at end of file
diff --git a/common-build/templates/spring-webflow/flow-definition-1.0-form.xml b/common-build/templates/spring-webflow/flow-definition-1.0-form.xml
deleted file mode 100644
index 6435e161..00000000
--- a/common-build/templates/spring-webflow/flow-definition-1.0-form.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flow xmlns="http://www.springframework.org/schema/webflow"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-1.0.xsd">
-
-	<start-state idref="displayForm"/>
-
-	<view-state id="displayForm" view="form">
-		<render-actions>
-			<action bean="formAction" method="setupForm"/>
-		</render-actions>
-		<transition on="submit" to="finish">
-			<action bean="formAction" method="bindAndValidate"/>
-		</transition>
-	</view-state>
-
-	<end-state id="finish"/>
-	
-	<import resource="my-flow-beans.xml"/>
-	
-</flow>
\ No newline at end of file
diff --git a/common-build/templates/spring-webflow/flow-definition-1.0-simplest.xml b/common-build/templates/spring-webflow/flow-definition-1.0-simplest.xml
deleted file mode 100644
index 927a309d..00000000
--- a/common-build/templates/spring-webflow/flow-definition-1.0-simplest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flow xmlns="http://www.springframework.org/schema/webflow"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-1.0.xsd">
-
-	<start-state idref="displayView" />
-	
-	<view-state id="displayView" view="view">
-		<transition on="submit" to="finish"/>
-	</view-state>
-
-	<end-state id="finish"/>
-	
-</flow>
\ No newline at end of file
diff --git a/common-build/templates/spring-webflow/flow-definition-1.0.xml b/common-build/templates/spring-webflow/flow-definition-1.0.xml
deleted file mode 100644
index aa080bea..00000000
--- a/common-build/templates/spring-webflow/flow-definition-1.0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flow xmlns="http://www.springframework.org/schema/webflow"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="
-          http://www.springframework.org/schema/webflow
-          http://www.springframework.org/schema/webflow/spring-webflow-1.0.xsd">
-
-	<start-state idref="yourStartStateId" />
-
-	<!-- Define your states here -->
-	
-</flow>
\ No newline at end of file
diff --git a/common-build/templates/spring-webflow/webflow-config-1.0-spring-1.2.xml b/common-build/templates/spring-webflow/webflow-config-1.0-spring-1.2.xml
deleted file mode 100644
index 77c48d22..00000000
--- a/common-build/templates/spring-webflow/webflow-config-1.0-spring-1.2.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" 
-	"http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-
-	<!-- 
-		Exposes web flows for execution at a single request URL.
-		The id of a flow to launch should be passed in by clients using
-		the "_flowId" request parameter:
-		e.g. /flowController.htm?_flowId=myflow
-	-->
-	<bean name="/flowController.htm" class="org.springframework.webflow.executor.mvc.FlowController">
-		<property name="flowExecutor" ref="flowExecutor" />
-	</bean>
-
-	<!-- Launches new flow executions and resumes existing executions: Spring 1.2 config version -->
-	<bean id="flowExecutor" class="org.springframework.webflow.config.FlowExecutorFactoryBean">
-		<property name="definitionLocator" ref="flowRegistry"/>
-	</bean>
-	
-	<!-- Creates the registry of flow definitions for this application: Spring 1.2 config version -->	
-	<bean id="flowRegistry" class="org.springframework.webflow.engine.builder.xml.XmlFlowRegistryFactoryBean">
-		<property name="flowLocations" value="/WEB-INF/flows/**/*-flow.xml"/>
-	</bean>
-	
-	<!-- Resolves flow view names to .jsp templates -->
-	<bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/WEB-INF/jsp/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/common-build/templates/spring-webflow/webflow-config-1.0.xml b/common-build/templates/spring-webflow/webflow-config-1.0.xml
deleted file mode 100644
index 0cb22d0e..00000000
--- a/common-build/templates/spring-webflow/webflow-config-1.0.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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:flow="http://www.springframework.org/schema/webflow-config"
-       xsi:schemaLocation="
-           http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-           http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-1.0.xsd">
-
-	<!-- 
-		Exposes web flows for execution at a single request URL.
-		The id of a flow to launch should be passed in by clients using
-		the "_flowId" request parameter:
-		e.g. /flowController.htm?_flowId=myflow
-	-->
-	<bean name="/flowController.htm" class="org.springframework.webflow.executor.mvc.FlowController">
-		<property name="flowExecutor" ref="flowExecutor" />
-	</bean>
-
-	<!-- Launches new flow executions and resumes existing executions. -->
-	<flow:executor id="flowExecutor" registry-ref="flowRegistry"/>
-
-	<!-- Creates the registry of flow definitions for this application -->
-	<flow:registry id="flowRegistry">
-		<flow:location path="/WEB-INF/flows/**/*-flow.xml" />
-	</flow:registry>
-
-	<!-- Resolves flow view names to .jsp templates -->
-	<bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/WEB-INF/jsp/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/common-build/templates/spring-webflow/webflow-form.jsp b/common-build/templates/spring-webflow/webflow-form.jsp
deleted file mode 100644
index 285f09ca..00000000
--- a/common-build/templates/spring-webflow/webflow-form.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ include file="includeTop.jsp" %>
-
-<div id="content">
-	<form action="flowController.htm" method="post"/>
-	<table>
-		<tr>
-			<td colspan="2" class="buttonBar">
-				<!-- Tell webflow what flow execution we're participating in -->
-				<input type="hidden" name="_flowExecutionKey" value="${flowExecutionKey}"/>
-				<!-- Tell webflow what event occurred -->
-				<input type="submit" name="_eventId_submit" value="Submit">
-			</td>
-		</tr>
-	</table>
-    </form>
-</div>
-
-<%@ include file="includeBottom.jsp" %>
\ No newline at end of file
diff --git a/common-build/templates/spring/bean-definitions-1.2.xml b/common-build/templates/spring/bean-definitions-1.2.xml
deleted file mode 100644
index 7be11e1c..00000000
--- a/common-build/templates/spring/bean-definitions-1.2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" 
-	"http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-
-	<!-- Deploy your beans here -->
-	
-</beans>
\ No newline at end of file
diff --git a/common-build/templates/spring/bean-definitions-2.0.xml b/common-build/templates/spring/bean-definitions-2.0.xml
deleted file mode 100644
index 5ae46de2..00000000
--- a/common-build/templates/spring/bean-definitions-2.0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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
-	       http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
-	<!-- Deploy your beans here -->
-
-</beans>
\ No newline at end of file
diff --git a/common-build/templates/tomcat/context.xml b/common-build/templates/tomcat/context.xml
deleted file mode 100644
index 0aa6e718..00000000
--- a/common-build/templates/tomcat/context.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Context path="/@PROJECT_NAME@" docBase="@DOC_BASE@"
-        debug="0" privileged="true">
-
-</Context>
diff --git a/common-build/tomcat-targets.xml b/common-build/tomcat-targets.xml
deleted file mode 100644
index d872ca9b..00000000
--- a/common-build/tomcat-targets.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2004-2007 the original author or authors.
-  
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- - - -
-
- Author: Keith Donald
- Author: Colin Sampaleanu
-
- Ant XML fragment that contains useful targets for working with tomcat.  These 
- include targets to spawn a tomcat process deplyoing the project, as well as update
- the deployed application and static web content.
- 
- This ant XML fragment is meant to be imported into a project build file, along with
- common-targets.xml. This is an optional module, and due to the way the ant import works,
- there is no way to automatically hook this up into the build. The importing project
- must override appropropriate 'hook' targets from common-targets.xml, and then have
- the override targets depend on both the targets from common-targets and those from here.
-
--->
-
-<!--
-  For these tasks to work, the specified user (tomcat.username property below,
-  which defaults to 'manager' but may be specified in build.properties) must be
-  a user defined in the TomCat server, and that user must have the role
-  'manager'. For the default in-memory realm in TomCat, this is done by modifying
-  conf/tomcat-users.xml in the TomCat install. See
-      http://jakarta.apache.org/tomcat/tomcat-5.5-doc/manager-howto.html
-  for more information.
--->
-
-<project name="tomcat-targets" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-
-	<import file="common-targets.xml" />
-
-	<target name="tomcat.init" depends="init,guard.tomcatdir">
-		<property name="tomcat.deploy.dir" value="${tomcat.dir}/webapps" />
-		<property name="tomcat.manager.url" value="http://localhost:8080/manager" />
-		<property name="tomcat.username" value="manager" />
-		<property name="tomcat.password" value="manager" />
-
-		<taskdef resource="org/apache/catalina/ant/catalina.tasks" onerror="ignore">
-			<classpath>
-				<filelist dir="${tomcat.dir}/server/lib">
-					<file name="catalina.jar" />
-					<file name="catalina-ant.jar" />
-				</filelist>
-			</classpath>
-		</taskdef>
-	</target>
-
-	<target name="guard.tomcatdir" unless="tomcat.dir">
-		<fail message="The target you are attempting to run requires the ${tomcat.dir} property to be set, which doesn't appear to be" />
-	</target>
-
-	<target name="tomcat-deploy" depends="tomcat.init, war" description="Install this web application to tomcat">
-		<deploy url="${tomcat.manager.url}" username="${tomcat.username}" password="${tomcat.password}" path="/${project.webapp.name}" war="${project.war}" />
-	</target>
-
-	<target name="tomcat-undeploy" depends="tomcat.init" description="Remove this application from tomcat">
-		<undeploy url="${tomcat.manager.url}" username="${tomcat.username}" password="${tomcat.password}" path="/${project.webapp.name}" failonerror="false" />
-	</target>
-
-	<target name="tomcat-redeploy" depends="tomcat-undeploy, tomcat-deploy" description="Redeploy the web application" />
-
-	<target name="tomcat-reload" depends="tomcat.init" description="Reload this application in tomcat">
-		<reload url="${tomcat.manager.url}" username="${tomcat.username}" password="${tomcat.password}" path="/${project.name}" />
-	</target>
-
-	<target name="tomcat-copy-war" depends="tomcat.init, war" description="Copy this application .war to tomcat">
-		<copy file="${project.war}" todir="${tomcat.deploy.dir}" />
-	</target>
-
-	<target name="tomcat-clean-war" depends="tomcat.init" description="Clean this application expanded war directory from tomcat">
-		<delete failonerror="false" dir="${tomcat.deploy.dir}/${project.webapp.name}" />
-	</target>
-
-	<target name="tomcat-refresh-war" depends="tomcat-clean-war, tomcat-copy-war" description="Clean and copy this application .war to tomcat">
-	</target>
-
-	<target name="tomcat-launch" depends="tomcat.init,tomcat-refresh-war" description="Launch the tomcat server process and have it deploy this web application">
-		<exec dir="${tomcat.dir}/bin" executable="startup.bat" spawn="true" vmlauncher="false">
-			<env key="JAVA_OPTS" value="${tomcat.javaopts}" />
-		</exec>
-	</target>
-
-	<target name="tomcat-start" depends="tomcat.init" description="Start this web application in tomcat">
-		<start url="${tomcat.manager.url}" username="${tomcat.username}" password="${tomcat.password}" path="/${project.webapp.name}" />
-	</target>
-
-	<target name="tomcat-stop" depends="tomcat.init" description="Stop this web application in tomcat">
-		<stop url="${tomcat.manager.url}" username="${tomcat.username}" password="${tomcat.password}" path="/${project.webapp.name}" />
-	</target>
-
-	<target name="tomcat-list" depends="tomcat.init" description="List installed tomcat applications">
-		<list url="${tomcat.manager.url}" username="${tomcat.username}" password="${tomcat.password}" />
-	</target>
-
-	<target name="tomcat-content" depends="statics, tomcat.init" description="Copy web content to tomcat without redeploy">
-		<copy todir="${tomcat.deploy.dir}/${project.webapp.name}">
-			<fileset dir="${target.war.expanded.dir}">
-				<patternset refid="web.public.content.files" />
-			</fileset>
-			<fileset dir="${target.war.expanded.dir}">
-				<patternset refid="web.protected.content.files" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="tomcat-context" depends="init.post,tomcat-context-error">
-		<delete quiet="true" file="${tomcat.dir}/conf/Catalina/localhost/${ant.project.name}.xml" />
-		<!-- create tomcat context file -->
-		<copy file="${common.build.dir}/templates/tomcat/context.xml" tofile="${tomcat.dir}/conf/Catalina/${ant.project.name}.xml" />
-		<replace file="${tomcat.dir}/conf/Catalina/${ant.project.name}.xml" token="@PROJECT_NAME@" value="${ant.project.name}" />
-		<replace file="${tomcat.dir}/conf/Catalina/${ant.project.name}.xml" token="@DOC_BASE@" value="${target.war.expanded.dir}" />
-		<copy file="${tomcat.dir}/conf/Catalina/${ant.project.name}.xml" todir="${tomcat.dir}/conf/Catalina/localhost" />
-		<delete quiet="true" file="${tomcat.dir}/conf/Catalina/${ant.project.name}.xml" />
-	</target>
-
-	<target name="tomcat-context-error" unless="tomcat.dir">
-		<fail>Set tomcat.dir in your USER_HOME/build.properties file (create if it doesn't exist)</fail>
-	</target>
-
-</project>
\ No newline at end of file
diff --git a/common-build/version.txt b/common-build/version.txt
deleted file mode 100644
index 27a8d2a9..00000000
--- a/common-build/version.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-version 20060409-1
-
-Changelog:
-2006-08-25: Keith: updated project and file templates inside "templates"
-2006-04-09: Colin: upgrade Ivy to 1.3.1
-2006-03-26: Colin: upgrade Ivy to snapshot 20060322, for transitive dep fix.
-2006-03-08: Colin: upgrade Ivy to 1.3RC3
-2006-02-17: Colin: Add retrieve-to-repo to common-targets.xml, user for release procoess
-2006-02-13: Arjen: Standard docbook images are now also copied in doc-targets.xml
-2006-02-08: Colin: add dir="${basedir} to junit task so it runs ok from other dirs
-2006-01-04: Colin: add description element to "retrieve" since it's not an internal target
-2005-11-27: Update Spring version in templates
-2005-11-20: Arjen: add gen java source dir functionality for test sources too
diff --git a/spring-binding/build.xml b/spring-binding/build.xml
index 7f66e5e6..f4dce95e 100644
--- a/spring-binding/build.xml
+++ b/spring-binding/build.xml
@@ -1,17 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="spring-binding">
 
-<project name="spring-binding" default="dist">
-
-  <property file="build.properties"/>
-  <property file="project.properties"/>
-  <property file="${common.build.dir}/build.properties"/>
-  <property file="${common.build.dir}/project.properties"/>
-  <property file="${user.home}/build.properties"/>
-
-  <property name="project.title" value="Spring Data Binding"/>
-  <property name="project.package" value="org.springframework.binding"/>
-  <property name="project.copyright" value="Copyright &#169; 2004-2007. All Rights Reserved."/>
-
-  <import file="${common.build.dir}/common-targets.xml"/>
+	<property file="${basedir}/../build.properties"/>
+	<import file="${basedir}/../build-spring-webflow/package-bundle.xml"/>
+	<import file="${basedir}/../spring-build/standard/default.xml"/>
 
 </project>
diff --git a/spring-binding/ivy.xml b/spring-binding/ivy.xml
index 2d0f6f18..492fa7ad 100644
--- a/spring-binding/ivy.xml
+++ b/spring-binding/ivy.xml
@@ -1,30 +1,40 @@
-<ivy-module version="1.3">
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
 
-	<info organisation="org.springframework" module="spring-binding" />
+	<info organisation="org.springframework.webflow" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+		<ivyauthor name="Keith Donald"/>
+	</info>
 
 	<configurations>
-		<conf name="default" extends="global" />
-		<conf name="global" visibility="private" />
-		<conf name="buildtime" visibility="private" />
-		<conf name="test" visibility="private" />
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
 	</configurations>
 
-	<dependencies defaultconf="global->default">
+	<publications>
+		<artifact name="${ant.project.name}"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+	</publications>
+
+	<dependencies>
 		<!-- global dependencies -->
-		<dependency org="commons-logging" name="commons-logging" rev="1.1.1" />
-		<dependency org="org.springframework" name="spring-beans" rev="2.5.2" />
-		<dependency org="org.springframework" name="spring-context"	rev="2.5.2" />
-		<dependency org="org.springframework" name="spring-core" rev="2.5.2" />
+		<dependency org="org.apache" name="commons-logging" rev="1.1.1" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-beans" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-context"	rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-core" rev="2.5.2" conf="compile->default"/>
 
 		<!-- build time only dependencies -->
-		<dependency org="ognl" name="ognl" rev="2.6.9" conf="buildtime->default"/>
-		<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default"/>
-		
-		<!-- test dependencies -->
+		<dependency org="org.ognl" name="ognl" rev="2.6.9" conf="compile->default"/>
+		<dependency org="javax.el" name="el-api" rev="1.0" conf="compile->default"/>
+
+		<!-- test-time only dependencies -->
 		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="test->default"/>
 		<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
-		<dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
-		<dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default"/>
+		<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default" />
+		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="test->default"/>
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file
diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml
deleted file mode 100644
index 598a069f..00000000
--- a/spring-binding/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-binding</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Binding</name>
-	<version>2.0-rc1-SNAPSHOT</version>
-	<description>Spring Data Binding Framework - An internal module used by Spring Web Flow</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</connection>
-		<developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</developerConnection>
-		<url>http://svn.sourceforge.net/viewcvs.cgi/springframework/spring-webflow</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>ognl</groupId>
-			<artifactId>ognl</artifactId>
-			<version>2.6.9</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>el-api</artifactId>
-			<version>1.0</version>
-			<scope>provided</scope>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>2.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>2.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>2.5.2</version>
-		</dependency>
-<!-- Runtime Dependencies -->
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.14</version>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-<!-- Test Dependencies -->
-		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymock</artifactId>
-			<version>2.3</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.seam</groupId>
-			<artifactId>jboss-el</artifactId>
-			<version>2.0.0.GA</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/spring-binding/project.properties b/spring-binding/project.properties
deleted file mode 100644
index 0fa23658..00000000
--- a/spring-binding/project.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# properties defined in this file are overridable by a local build.properties in this project dir
-
-# The location of the common build system
-common.build.dir=${basedir}/../common-build
-
-project.base.version=2.0-rc1-SNAPSHOT
-#project.version=${project.base.version}
-#ivy.status=release
-
-javac.source=1.4
-javac.target=1.4
diff --git a/spring-binding/src/etc/filter.properties b/spring-binding/src/etc/filter.properties
deleted file mode 100644
index c54e5880..00000000
--- a/spring-binding/src/etc/filter.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Header$
-
-# Contains filterable project settings.  Setting placeholders in filterable project text
-# files will be replaced with these values when the 'statics' build target is run.
-#
-# You may add static settings directly to this source file in the format:
-#    setting=value  e.g MY_SETTING=myvalue
-# This is appropriate usage if you know the setting value will never change.
-#
-# At build time this source file is copied to the ${target.dir} where additional 
-# dynamic settings may be appended using the <propertyfile> task.  Use this approach
-# when a setting value depends on the build or the local user's environment.
-#
-# An example of this approach is shown below:
-#
-# build.xml
-# <target name="build.prepare" depends="common-targets.build.prepare">
-#   <!-- Append additional local settings that are applicable to this project -->
-#  	<propertyfile file="${target.filter.file}">
-#  		 <!-- key=the name of the setting
-#             value=the property in your build.properties file that has the local setting value -->
-#  	     <entry key="MY_LOCAL_SETTING" value="${my.local.setting}" />
-#  	</propertyfile>
-# </target>
-#
-# This allows for dynamic replacement values that are sourced from local properties files to facilitate
-# local user settings.
-#
-# To refer to filterable settings within project source files like config files, JSPs, or
-# other text files use the standard ant placeholder format:
-#     @SETTING_NAME@ e.g, @MY_SETTING@ and @MY_LOCAL_SETTING@
-#
-# Your settings:
diff --git a/spring-binding/src/etc/test-resources/log4j.properties b/spring-binding/src/etc/test-resources/log4j.properties
deleted file mode 100644
index 4e8192fa..00000000
--- a/spring-binding/src/etc/test-resources/log4j.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-log4j.rootCategory=WARN, stdout, logfile
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=@TEST_RESULTS_DIR@/@PROJECT_NAME@.log
-log4j.appender.logfile.MaxFileSize=512KB
-
-# Keep three backup files
-log4j.appender.logfile.MaxBackupIndex=3
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-#Pattern to output : date priority [category] - <message>line_separator
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-log4j.category.org.springframework.binding=DEBUG
\ No newline at end of file
diff --git a/spring-faces/build.xml b/spring-faces/build.xml
index f5c04270..5eec2af3 100644
--- a/spring-faces/build.xml
+++ b/spring-faces/build.xml
@@ -1,17 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="spring-faces">
 
-<project name="spring-faces" default="dist">
+	<property file="${basedir}/../build.properties"/>
+	<import file="${basedir}/../build-spring-webflow/package-bundle.xml"/>
+	<import file="${basedir}/../spring-build/standard/default.xml"/>
 
-  <property file="build.properties"/>
-  <property file="project.properties"/>
-  <property file="${common.build.dir}/build.properties"/>
-  <property file="${common.build.dir}/project.properties"/>
-  <property file="${user.home}/build.properties"/>
-
-  <property name="project.title" value="Spring Faces"/>
-  <property name="project.package" value="org.springframework.faces"/>
-  <property name="project.copyright" value="Copyright &#169; 2004-2007. All Rights Reserved."/>
-
-  <import file="${common.build.dir}/common-targets.xml"/>
-
-</project>
+</project>
\ No newline at end of file
diff --git a/spring-faces/ivy.xml b/spring-faces/ivy.xml
index 5db6ac0e..84b8010f 100644
--- a/spring-faces/ivy.xml
+++ b/spring-faces/ivy.xml
@@ -1,51 +1,50 @@
-<ivy-module version="1.3">
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
 
-	<info organisation="org.springframework" module="spring-faces" />
+	<info organisation="org.springframework.webflow" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+		<ivyauthor name="Jeremy Grelle"/>
+	</info>
 
 	<configurations>
-		<conf name="default" extends="global" />
-		<conf name="global" visibility="private" />
-		<conf name="buildtime" visibility="private" />
-		<conf name="test" visibility="private" />
-		
-		<!-- public JSF configurations other projects may use -->
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
 		<conf name="jsf12" visibility="public"/>
 		<conf name="jsf11" visibility="public"/>
 	</configurations>
 
-	<dependencies defaultconf="global->default">
+	<publications>
+		<artifact name="${ant.project.name}"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+	</publications>
+
+	<dependencies>
 		<!-- global dependencies -->
-		<dependency org="commons-logging" name="commons-logging" rev="1.1.1" />
-		<dependency org="org.springframework" name="spring-webflow" rev="latest.integration" />
+		<dependency org="org.apache" name="commons-logging" rev="1.1.1" conf="compile->default"/>
+		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
 
 		<!-- build time only dependencies -->
-		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="buildtime->default" />
-		<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default" />
-		<dependency org="org.richfaces.framework" name="richfaces-api" rev="3.1.4.GA" conf="buildtime->default" />
+		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="compile->default" />
+		<dependency org="javax.el" name="el-api" rev="1.0" conf="compile->default" />
+		<dependency org="org.richfaces.framework" name="richfaces-api" rev="3.1.4.GA" conf="compile->default" />
 		
 		<!-- JSF 1.2 dependencies -->
 		<!-- note that at this time we depend on MyFaces, not JSF-RI -->
-		<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.2.2" conf="buildtime, jsf12->default" />
-		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.2.2" conf="buildtime, jsf12->default" />
-    	<dependency org="commons-beanutils" name="commons-beanutils" rev="1.7.0" conf="buildtime, jsf12->default" >
-			<exclude module="commons-logging"/>
-    	</dependency>
-    	<dependency org="commons-codec" name="commons-codec" rev="1.3" conf="buildtime, jsf12->default" />
-    	<dependency org="commons-collections" name="commons-collections" rev="3.2" conf="buildtime, jsf12->default" />
-    	<dependency org="commons-discovery" name="commons-discovery" rev="0.4" conf="buildtime, jsf12->default">
-			<exclude module="commons-logging"/>
-    	</dependency>
-    	<dependency org="commons-digester" name="commons-digester" rev="1.8" conf="buildtime, jsf12->default">
-			<exclude module="commons-logging"/>
-    	</dependency>
+		<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.2.2" conf="compile, jsf12->default" />
+		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.2.2" conf="compile, jsf12->default" />
+    	<dependency org="org.apache" name="commons-codec" rev="1.3" conf="compile, jsf12->default" />
+    	<dependency org="org.apache.commons" name="commons-collections" rev="3.2" conf="compile, jsf12->default" />
     	
     	<!-- JSF 1.1 dependencies -->
     	<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.1.5" conf="jsf11->default" />
 		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.1.5" conf="jsf11->default" />
     	
 		<!-- test dependencies -->
-		<dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
-		<dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default" />
+		<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default" />
+		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="test->default" />
 		<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
 		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="test->default"/>
 		<dependency org="org.apache.shale" name="shale-test" rev="1.0.4" conf="test->default" />
diff --git a/spring-faces/pom.xml b/spring-faces/pom.xml
deleted file mode 100644
index aaf742e7..00000000
--- a/spring-faces/pom.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-faces</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Faces</name>
-	<version>2.0-rc1-SNAPSHOT</version>
-	<description>Spring Faces Framework</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</connection>
-		<developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</developerConnection>
-		<url>http://svn.sourceforge.net/viewcvs.cgi/springframework/spring-webflow</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.3</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-digester</groupId>
-			<artifactId>commons-digester</artifactId>
-			<version>1.8</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-discovery</groupId>
-			<artifactId>commons-discovery</artifactId>
-			<version>0.4</version>
-		</dependency>
-		<dependency>
-			<groupId>concurrent</groupId>
-			<artifactId>concurrent</artifactId>
-			<version>1.3.4</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>el-api</artifactId>
-			<version>1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.myfaces.core</groupId>
-			<artifactId>myfaces-api</artifactId>
-			<version>1.2.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.myfaces.core</groupId>
-			<artifactId>myfaces-impl</artifactId>
-			<version>1.2.2</version>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webflow</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-<!-- Runtime Dependencies -->
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.14</version>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-<!-- Test Dependencies -->
-		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymock</artifactId>
-			<version>2.3</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.seam</groupId>
-			<artifactId>jboss-el</artifactId>
-			<version>2.0.0.GA</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.shale</groupId>
-			<artifactId>shale-test</artifactId>
-			<version>1.0.4</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>2.5.2</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/spring-faces/project.properties b/spring-faces/project.properties
deleted file mode 100644
index 0fa23658..00000000
--- a/spring-faces/project.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# properties defined in this file are overridable by a local build.properties in this project dir
-
-# The location of the common build system
-common.build.dir=${basedir}/../common-build
-
-project.base.version=2.0-rc1-SNAPSHOT
-#project.version=${project.base.version}
-#ivy.status=release
-
-javac.source=1.4
-javac.target=1.4
diff --git a/spring-faces/src/etc/test-resources/log4j.properties b/spring-faces/src/etc/test-resources/log4j.properties
deleted file mode 100644
index eaa1b2ae..00000000
--- a/spring-faces/src/etc/test-resources/log4j.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-log4j.rootCategory=WARN, stdout, logfile
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=@TEST_RESULTS_DIR@/@PROJECT_NAME@.log
-log4j.appender.logfile.MaxFileSize=512KB
-
-# Keep three backup files
-log4j.appender.logfile.MaxBackupIndex=3
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-#Pattern to output : date priority [category] - <message>line_separator
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-log4j.category.org.springframework.webflow=DEBUG
-log4j.category.org.springframework.binding=DEBUG
\ No newline at end of file
diff --git a/spring-faces/src/main/java/META-INF/css-framework/css/forms.css b/spring-faces/src/main/resources/META-INF/css-framework/css/forms.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/css-framework/css/forms.css
rename to spring-faces/src/main/resources/META-INF/css-framework/css/forms.css
diff --git a/spring-faces/src/main/java/META-INF/css-framework/css/layout-1col.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-1col.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/css-framework/css/layout-1col.css
rename to spring-faces/src/main/resources/META-INF/css-framework/css/layout-1col.css
diff --git a/spring-faces/src/main/java/META-INF/css-framework/css/layout-navleft-1col.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navleft-1col.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/css-framework/css/layout-navleft-1col.css
rename to spring-faces/src/main/resources/META-INF/css-framework/css/layout-navleft-1col.css
diff --git a/spring-faces/src/main/java/META-INF/css-framework/css/layout-navleft-2col.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navleft-2col.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/css-framework/css/layout-navleft-2col.css
rename to spring-faces/src/main/resources/META-INF/css-framework/css/layout-navleft-2col.css
diff --git a/spring-faces/src/main/java/META-INF/css-framework/css/layout-navtop-1col.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-1col.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/css-framework/css/layout-navtop-1col.css
rename to spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-1col.css
diff --git a/spring-faces/src/main/java/META-INF/css-framework/css/layout-navtop-3col.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-3col.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/css-framework/css/layout-navtop-3col.css
rename to spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-3col.css
diff --git a/spring-faces/src/main/java/META-INF/css-framework/css/layout-navtop-localleft.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-localleft.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/css-framework/css/layout-navtop-localleft.css
rename to spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-localleft.css
diff --git a/spring-faces/src/main/java/META-INF/css-framework/css/layout-navtop-subright.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-subright.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/css-framework/css/layout-navtop-subright.css
rename to spring-faces/src/main/resources/META-INF/css-framework/css/layout-navtop-subright.css
diff --git a/spring-faces/src/main/java/META-INF/css-framework/css/layout.css b/spring-faces/src/main/resources/META-INF/css-framework/css/layout.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/css-framework/css/layout.css
rename to spring-faces/src/main/resources/META-INF/css-framework/css/layout.css
diff --git a/spring-faces/src/main/java/META-INF/css-framework/css/nav-horizontal.css b/spring-faces/src/main/resources/META-INF/css-framework/css/nav-horizontal.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/css-framework/css/nav-horizontal.css
rename to spring-faces/src/main/resources/META-INF/css-framework/css/nav-horizontal.css
diff --git a/spring-faces/src/main/java/META-INF/css-framework/css/nav-vertical.css b/spring-faces/src/main/resources/META-INF/css-framework/css/nav-vertical.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/css-framework/css/nav-vertical.css
rename to spring-faces/src/main/resources/META-INF/css-framework/css/nav-vertical.css
diff --git a/spring-faces/src/main/java/META-INF/css-framework/css/tools.css b/spring-faces/src/main/resources/META-INF/css-framework/css/tools.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/css-framework/css/tools.css
rename to spring-faces/src/main/resources/META-INF/css-framework/css/tools.css
diff --git a/spring-faces/src/main/java/META-INF/css-framework/css/typo.css b/spring-faces/src/main/resources/META-INF/css-framework/css/typo.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/css-framework/css/typo.css
rename to spring-faces/src/main/resources/META-INF/css-framework/css/typo.css
diff --git a/spring-faces/src/main/java/META-INF/dijit/ColorPalette.js b/spring-faces/src/main/resources/META-INF/dijit/ColorPalette.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/ColorPalette.js
rename to spring-faces/src/main/resources/META-INF/dijit/ColorPalette.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/Declaration.js b/spring-faces/src/main/resources/META-INF/dijit/Declaration.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/Declaration.js
rename to spring-faces/src/main/resources/META-INF/dijit/Declaration.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/Dialog.js b/spring-faces/src/main/resources/META-INF/dijit/Dialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/Dialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/Dialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/Editor.js b/spring-faces/src/main/resources/META-INF/dijit/Editor.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/Editor.js
rename to spring-faces/src/main/resources/META-INF/dijit/Editor.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/InlineEditBox.js b/spring-faces/src/main/resources/META-INF/dijit/InlineEditBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/InlineEditBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/InlineEditBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/LICENSE b/spring-faces/src/main/resources/META-INF/dijit/LICENSE
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/LICENSE
rename to spring-faces/src/main/resources/META-INF/dijit/LICENSE
diff --git a/spring-faces/src/main/java/META-INF/dijit/Menu.js b/spring-faces/src/main/resources/META-INF/dijit/Menu.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/Menu.js
rename to spring-faces/src/main/resources/META-INF/dijit/Menu.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/ProgressBar.js b/spring-faces/src/main/resources/META-INF/dijit/ProgressBar.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/ProgressBar.js
rename to spring-faces/src/main/resources/META-INF/dijit/ProgressBar.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/TitlePane.js b/spring-faces/src/main/resources/META-INF/dijit/TitlePane.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/TitlePane.js
rename to spring-faces/src/main/resources/META-INF/dijit/TitlePane.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/Toolbar.js b/spring-faces/src/main/resources/META-INF/dijit/Toolbar.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/Toolbar.js
rename to spring-faces/src/main/resources/META-INF/dijit/Toolbar.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/Tooltip.js b/spring-faces/src/main/resources/META-INF/dijit/Tooltip.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/Tooltip.js
rename to spring-faces/src/main/resources/META-INF/dijit/Tooltip.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/Tree.js b/spring-faces/src/main/resources/META-INF/dijit/Tree.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/Tree.js
rename to spring-faces/src/main/resources/META-INF/dijit/Tree.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_Calendar.js b/spring-faces/src/main/resources/META-INF/dijit/_Calendar.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_Calendar.js
rename to spring-faces/src/main/resources/META-INF/dijit/_Calendar.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_Container.js b/spring-faces/src/main/resources/META-INF/dijit/_Container.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_Container.js
rename to spring-faces/src/main/resources/META-INF/dijit/_Container.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_Templated.js b/spring-faces/src/main/resources/META-INF/dijit/_Templated.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_Templated.js
rename to spring-faces/src/main/resources/META-INF/dijit/_Templated.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_TimePicker.js b/spring-faces/src/main/resources/META-INF/dijit/_TimePicker.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_TimePicker.js
rename to spring-faces/src/main/resources/META-INF/dijit/_TimePicker.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_Widget.js b/spring-faces/src/main/resources/META-INF/dijit/_Widget.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_Widget.js
rename to spring-faces/src/main/resources/META-INF/dijit/_Widget.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_base.js b/spring-faces/src/main/resources/META-INF/dijit/_base.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_base.js
rename to spring-faces/src/main/resources/META-INF/dijit/_base.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_base/bidi.js b/spring-faces/src/main/resources/META-INF/dijit/_base/bidi.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_base/bidi.js
rename to spring-faces/src/main/resources/META-INF/dijit/_base/bidi.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_base/focus.js b/spring-faces/src/main/resources/META-INF/dijit/_base/focus.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_base/focus.js
rename to spring-faces/src/main/resources/META-INF/dijit/_base/focus.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_base/manager.js b/spring-faces/src/main/resources/META-INF/dijit/_base/manager.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_base/manager.js
rename to spring-faces/src/main/resources/META-INF/dijit/_base/manager.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_base/place.js b/spring-faces/src/main/resources/META-INF/dijit/_base/place.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_base/place.js
rename to spring-faces/src/main/resources/META-INF/dijit/_base/place.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_base/popup.js b/spring-faces/src/main/resources/META-INF/dijit/_base/popup.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_base/popup.js
rename to spring-faces/src/main/resources/META-INF/dijit/_base/popup.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_base/scroll.js b/spring-faces/src/main/resources/META-INF/dijit/_base/scroll.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_base/scroll.js
rename to spring-faces/src/main/resources/META-INF/dijit/_base/scroll.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_base/sniff.js b/spring-faces/src/main/resources/META-INF/dijit/_base/sniff.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_base/sniff.js
rename to spring-faces/src/main/resources/META-INF/dijit/_base/sniff.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_base/typematic.js b/spring-faces/src/main/resources/META-INF/dijit/_base/typematic.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_base/typematic.js
rename to spring-faces/src/main/resources/META-INF/dijit/_base/typematic.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_base/wai.js b/spring-faces/src/main/resources/META-INF/dijit/_base/wai.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_base/wai.js
rename to spring-faces/src/main/resources/META-INF/dijit/_base/wai.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_base/window.js b/spring-faces/src/main/resources/META-INF/dijit/_base/window.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_base/window.js
rename to spring-faces/src/main/resources/META-INF/dijit/_base/window.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/RichText.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/RichText.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/RichText.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/RichText.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/_Plugin.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/_Plugin.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/_Plugin.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/_Plugin.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/FontChoice.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/FontChoice.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/FontChoice.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/FontChoice.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/cs/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/cs/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/cs/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/cs/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/cs/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/cs/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/cs/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/cs/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/de/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/de/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/de/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/de/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/de/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/de/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/de/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/de/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/es/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/es/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/es/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/es/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/es/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/es/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/es/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/es/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/fr/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/fr/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/fr/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/fr/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/fr/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/fr/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/fr/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/fr/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/hu/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/hu/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/hu/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/hu/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/hu/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/hu/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/hu/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/hu/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/it/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/it/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/it/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/it/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/it/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/it/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/it/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/it/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/ja/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/ja/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/ja/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/ja/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/ja/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/ja/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/ja/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/ja/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/ko/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/ko/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/ko/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/ko/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/ko/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/ko/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/ko/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/ko/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/pl/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/pl/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/pl/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/pl/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/pl/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/pl/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/pl/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/pl/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/pt/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/pt/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/pt/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/pt/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/pt/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/pt/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/pt/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/pt/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/ru/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/ru/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/ru/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/ru/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/ru/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/ru/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/ru/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/ru/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/zh-tw/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/zh-tw/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/zh-tw/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/zh-tw/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/zh-tw/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/zh-tw/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/zh-tw/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/zh-tw/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/zh/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/zh/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/zh/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/zh/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/nls/zh/commands.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/nls/zh/commands.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/nls/zh/commands.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/nls/zh/commands.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/plugins/AlwaysShowToolbar.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/plugins/AlwaysShowToolbar.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/plugins/AlwaysShowToolbar.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/plugins/AlwaysShowToolbar.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/plugins/EnterKeyHandling.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/plugins/EnterKeyHandling.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/plugins/EnterKeyHandling.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/plugins/EnterKeyHandling.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/plugins/FontChoice.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/plugins/FontChoice.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/plugins/FontChoice.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/plugins/FontChoice.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/plugins/LinkDialog.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/plugins/LinkDialog.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/plugins/LinkDialog.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/plugins/LinkDialog.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/plugins/TextColor.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/plugins/TextColor.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/plugins/TextColor.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/plugins/TextColor.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/range.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/range.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/range.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/range.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_editor/selection.js b/spring-faces/src/main/resources/META-INF/dijit/_editor/selection.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_editor/selection.js
rename to spring-faces/src/main/resources/META-INF/dijit/_editor/selection.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_tree/Controller.js b/spring-faces/src/main/resources/META-INF/dijit/_tree/Controller.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_tree/Controller.js
rename to spring-faces/src/main/resources/META-INF/dijit/_tree/Controller.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_tree/Node.html b/spring-faces/src/main/resources/META-INF/dijit/_tree/Node.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_tree/Node.html
rename to spring-faces/src/main/resources/META-INF/dijit/_tree/Node.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/_tree/Tree.html b/spring-faces/src/main/resources/META-INF/dijit/_tree/Tree.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_tree/Tree.html
rename to spring-faces/src/main/resources/META-INF/dijit/_tree/Tree.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/_tree/dndContainer.js b/spring-faces/src/main/resources/META-INF/dijit/_tree/dndContainer.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_tree/dndContainer.js
rename to spring-faces/src/main/resources/META-INF/dijit/_tree/dndContainer.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_tree/dndSelector.js b/spring-faces/src/main/resources/META-INF/dijit/_tree/dndSelector.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_tree/dndSelector.js
rename to spring-faces/src/main/resources/META-INF/dijit/_tree/dndSelector.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/_tree/dndSource.js b/spring-faces/src/main/resources/META-INF/dijit/_tree/dndSource.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/_tree/dndSource.js
rename to spring-faces/src/main/resources/META-INF/dijit/_tree/dndSource.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/bench/benchReceive.php b/spring-faces/src/main/resources/META-INF/dijit/bench/benchReceive.php
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/bench/benchReceive.php
rename to spring-faces/src/main/resources/META-INF/dijit/bench/benchReceive.php
diff --git a/spring-faces/src/main/java/META-INF/dijit/bench/benchTool.html b/spring-faces/src/main/resources/META-INF/dijit/bench/benchTool.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/bench/benchTool.html
rename to spring-faces/src/main/resources/META-INF/dijit/bench/benchTool.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/bench/create_widgets.html b/spring-faces/src/main/resources/META-INF/dijit/bench/create_widgets.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/bench/create_widgets.html
rename to spring-faces/src/main/resources/META-INF/dijit/bench/create_widgets.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/bench/test_Button-programmatic.html b/spring-faces/src/main/resources/META-INF/dijit/bench/test_Button-programmatic.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/bench/test_Button-programmatic.html
rename to spring-faces/src/main/resources/META-INF/dijit/bench/test_Button-programmatic.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/bench/test_button-results.html b/spring-faces/src/main/resources/META-INF/dijit/bench/test_button-results.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/bench/test_button-results.html
rename to spring-faces/src/main/resources/META-INF/dijit/bench/test_button-results.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/bench/widget_construction_test.php b/spring-faces/src/main/resources/META-INF/dijit/bench/widget_construction_test.php
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/bench/widget_construction_test.php
rename to spring-faces/src/main/resources/META-INF/dijit/bench/widget_construction_test.php
diff --git a/spring-faces/src/main/java/META-INF/dijit/changes.txt b/spring-faces/src/main/resources/META-INF/dijit/changes.txt
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/changes.txt
rename to spring-faces/src/main/resources/META-INF/dijit/changes.txt
diff --git a/spring-faces/src/main/java/META-INF/dijit/dijit-all.js b/spring-faces/src/main/resources/META-INF/dijit/dijit-all.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/dijit-all.js
rename to spring-faces/src/main/resources/META-INF/dijit/dijit-all.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/dijit-all.js.uncompressed.js b/spring-faces/src/main/resources/META-INF/dijit/dijit-all.js.uncompressed.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/dijit-all.js.uncompressed.js
rename to spring-faces/src/main/resources/META-INF/dijit/dijit-all.js.uncompressed.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/dijit.js b/spring-faces/src/main/resources/META-INF/dijit/dijit.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/dijit.js
rename to spring-faces/src/main/resources/META-INF/dijit/dijit.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/dijit.js.uncompressed.js b/spring-faces/src/main/resources/META-INF/dijit/dijit.js.uncompressed.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/dijit.js.uncompressed.js
rename to spring-faces/src/main/resources/META-INF/dijit/dijit.js.uncompressed.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/Button.js b/spring-faces/src/main/resources/META-INF/dijit/form/Button.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/Button.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/Button.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/CheckBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/CheckBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/CheckBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/CheckBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/CurrencyTextBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/CurrencyTextBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/CurrencyTextBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/CurrencyTextBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/DateTextBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/DateTextBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/DateTextBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/DateTextBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/FilteringSelect.js b/spring-faces/src/main/resources/META-INF/dijit/form/FilteringSelect.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/FilteringSelect.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/FilteringSelect.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/Form.js b/spring-faces/src/main/resources/META-INF/dijit/form/Form.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/Form.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/Form.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/InlineEditBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/InlineEditBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/InlineEditBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/InlineEditBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/NumberSpinner.js b/spring-faces/src/main/resources/META-INF/dijit/form/NumberSpinner.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/NumberSpinner.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/NumberSpinner.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/NumberTextBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/NumberTextBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/NumberTextBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/NumberTextBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/Slider.js b/spring-faces/src/main/resources/META-INF/dijit/form/Slider.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/Slider.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/Slider.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/TextBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/TextBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/TextBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/TextBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/TimeTextBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/TimeTextBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/TimeTextBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/TimeTextBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/ValidationTextBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/ValidationTextBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/ValidationTextBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/ValidationTextBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/_DropDownTextBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/_DropDownTextBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/_DropDownTextBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/_DropDownTextBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/_FormWidget.js b/spring-faces/src/main/resources/META-INF/dijit/form/_FormWidget.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/_FormWidget.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/_FormWidget.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/_Spinner.js b/spring-faces/src/main/resources/META-INF/dijit/form/_Spinner.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/_Spinner.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/_Spinner.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/_TimePicker.js b/spring-faces/src/main/resources/META-INF/dijit/form/_TimePicker.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/_TimePicker.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/_TimePicker.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/cs/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/cs/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/cs/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/cs/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/cs/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/cs/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/cs/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/cs/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/cs/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/cs/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/cs/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/cs/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/de/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/de/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/de/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/de/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/de/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/de/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/de/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/de/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/de/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/de/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/de/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/de/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/es/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/es/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/es/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/es/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/es/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/es/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/es/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/es/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/es/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/es/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/es/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/es/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/fr/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/fr/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/fr/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/fr/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/fr/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/fr/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/fr/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/fr/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/fr/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/fr/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/fr/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/fr/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/hu/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/hu/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/hu/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/hu/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/hu/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/hu/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/hu/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/hu/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/hu/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/hu/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/hu/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/hu/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/it/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/it/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/it/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/it/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/it/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/it/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/it/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/it/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/it/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/it/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/it/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/it/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/ja/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/ja/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/ja/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/ja/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/ja/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/ja/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/ja/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/ja/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/ja/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/ja/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/ja/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/ja/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/ko/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/ko/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/ko/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/ko/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/ko/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/ko/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/ko/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/ko/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/ko/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/ko/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/ko/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/ko/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/pl/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/pl/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/pl/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/pl/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/pl/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/pl/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/pl/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/pl/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/pl/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/pl/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/pl/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/pl/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/pt/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/pt/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/pt/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/pt/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/pt/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/pt/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/pt/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/pt/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/pt/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/pt/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/pt/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/pt/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/ru/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/ru/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/ru/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/ru/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/ru/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/ru/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/ru/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/ru/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/ru/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/ru/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/ru/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/ru/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/zh-cn/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/zh-cn/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/zh-cn/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/zh-cn/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/zh-tw/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/zh-tw/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/zh-tw/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/zh-tw/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/zh-tw/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/zh-tw/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/zh-tw/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/zh-tw/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/zh-tw/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/zh-tw/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/zh-tw/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/zh-tw/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/zh/ComboBox.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/zh/ComboBox.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/zh/ComboBox.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/zh/ComboBox.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/zh/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/zh/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/zh/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/zh/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/nls/zh/validate.js b/spring-faces/src/main/resources/META-INF/dijit/form/nls/zh/validate.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/nls/zh/validate.js
rename to spring-faces/src/main/resources/META-INF/dijit/form/nls/zh/validate.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/templates/Button.html b/spring-faces/src/main/resources/META-INF/dijit/form/templates/Button.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/templates/Button.html
rename to spring-faces/src/main/resources/META-INF/dijit/form/templates/Button.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/templates/CheckBox.html b/spring-faces/src/main/resources/META-INF/dijit/form/templates/CheckBox.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/templates/CheckBox.html
rename to spring-faces/src/main/resources/META-INF/dijit/form/templates/CheckBox.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/templates/ComboBox.html b/spring-faces/src/main/resources/META-INF/dijit/form/templates/ComboBox.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/templates/ComboBox.html
rename to spring-faces/src/main/resources/META-INF/dijit/form/templates/ComboBox.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/templates/ComboButton.html b/spring-faces/src/main/resources/META-INF/dijit/form/templates/ComboButton.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/templates/ComboButton.html
rename to spring-faces/src/main/resources/META-INF/dijit/form/templates/ComboButton.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/templates/DropDownButton.html b/spring-faces/src/main/resources/META-INF/dijit/form/templates/DropDownButton.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/templates/DropDownButton.html
rename to spring-faces/src/main/resources/META-INF/dijit/form/templates/DropDownButton.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/templates/HorizontalSlider.html b/spring-faces/src/main/resources/META-INF/dijit/form/templates/HorizontalSlider.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/templates/HorizontalSlider.html
rename to spring-faces/src/main/resources/META-INF/dijit/form/templates/HorizontalSlider.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/templates/InlineEditBox.html b/spring-faces/src/main/resources/META-INF/dijit/form/templates/InlineEditBox.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/templates/InlineEditBox.html
rename to spring-faces/src/main/resources/META-INF/dijit/form/templates/InlineEditBox.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/templates/Spinner.html b/spring-faces/src/main/resources/META-INF/dijit/form/templates/Spinner.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/templates/Spinner.html
rename to spring-faces/src/main/resources/META-INF/dijit/form/templates/Spinner.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/templates/TextBox.html b/spring-faces/src/main/resources/META-INF/dijit/form/templates/TextBox.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/templates/TextBox.html
rename to spring-faces/src/main/resources/META-INF/dijit/form/templates/TextBox.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/templates/TimePicker.html b/spring-faces/src/main/resources/META-INF/dijit/form/templates/TimePicker.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/templates/TimePicker.html
rename to spring-faces/src/main/resources/META-INF/dijit/form/templates/TimePicker.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/templates/ValidationTextBox.html b/spring-faces/src/main/resources/META-INF/dijit/form/templates/ValidationTextBox.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/templates/ValidationTextBox.html
rename to spring-faces/src/main/resources/META-INF/dijit/form/templates/ValidationTextBox.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/templates/VerticalSlider.html b/spring-faces/src/main/resources/META-INF/dijit/form/templates/VerticalSlider.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/templates/VerticalSlider.html
rename to spring-faces/src/main/resources/META-INF/dijit/form/templates/VerticalSlider.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/form/templates/blank.gif b/spring-faces/src/main/resources/META-INF/dijit/form/templates/blank.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/form/templates/blank.gif
rename to spring-faces/src/main/resources/META-INF/dijit/form/templates/blank.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/layout/AccordionContainer.js b/spring-faces/src/main/resources/META-INF/dijit/layout/AccordionContainer.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/layout/AccordionContainer.js
rename to spring-faces/src/main/resources/META-INF/dijit/layout/AccordionContainer.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/layout/ContentPane.js b/spring-faces/src/main/resources/META-INF/dijit/layout/ContentPane.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/layout/ContentPane.js
rename to spring-faces/src/main/resources/META-INF/dijit/layout/ContentPane.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/layout/LayoutContainer.js b/spring-faces/src/main/resources/META-INF/dijit/layout/LayoutContainer.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/layout/LayoutContainer.js
rename to spring-faces/src/main/resources/META-INF/dijit/layout/LayoutContainer.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/layout/LinkPane.js b/spring-faces/src/main/resources/META-INF/dijit/layout/LinkPane.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/layout/LinkPane.js
rename to spring-faces/src/main/resources/META-INF/dijit/layout/LinkPane.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/layout/SplitContainer.js b/spring-faces/src/main/resources/META-INF/dijit/layout/SplitContainer.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/layout/SplitContainer.js
rename to spring-faces/src/main/resources/META-INF/dijit/layout/SplitContainer.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/layout/StackContainer.js b/spring-faces/src/main/resources/META-INF/dijit/layout/StackContainer.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/layout/StackContainer.js
rename to spring-faces/src/main/resources/META-INF/dijit/layout/StackContainer.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/layout/TabContainer.js b/spring-faces/src/main/resources/META-INF/dijit/layout/TabContainer.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/layout/TabContainer.js
rename to spring-faces/src/main/resources/META-INF/dijit/layout/TabContainer.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/layout/_LayoutWidget.js b/spring-faces/src/main/resources/META-INF/dijit/layout/_LayoutWidget.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/layout/_LayoutWidget.js
rename to spring-faces/src/main/resources/META-INF/dijit/layout/_LayoutWidget.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/layout/templates/AccordionPane.html b/spring-faces/src/main/resources/META-INF/dijit/layout/templates/AccordionPane.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/layout/templates/AccordionPane.html
rename to spring-faces/src/main/resources/META-INF/dijit/layout/templates/AccordionPane.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/layout/templates/TabContainer.html b/spring-faces/src/main/resources/META-INF/dijit/layout/templates/TabContainer.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/layout/templates/TabContainer.html
rename to spring-faces/src/main/resources/META-INF/dijit/layout/templates/TabContainer.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/layout/templates/TooltipDialog.html b/spring-faces/src/main/resources/META-INF/dijit/layout/templates/TooltipDialog.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/layout/templates/TooltipDialog.html
rename to spring-faces/src/main/resources/META-INF/dijit/layout/templates/TooltipDialog.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/layout/templates/_TabButton.html b/spring-faces/src/main/resources/META-INF/dijit/layout/templates/_TabButton.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/layout/templates/_TabButton.html
rename to spring-faces/src/main/resources/META-INF/dijit/layout/templates/_TabButton.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/Textarea.js b/spring-faces/src/main/resources/META-INF/dijit/nls/Textarea.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/Textarea.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/Textarea.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/cs/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/cs/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/cs/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/cs/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/cs/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/cs/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/cs/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/cs/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/de/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/de/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/de/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/de/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/de/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/de/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/de/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/de/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_ROOT.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_ROOT.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_ROOT.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_ROOT.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_cs.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_cs.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_cs.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_cs.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_de-de.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_de-de.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_de-de.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_de-de.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_de.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_de.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_de.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_de.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_en-gb.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_en-gb.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_en-gb.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_en-gb.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_en-us.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_en-us.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_en-us.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_en-us.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_en.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_en.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_en.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_en.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_es-es.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_es-es.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_es-es.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_es-es.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_es.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_es.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_es.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_es.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_fr-fr.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_fr-fr.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_fr-fr.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_fr-fr.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_fr.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_fr.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_fr.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_fr.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_hu.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_hu.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_hu.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_hu.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_it-it.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_it-it.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_it-it.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_it-it.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_it.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_it.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_it.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_it.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_ja-jp.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_ja-jp.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_ja-jp.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_ja-jp.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_ja.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_ja.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_ja.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_ja.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_ko-kr.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_ko-kr.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_ko-kr.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_ko-kr.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_ko.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_ko.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_ko.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_ko.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_pl.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_pl.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_pl.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_pl.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_pt-br.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_pt-br.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_pt-br.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_pt-br.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_pt.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_pt.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_pt.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_pt.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_ru.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_ru.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_ru.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_ru.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_xx.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_xx.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_xx.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_xx.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_zh-cn.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_zh-cn.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_zh-cn.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_zh-cn.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_zh-tw.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_zh-tw.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_zh-tw.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_zh-tw.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_zh.js b/spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_zh.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/dijit-all_zh.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/dijit-all_zh.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/es/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/es/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/es/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/es/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/es/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/es/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/es/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/es/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/fr/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/fr/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/fr/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/fr/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/fr/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/fr/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/fr/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/fr/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/hu/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/hu/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/hu/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/hu/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/hu/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/hu/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/hu/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/hu/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/it/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/it/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/it/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/it/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/it/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/it/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/it/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/it/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/ja/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/ja/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/ja/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/ja/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/ja/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/ja/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/ja/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/ja/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/ko/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/ko/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/ko/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/ko/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/ko/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/ko/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/ko/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/ko/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/pl/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/pl/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/pl/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/pl/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/pl/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/pl/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/pl/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/pl/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/pt/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/pt/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/pt/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/pt/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/pt/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/pt/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/pt/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/pt/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/ru/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/ru/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/ru/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/ru/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/ru/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/ru/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/ru/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/ru/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/zh-tw/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/zh-tw/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/zh-tw/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/zh-tw/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/zh-tw/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/zh-tw/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/zh-tw/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/zh-tw/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/zh/common.js b/spring-faces/src/main/resources/META-INF/dijit/nls/zh/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/zh/common.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/zh/common.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/nls/zh/loading.js b/spring-faces/src/main/resources/META-INF/dijit/nls/zh/loading.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/nls/zh/loading.js
rename to spring-faces/src/main/resources/META-INF/dijit/nls/zh/loading.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/templates/Calendar.html b/spring-faces/src/main/resources/META-INF/dijit/templates/Calendar.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/templates/Calendar.html
rename to spring-faces/src/main/resources/META-INF/dijit/templates/Calendar.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/templates/ColorPalette.html b/spring-faces/src/main/resources/META-INF/dijit/templates/ColorPalette.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/templates/ColorPalette.html
rename to spring-faces/src/main/resources/META-INF/dijit/templates/ColorPalette.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/templates/Dialog.html b/spring-faces/src/main/resources/META-INF/dijit/templates/Dialog.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/templates/Dialog.html
rename to spring-faces/src/main/resources/META-INF/dijit/templates/Dialog.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/templates/InlineEditBox.html b/spring-faces/src/main/resources/META-INF/dijit/templates/InlineEditBox.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/templates/InlineEditBox.html
rename to spring-faces/src/main/resources/META-INF/dijit/templates/InlineEditBox.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/templates/ProgressBar.html b/spring-faces/src/main/resources/META-INF/dijit/templates/ProgressBar.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/templates/ProgressBar.html
rename to spring-faces/src/main/resources/META-INF/dijit/templates/ProgressBar.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/templates/TitlePane.html b/spring-faces/src/main/resources/META-INF/dijit/templates/TitlePane.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/templates/TitlePane.html
rename to spring-faces/src/main/resources/META-INF/dijit/templates/TitlePane.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/templates/Tooltip.html b/spring-faces/src/main/resources/META-INF/dijit/templates/Tooltip.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/templates/Tooltip.html
rename to spring-faces/src/main/resources/META-INF/dijit/templates/Tooltip.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/templates/blank.gif b/spring-faces/src/main/resources/META-INF/dijit/templates/blank.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/templates/blank.gif
rename to spring-faces/src/main/resources/META-INF/dijit/templates/blank.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/templates/buttons/bg-fade.png b/spring-faces/src/main/resources/META-INF/dijit/templates/buttons/bg-fade.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/templates/buttons/bg-fade.png
rename to spring-faces/src/main/resources/META-INF/dijit/templates/buttons/bg-fade.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/templates/colors3x4.png b/spring-faces/src/main/resources/META-INF/dijit/templates/colors3x4.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/templates/colors3x4.png
rename to spring-faces/src/main/resources/META-INF/dijit/templates/colors3x4.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/templates/colors7x10.png b/spring-faces/src/main/resources/META-INF/dijit/templates/colors7x10.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/templates/colors7x10.png
rename to spring-faces/src/main/resources/META-INF/dijit/templates/colors7x10.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/a11y/README.txt b/spring-faces/src/main/resources/META-INF/dijit/themes/a11y/README.txt
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/a11y/README.txt
rename to spring-faces/src/main/resources/META-INF/dijit/themes/a11y/README.txt
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/a11y/indeterminate_progress.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/a11y/indeterminate_progress.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/a11y/indeterminate_progress.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/a11y/indeterminate_progress.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/dijit.css b/spring-faces/src/main/resources/META-INF/dijit/themes/dijit.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/dijit.css
rename to spring-faces/src/main/resources/META-INF/dijit/themes/dijit.css
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/dijit_rtl.css b/spring-faces/src/main/resources/META-INF/dijit/themes/dijit_rtl.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/dijit_rtl.css
rename to spring-faces/src/main/resources/META-INF/dijit/themes/dijit_rtl.css
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonActive-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonActive-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonActive-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonActive-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonActive-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonActive-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonActive-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonActive-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonActive-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonActive-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonActive-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonActive-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonDisabled-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonDisabled-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonDisabled-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonDisabled-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonDisabled-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonDisabled-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonDisabled-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonDisabled-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonDisabled-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonDisabled-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonDisabled-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonDisabled-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonEnabled-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonEnabled-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonEnabled-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonEnabled-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonEnabled-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonEnabled-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonEnabled-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonEnabled-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonEnabled-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonEnabled-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonEnabled-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonEnabled-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonHover-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonHover-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonHover-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonHover-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonHover-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonHover-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonHover-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonHover-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonHover-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonHover-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/buttonHover-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/buttonHover-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/close.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/close.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/close.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/close.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/closeActive.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/closeActive.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/closeActive.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/closeActive.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/closeHover.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/closeHover.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/closeHover.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/closeHover.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonArrowActive-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonArrowActive-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonArrowActive-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonArrowActive-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonArrowActive-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonArrowActive-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonArrowActive-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonArrowActive-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonArrowActive-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonArrowActive-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonArrowActive-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonArrowActive-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonArrowHover-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonArrowHover-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonArrowHover-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonArrowHover-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonArrowHover-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonArrowHover-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonArrowHover-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonArrowHover-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonArrowHover-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonArrowHover-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonArrowHover-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonArrowHover-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonBtnActive-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonBtnActive-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonBtnActive-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonBtnActive-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonBtnActive-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonBtnActive-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonBtnActive-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonBtnActive-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonBtnActive-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonBtnActive-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonBtnActive-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonBtnActive-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonBtnHover-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonBtnHover-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonBtnHover-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonBtnHover-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonBtnHover-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonBtnHover-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonBtnHover-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonBtnHover-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonBtnHover-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonBtnHover-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonBtnHover-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonBtnHover-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonDisabled-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonDisabled-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonDisabled-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonDisabled-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonDisabled-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonDisabled-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonDisabled-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonDisabled-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonDisabled-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonDisabled-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonDisabled-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonDisabled-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonEnabled-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonEnabled-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonEnabled-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonEnabled-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonEnabled-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonEnabled-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonEnabled-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonEnabled-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonEnabled-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonEnabled-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/comboButtonEnabled-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/comboButtonEnabled-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonActive-center.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonActive-center.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonActive-center.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonActive-center.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonActive-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonActive-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonActive-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonActive-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonActive-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonActive-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonActive-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonActive-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonActive-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonActive-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonActive-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonActive-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonDisabled-center.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonDisabled-center.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonDisabled-center.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonDisabled-center.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonDisabled-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonDisabled-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonDisabled-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonDisabled-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonDisabled-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonDisabled-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonDisabled-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonDisabled-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonDisabled-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonDisabled-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonDisabled-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonDisabled-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonEnabled-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonEnabled-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonEnabled-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonEnabled-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonEnabled-right-06.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonEnabled-right-06.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonEnabled-right-06.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonEnabled-right-06.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonEnabled-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonEnabled-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonEnabled-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonEnabled-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonEnabled-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonEnabled-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonEnabled-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonEnabled-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonHover-center.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonHover-center.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonHover-center.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonHover-center.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonHover-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonHover-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonHover-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonHover-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonHover-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonHover-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonHover-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonHover-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonHover-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonHover-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/ddButtonHover-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/ddButtonHover-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/dndCopy.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/dndCopy.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/dndCopy.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/dndCopy.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/dndMove.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/dndMove.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/dndMove.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/dndMove.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/dndNoCopy.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/dndNoCopy.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/dndNoCopy.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/dndNoCopy.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/dndNoMove.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/dndNoMove.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/dndNoMove.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/dndNoMove.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/images.css b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/images.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/images.css
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/images.css
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectActive-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectActive-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectActive-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectActive-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectActive-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectActive-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectActive-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectActive-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectActive-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectActive-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectActive-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectActive-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectDisabled-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectDisabled-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectDisabled-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectDisabled-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectDisabled-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectDisabled-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectDisabled-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectDisabled-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectDisabled-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectDisabled-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectDisabled-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectDisabled-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectEnabled-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectEnabled-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectEnabled-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectEnabled-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectEnabled-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectEnabled-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectEnabled-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectEnabled-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectEnabled-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectEnabled-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectEnabled-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectEnabled-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectHover-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectHover-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectHover-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectHover-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectHover-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectHover-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectHover-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectHover-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectHover-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectHover-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/selectHover-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/selectHover-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerActive-bottom.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerActive-bottom.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerActive-bottom.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerActive-bottom.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerActive-top.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerActive-top.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerActive-top.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerActive-top.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerDisabled-bottom.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerDisabled-bottom.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerDisabled-bottom.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerDisabled-bottom.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerDisabled-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerDisabled-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerDisabled-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerDisabled-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerDisabled-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerDisabled-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerDisabled-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerDisabled-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerDisabled-top.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerDisabled-top.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerDisabled-top.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerDisabled-top.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerEnabled-bottom.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerEnabled-bottom.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerEnabled-bottom.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerEnabled-bottom.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerEnabled-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerEnabled-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerEnabled-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerEnabled-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerEnabled-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerEnabled-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerEnabled-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerEnabled-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerEnabled-top.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerEnabled-top.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerEnabled-top.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerEnabled-top.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerHover-bottom.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerHover-bottom.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerHover-bottom.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerHover-bottom.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerHover-top.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerHover-top.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/spinnerHover-top.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/spinnerHover-top.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabActive-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabActive-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabActive-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabActive-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabActive-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabActive-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabActive-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabActive-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabActive-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabActive-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabActive-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabActive-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabDisabled-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabDisabled-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabDisabled-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabDisabled-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabDisabled-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabDisabled-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabDisabled-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabDisabled-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabDisabled-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabDisabled-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabDisabled-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabDisabled-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabEnabled-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabEnabled-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabEnabled-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabEnabled-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabEnabled-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabEnabled-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabEnabled-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabEnabled-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabEnabled-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabEnabled-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabEnabled-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabEnabled-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabHover-left.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabHover-left.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabHover-left.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabHover-left.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabHover-right.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabHover-right.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabHover-right.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabHover-right.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabHover-stretch.png b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabHover-stretch.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/images/tabHover-stretch.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/images/tabHover-stretch.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/noir.css b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/noir.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/noir.css
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/noir.css
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/noir.html b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/noir.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/noir.html
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/noir.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/noir/noir.psd b/spring-faces/src/main/resources/META-INF/dijit/themes/noir/noir.psd
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/noir/noir.psd
rename to spring-faces/src/main/resources/META-INF/dijit/themes/noir/noir.psd
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/arrows.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/arrows.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/arrows.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/arrows.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/checkmark.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/checkmark.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/checkmark.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/checkmark.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/dndCopy.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/dndCopy.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/dndCopy.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/dndCopy.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/dndMove.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/dndMove.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/dndMove.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/dndMove.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/dndNoCopy.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/dndNoCopy.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/dndNoCopy.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/dndNoCopy.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/dndNoMove.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/dndNoMove.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/dndNoMove.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/dndNoMove.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/editor.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/editor.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/editor.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/editor.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientBottomBg.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientBottomBg.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientBottomBg.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientBottomBg.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientInverseBottomBg.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientInverseBottomBg.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientInverseBottomBg.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientInverseBottomBg.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientInverseTopBg.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientInverseTopBg.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientInverseTopBg.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientInverseTopBg.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientLeftBg.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientLeftBg.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientLeftBg.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientLeftBg.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientRightBg.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientRightBg.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientRightBg.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientRightBg.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientTopBg.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientTopBg.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientTopBg.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientTopBg.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientTopBg2.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientTopBg2.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/gradientTopBg2.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/gradientTopBg2.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/no.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/no.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/no.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/no.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/preciseSliderThumb.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/preciseSliderThumb.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/preciseSliderThumb.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/preciseSliderThumb.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/progressBarAnim.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/progressBarAnim.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/progressBarAnim.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/progressBarAnim.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/sliderThumb.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/sliderThumb.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/sliderThumb.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/sliderThumb.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/splitContainerSizerH-thumb.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/splitContainerSizerH-thumb.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/splitContainerSizerH-thumb.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/splitContainerSizerH-thumb.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/splitContainerSizerH.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/splitContainerSizerH.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/splitContainerSizerH.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/splitContainerSizerH.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/splitContainerSizerV-thumb.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/splitContainerSizerV-thumb.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/splitContainerSizerV-thumb.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/splitContainerSizerV-thumb.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/splitContainerSizerV.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/splitContainerSizerV.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/splitContainerSizerV.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/splitContainerSizerV.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/tabClose.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/tabClose.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/tabClose.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/tabClose.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/tabCloseHover.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/tabCloseHover.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/tabCloseHover.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/tabCloseHover.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/tooltips.png b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/tooltips.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/tooltips.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/tooltips.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/treeExpand_loading.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_loading.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/treeExpand_loading.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_loading.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/treeExpand_minus.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_minus.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/treeExpand_minus.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_minus.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/treeExpand_minus_rtl.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_minus_rtl.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/treeExpand_minus_rtl.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_minus_rtl.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/treeExpand_plus.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_plus.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/treeExpand_plus.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_plus.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/images/treeExpand_plus_rtl.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_plus_rtl.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/images/treeExpand_plus_rtl.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_plus_rtl.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/rounded.css b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/rounded.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/rounded.css
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/rounded.css
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/soria.css b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/soria.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/soria.css
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/soria.css
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/soria.js b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/soria.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/soria.js
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/soria.js
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/soria/soria_rtl.css b/spring-faces/src/main/resources/META-INF/dijit/themes/soria/soria_rtl.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/soria/soria_rtl.css
rename to spring-faces/src/main/resources/META-INF/dijit/themes/soria/soria_rtl.css
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/templateThemeTest.html b/spring-faces/src/main/resources/META-INF/dijit/themes/templateThemeTest.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/templateThemeTest.html
rename to spring-faces/src/main/resources/META-INF/dijit/themes/templateThemeTest.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/themeTester.html b/spring-faces/src/main/resources/META-INF/dijit/themes/themeTester.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/themeTester.html
rename to spring-faces/src/main/resources/META-INF/dijit/themes/themeTester.html
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/dojoTundraGradientBg.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/dojoTundraGradientBg.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/dojoTundraGradientBg.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/dojoTundraGradientBg.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/dojoTundraGradientBg.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/dojoTundraGradientBg.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/dojoTundraGradientBg.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/dojoTundraGradientBg.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/dojoUITundra06.psd b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/dojoUITundra06.psd
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/dojoUITundra06.psd
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/dojoUITundra06.psd
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowDown.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowDown.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowDown.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowDown.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowDown.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowDown.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowDown.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowDown.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowLeft.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowLeft.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowLeft.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowLeft.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowLeft.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowLeft.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowLeft.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowLeft.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowRight.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowRight.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowRight.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowRight.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowRight.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowRight.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowRight.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowRight.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowUp.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowUp.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowUp.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowUp.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowUp.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowUp.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/arrowUp.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/arrowUp.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/buttonActive.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/buttonActive.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/buttonActive.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/buttonActive.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/buttonDisabled.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/buttonDisabled.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/buttonDisabled.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/buttonDisabled.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/buttonEnabled.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/buttonEnabled.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/buttonEnabled.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/buttonEnabled.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/buttonHover.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/buttonHover.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/buttonHover.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/buttonHover.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/calendarDayLabel.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/calendarDayLabel.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/calendarDayLabel.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/calendarDayLabel.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/calendarMonthLabel.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/calendarMonthLabel.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/calendarMonthLabel.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/calendarMonthLabel.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/calendarYearLabel.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/calendarYearLabel.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/calendarYearLabel.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/calendarYearLabel.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkboxActive.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkboxActive.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkboxActive.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkboxActive.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkboxDisabled.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkboxDisabled.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkboxDisabled.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkboxDisabled.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkboxEnabled.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkboxEnabled.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkboxEnabled.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkboxEnabled.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkboxHover.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkboxHover.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkboxHover.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkboxHover.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkmark.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkmark.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkmark.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkmark.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkmark.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkmark.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkmark.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkmark.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/circleIcon.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/circleIcon.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/circleIcon.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/circleIcon.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/circleIcon.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/circleIcon.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/circleIcon.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/circleIcon.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/dijitProgressBarAnim.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/dijitProgressBarAnim.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/dijitProgressBarAnim.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/dijitProgressBarAnim.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/dijitProgressBarAnim.psd b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/dijitProgressBarAnim.psd
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/dijitProgressBarAnim.psd
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/dijitProgressBarAnim.psd
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/dndCopy.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/dndCopy.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/dndCopy.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/dndCopy.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/dndMove.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/dndMove.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/dndMove.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/dndMove.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/dndNoCopy.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/dndNoCopy.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/dndNoCopy.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/dndNoCopy.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/dndNoMove.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/dndNoMove.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/dndNoMove.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/dndNoMove.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/doubleArrowDown.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/doubleArrowDown.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/doubleArrowDown.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/doubleArrowDown.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/doubleArrowUp.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/doubleArrowUp.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/doubleArrowUp.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/doubleArrowUp.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/editor.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/editor.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/editor.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/editor.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/i.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/i.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/i.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/i.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/i_half.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/i_half.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/i_half.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/i_half.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/i_half_rtl.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/i_half_rtl.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/i_half_rtl.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/i_half_rtl.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/i_rtl.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/i_rtl.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/i_rtl.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/i_rtl.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/loading.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/loading.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/loading.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/loading.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/menu.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/menu.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/menu.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/menu.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/no.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/no.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/no.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/no.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/noX.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/noX.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/noX.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/noX.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/popupMenuBg.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/popupMenuBg.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/popupMenuBg.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/popupMenuBg.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/preciseSliderThumb.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumb.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/preciseSliderThumb.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumb.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/preciseSliderThumb.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumb.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/preciseSliderThumb.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumb.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/preciseSliderThumbFocus.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumbFocus.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/preciseSliderThumbFocus.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumbFocus.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/preciseSliderThumbFocus.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumbFocus.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/preciseSliderThumbFocus.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumbFocus.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-1.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-1.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-1.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-1.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-2.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-2.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-2.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-2.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-3.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-3.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-3.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-3.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-4.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-4.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-4.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-4.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-5.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-5.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-5.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-5.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-6.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-6.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-6.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-6.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-7.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-7.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-7.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-7.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-8.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-8.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-8.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-8.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-9.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-9.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim-9.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-9.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim.psd b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim.psd
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarAnim.psd
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim.psd
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarEmpty.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarEmpty.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarEmpty.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarEmpty.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarFull.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarFull.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/progressBarFull.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarFull.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/radioButtonActive.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActive.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/radioButtonActive.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActive.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/radioButtonActiveDisabled.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActiveDisabled.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/radioButtonActiveDisabled.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActiveDisabled.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/radioButtonActiveHover.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActiveHover.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/radioButtonActiveHover.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActiveHover.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/radioButtonDisabled.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonDisabled.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/radioButtonDisabled.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonDisabled.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/radioButtonEnabled.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonEnabled.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/radioButtonEnabled.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonEnabled.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/radioButtonHover.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonHover.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/radioButtonHover.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonHover.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderEmpty.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderEmpty.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderEmpty.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderEmpty.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderEmptyVertical.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderEmptyVertical.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderEmptyVertical.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderEmptyVertical.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderFull.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFull.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderFull.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFull.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderFullFocus.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullFocus.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderFullFocus.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullFocus.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderFullVertical.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullVertical.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderFullVertical.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullVertical.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderFullVerticalFocus.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullVerticalFocus.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderFullVerticalFocus.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullVerticalFocus.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderThumb.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumb.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderThumb.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumb.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderThumbFocus.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumbFocus.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderThumbFocus.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumbFocus.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderThumbFocus.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumbFocus.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/sliderThumbFocus.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumbFocus.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/smallArrowDown.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/smallArrowDown.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/smallArrowDown.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/smallArrowDown.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/smallArrowUp.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/smallArrowUp.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/smallArrowUp.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/smallArrowUp.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/splitContainerSizerH-thumb.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerH-thumb.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/splitContainerSizerH-thumb.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerH-thumb.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/splitContainerSizerH.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerH.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/splitContainerSizerH.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerH.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/splitContainerSizerV-thumb.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerV-thumb.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/splitContainerSizerV-thumb.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerV-thumb.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/splitContainerSizerV.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerV.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/splitContainerSizerV.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerV.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabActive.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabActive.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabActive.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabActive.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabClose.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabClose.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabClose.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabClose.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabClose.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabClose.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabClose.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabClose.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabCloseHover.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabCloseHover.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabCloseHover.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabCloseHover.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabCloseHover.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabCloseHover.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabCloseHover.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabCloseHover.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabDisabled.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabDisabled.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabDisabled.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabDisabled.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabEnabled.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabEnabled.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabEnabled.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabEnabled.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabHover.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabHover.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tabHover.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tabHover.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/titleBar.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/titleBar.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/titleBar.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/titleBar.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/titleBarBg.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/titleBarBg.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/titleBarBg.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/titleBarBg.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_leaf.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_leaf.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_leaf.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_leaf.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_leaf_rtl.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_leaf_rtl.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_leaf_rtl.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_leaf_rtl.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_loading.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_loading.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_loading.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_loading.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_minus.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_minus.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_minus.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_minus.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_minus_rtl.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_minus_rtl.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_minus_rtl.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_minus_rtl.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_plus.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_plus.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_plus.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_plus.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_plus_rtl.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_plus_rtl.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/treeExpand_plus_rtl.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_plus_rtl.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/validationInputBg.gif b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/validationInputBg.gif
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/validationInputBg.gif
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/validationInputBg.gif
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/validationInputBg.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/validationInputBg.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/validationInputBg.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/validationInputBg.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/warning.png b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/warning.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/images/warning.png
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/images/warning.png
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/tundra.css b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/tundra.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/tundra.css
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/tundra.css
diff --git a/spring-faces/src/main/java/META-INF/dijit/themes/tundra/tundra_rtl.css b/spring-faces/src/main/resources/META-INF/dijit/themes/tundra/tundra_rtl.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dijit/themes/tundra/tundra_rtl.css
rename to spring-faces/src/main/resources/META-INF/dijit/themes/tundra/tundra_rtl.css
diff --git a/spring-faces/src/main/java/META-INF/dojo/AdapterRegistry.js b/spring-faces/src/main/resources/META-INF/dojo/AdapterRegistry.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/AdapterRegistry.js
rename to spring-faces/src/main/resources/META-INF/dojo/AdapterRegistry.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/DeferredList.js b/spring-faces/src/main/resources/META-INF/dojo/DeferredList.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/DeferredList.js
rename to spring-faces/src/main/resources/META-INF/dojo/DeferredList.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/LICENSE b/spring-faces/src/main/resources/META-INF/dojo/LICENSE
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/LICENSE
rename to spring-faces/src/main/resources/META-INF/dojo/LICENSE
diff --git a/spring-faces/src/main/java/META-INF/dojo/NodeList-fx.js b/spring-faces/src/main/resources/META-INF/dojo/NodeList-fx.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/NodeList-fx.js
rename to spring-faces/src/main/resources/META-INF/dojo/NodeList-fx.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/OpenAjax.js b/spring-faces/src/main/resources/META-INF/dojo/OpenAjax.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/OpenAjax.js
rename to spring-faces/src/main/resources/META-INF/dojo/OpenAjax.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base.js b/spring-faces/src/main/resources/META-INF/dojo/_base.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/Color.js b/spring-faces/src/main/resources/META-INF/dojo/_base/Color.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/Color.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/Color.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/Deferred.js b/spring-faces/src/main/resources/META-INF/dojo/_base/Deferred.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/Deferred.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/Deferred.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/NodeList.js b/spring-faces/src/main/resources/META-INF/dojo/_base/NodeList.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/NodeList.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/NodeList.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/_loader/bootstrap.js b/spring-faces/src/main/resources/META-INF/dojo/_base/_loader/bootstrap.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/_loader/bootstrap.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/_loader/bootstrap.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/_loader/hostenv_browser.js b/spring-faces/src/main/resources/META-INF/dojo/_base/_loader/hostenv_browser.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/_loader/hostenv_browser.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/_loader/hostenv_browser.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/_loader/hostenv_rhino.js b/spring-faces/src/main/resources/META-INF/dojo/_base/_loader/hostenv_rhino.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/_loader/hostenv_rhino.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/_loader/hostenv_rhino.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/_loader/hostenv_spidermonkey.js b/spring-faces/src/main/resources/META-INF/dojo/_base/_loader/hostenv_spidermonkey.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/_loader/hostenv_spidermonkey.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/_loader/hostenv_spidermonkey.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/_loader/loader.js b/spring-faces/src/main/resources/META-INF/dojo/_base/_loader/loader.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/_loader/loader.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/_loader/loader.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/_loader/loader_debug.js b/spring-faces/src/main/resources/META-INF/dojo/_base/_loader/loader_debug.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/_loader/loader_debug.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/_loader/loader_debug.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/_loader/loader_xd.js b/spring-faces/src/main/resources/META-INF/dojo/_base/_loader/loader_xd.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/_loader/loader_xd.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/_loader/loader_xd.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/array.js b/spring-faces/src/main/resources/META-INF/dojo/_base/array.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/array.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/array.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/connect.js b/spring-faces/src/main/resources/META-INF/dojo/_base/connect.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/connect.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/connect.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/declare.js b/spring-faces/src/main/resources/META-INF/dojo/_base/declare.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/declare.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/declare.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/event.js b/spring-faces/src/main/resources/META-INF/dojo/_base/event.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/event.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/event.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/fx.js b/spring-faces/src/main/resources/META-INF/dojo/_base/fx.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/fx.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/fx.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/html.js b/spring-faces/src/main/resources/META-INF/dojo/_base/html.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/html.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/html.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/json.js b/spring-faces/src/main/resources/META-INF/dojo/_base/json.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/json.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/json.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/lang.js b/spring-faces/src/main/resources/META-INF/dojo/_base/lang.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/lang.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/lang.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/query.js b/spring-faces/src/main/resources/META-INF/dojo/_base/query.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/query.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/query.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/window.js b/spring-faces/src/main/resources/META-INF/dojo/_base/window.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/window.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/window.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_base/xhr.js b/spring-faces/src/main/resources/META-INF/dojo/_base/xhr.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_base/xhr.js
rename to spring-faces/src/main/resources/META-INF/dojo/_base/xhr.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_firebug/LICENSE b/spring-faces/src/main/resources/META-INF/dojo/_firebug/LICENSE
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_firebug/LICENSE
rename to spring-faces/src/main/resources/META-INF/dojo/_firebug/LICENSE
diff --git a/spring-faces/src/main/java/META-INF/dojo/_firebug/errorIcon.png b/spring-faces/src/main/resources/META-INF/dojo/_firebug/errorIcon.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_firebug/errorIcon.png
rename to spring-faces/src/main/resources/META-INF/dojo/_firebug/errorIcon.png
diff --git a/spring-faces/src/main/java/META-INF/dojo/_firebug/firebug.css b/spring-faces/src/main/resources/META-INF/dojo/_firebug/firebug.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_firebug/firebug.css
rename to spring-faces/src/main/resources/META-INF/dojo/_firebug/firebug.css
diff --git a/spring-faces/src/main/java/META-INF/dojo/_firebug/firebug.js b/spring-faces/src/main/resources/META-INF/dojo/_firebug/firebug.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_firebug/firebug.js
rename to spring-faces/src/main/resources/META-INF/dojo/_firebug/firebug.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/_firebug/infoIcon.png b/spring-faces/src/main/resources/META-INF/dojo/_firebug/infoIcon.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_firebug/infoIcon.png
rename to spring-faces/src/main/resources/META-INF/dojo/_firebug/infoIcon.png
diff --git a/spring-faces/src/main/java/META-INF/dojo/_firebug/warningIcon.png b/spring-faces/src/main/resources/META-INF/dojo/_firebug/warningIcon.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/_firebug/warningIcon.png
rename to spring-faces/src/main/resources/META-INF/dojo/_firebug/warningIcon.png
diff --git a/spring-faces/src/main/java/META-INF/dojo/back.js b/spring-faces/src/main/resources/META-INF/dojo/back.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/back.js
rename to spring-faces/src/main/resources/META-INF/dojo/back.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/behavior.js b/spring-faces/src/main/resources/META-INF/dojo/behavior.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/behavior.js
rename to spring-faces/src/main/resources/META-INF/dojo/behavior.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/build.txt b/spring-faces/src/main/resources/META-INF/dojo/build.txt
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/build.txt
rename to spring-faces/src/main/resources/META-INF/dojo/build.txt
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/LICENSE b/spring-faces/src/main/resources/META-INF/dojo/cldr/LICENSE
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/LICENSE
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/LICENSE
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/README b/spring-faces/src/main/resources/META-INF/dojo/cldr/README
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/README
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/README
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/monetary.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/monetary.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/monetary.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/monetary.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/currency.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/de-de/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/de-de/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/de-de/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/de-de/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/de/currency.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/de/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/de/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/de/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/de/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/de/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/de/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/de/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/de/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/de/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/de/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/de/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-au/currency.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-au/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-au/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-au/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-au/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-au/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-au/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-au/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-ca/currency.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-ca/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-ca/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-ca/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-ca/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-ca/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-ca/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-ca/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-ca/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-ca/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-ca/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-ca/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-gb/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-gb/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-gb/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-gb/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-us/currency.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-us/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-us/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-us/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-us/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-us/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/en-us/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en-us/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/en/currency.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/en/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/en/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/en/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/en/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/en/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/en/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/es-es/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/es-es/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/es-es/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/es-es/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/es-es/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/es-es/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/es-es/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/es-es/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/es/currency.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/es/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/es/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/es/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/es/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/es/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/es/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/es/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/es/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/es/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/es/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/es/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/fr/currency.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/fr/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/fr/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/fr/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/fr/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/fr/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/fr/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/fr/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/fr/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/fr/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/fr/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/fr/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/it-it/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/it-it/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/it-it/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/it-it/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/it/currency.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/it/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/it/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/it/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/it/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/it/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/it/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/it/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/it/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/it/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/it/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/it/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/ja-jp/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ja-jp/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/ja-jp/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ja-jp/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/ja/currency.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ja/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/ja/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ja/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/ja/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ja/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/ja/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ja/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/ko-kr/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ko-kr/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/ko-kr/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ko-kr/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/ko-kr/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ko-kr/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/ko-kr/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ko-kr/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/ko/currency.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ko/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/ko/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ko/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/ko/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ko/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/ko/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/ko/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/pt-br/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/pt-br/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/pt-br/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/pt-br/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/pt/currency.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/pt/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/pt/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/pt/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/pt/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/pt/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/pt/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/pt/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/pt/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/pt/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/pt/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/pt/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/zh-cn/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/zh-cn/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/zh-cn/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/zh-cn/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/zh-cn/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/zh-cn/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/zh-cn/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/zh-cn/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/zh-tw/number.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/zh-tw/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/zh/currency.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/zh/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/zh/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/zh/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/nls/zh/gregorian.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/nls/zh/gregorian.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/nls/zh/gregorian.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/nls/zh/gregorian.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cldr/supplemental.js b/spring-faces/src/main/resources/META-INF/dojo/cldr/supplemental.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cldr/supplemental.js
rename to spring-faces/src/main/resources/META-INF/dojo/cldr/supplemental.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/colors.js b/spring-faces/src/main/resources/META-INF/dojo/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/cookie.js b/spring-faces/src/main/resources/META-INF/dojo/cookie.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/cookie.js
rename to spring-faces/src/main/resources/META-INF/dojo/cookie.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/currency.js b/spring-faces/src/main/resources/META-INF/dojo/currency.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/currency.js
rename to spring-faces/src/main/resources/META-INF/dojo/currency.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/data/ItemFileReadStore.js b/spring-faces/src/main/resources/META-INF/dojo/data/ItemFileReadStore.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/data/ItemFileReadStore.js
rename to spring-faces/src/main/resources/META-INF/dojo/data/ItemFileReadStore.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/data/ItemFileWriteStore.js b/spring-faces/src/main/resources/META-INF/dojo/data/ItemFileWriteStore.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/data/ItemFileWriteStore.js
rename to spring-faces/src/main/resources/META-INF/dojo/data/ItemFileWriteStore.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/data/api/Identity.js b/spring-faces/src/main/resources/META-INF/dojo/data/api/Identity.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/data/api/Identity.js
rename to spring-faces/src/main/resources/META-INF/dojo/data/api/Identity.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/data/api/Notification.js b/spring-faces/src/main/resources/META-INF/dojo/data/api/Notification.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/data/api/Notification.js
rename to spring-faces/src/main/resources/META-INF/dojo/data/api/Notification.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/data/api/Read.js b/spring-faces/src/main/resources/META-INF/dojo/data/api/Read.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/data/api/Read.js
rename to spring-faces/src/main/resources/META-INF/dojo/data/api/Read.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/data/api/Request.js b/spring-faces/src/main/resources/META-INF/dojo/data/api/Request.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/data/api/Request.js
rename to spring-faces/src/main/resources/META-INF/dojo/data/api/Request.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/data/api/Write.js b/spring-faces/src/main/resources/META-INF/dojo/data/api/Write.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/data/api/Write.js
rename to spring-faces/src/main/resources/META-INF/dojo/data/api/Write.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/data/util/filter.js b/spring-faces/src/main/resources/META-INF/dojo/data/util/filter.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/data/util/filter.js
rename to spring-faces/src/main/resources/META-INF/dojo/data/util/filter.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/data/util/simpleFetch.js b/spring-faces/src/main/resources/META-INF/dojo/data/util/simpleFetch.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/data/util/simpleFetch.js
rename to spring-faces/src/main/resources/META-INF/dojo/data/util/simpleFetch.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/data/util/sorter.js b/spring-faces/src/main/resources/META-INF/dojo/data/util/sorter.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/data/util/sorter.js
rename to spring-faces/src/main/resources/META-INF/dojo/data/util/sorter.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/date.js b/spring-faces/src/main/resources/META-INF/dojo/date.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/date.js
rename to spring-faces/src/main/resources/META-INF/dojo/date.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/date/locale.js b/spring-faces/src/main/resources/META-INF/dojo/date/locale.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/date/locale.js
rename to spring-faces/src/main/resources/META-INF/dojo/date/locale.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/date/stamp.js b/spring-faces/src/main/resources/META-INF/dojo/date/stamp.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/date/stamp.js
rename to spring-faces/src/main/resources/META-INF/dojo/date/stamp.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/dnd/Avatar.js b/spring-faces/src/main/resources/META-INF/dojo/dnd/Avatar.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/dnd/Avatar.js
rename to spring-faces/src/main/resources/META-INF/dojo/dnd/Avatar.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/dnd/Container.js b/spring-faces/src/main/resources/META-INF/dojo/dnd/Container.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/dnd/Container.js
rename to spring-faces/src/main/resources/META-INF/dojo/dnd/Container.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/dnd/Manager.js b/spring-faces/src/main/resources/META-INF/dojo/dnd/Manager.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/dnd/Manager.js
rename to spring-faces/src/main/resources/META-INF/dojo/dnd/Manager.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/dnd/Moveable.js b/spring-faces/src/main/resources/META-INF/dojo/dnd/Moveable.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/dnd/Moveable.js
rename to spring-faces/src/main/resources/META-INF/dojo/dnd/Moveable.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/dnd/Mover.js b/spring-faces/src/main/resources/META-INF/dojo/dnd/Mover.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/dnd/Mover.js
rename to spring-faces/src/main/resources/META-INF/dojo/dnd/Mover.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/dnd/Selector.js b/spring-faces/src/main/resources/META-INF/dojo/dnd/Selector.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/dnd/Selector.js
rename to spring-faces/src/main/resources/META-INF/dojo/dnd/Selector.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/dnd/Source.js b/spring-faces/src/main/resources/META-INF/dojo/dnd/Source.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/dnd/Source.js
rename to spring-faces/src/main/resources/META-INF/dojo/dnd/Source.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/dnd/autoscroll.js b/spring-faces/src/main/resources/META-INF/dojo/dnd/autoscroll.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/dnd/autoscroll.js
rename to spring-faces/src/main/resources/META-INF/dojo/dnd/autoscroll.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/dnd/common.js b/spring-faces/src/main/resources/META-INF/dojo/dnd/common.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/dnd/common.js
rename to spring-faces/src/main/resources/META-INF/dojo/dnd/common.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/dnd/move.js b/spring-faces/src/main/resources/META-INF/dojo/dnd/move.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/dnd/move.js
rename to spring-faces/src/main/resources/META-INF/dojo/dnd/move.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/dojo.js b/spring-faces/src/main/resources/META-INF/dojo/dojo.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/dojo.js
rename to spring-faces/src/main/resources/META-INF/dojo/dojo.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/dojo.js.uncompressed.js b/spring-faces/src/main/resources/META-INF/dojo/dojo.js.uncompressed.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/dojo.js.uncompressed.js
rename to spring-faces/src/main/resources/META-INF/dojo/dojo.js.uncompressed.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/fx.js b/spring-faces/src/main/resources/META-INF/dojo/fx.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/fx.js
rename to spring-faces/src/main/resources/META-INF/dojo/fx.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/i18n.js b/spring-faces/src/main/resources/META-INF/dojo/i18n.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/i18n.js
rename to spring-faces/src/main/resources/META-INF/dojo/i18n.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/io/iframe.js b/spring-faces/src/main/resources/META-INF/dojo/io/iframe.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/io/iframe.js
rename to spring-faces/src/main/resources/META-INF/dojo/io/iframe.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/io/script.js b/spring-faces/src/main/resources/META-INF/dojo/io/script.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/io/script.js
rename to spring-faces/src/main/resources/META-INF/dojo/io/script.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/cs/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/cs/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/cs/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/cs/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/de/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/de/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/de/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/de/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/es/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/es/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/es/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/es/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/fr/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/fr/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/fr/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/fr/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/hu/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/hu/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/hu/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/hu/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/it/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/it/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/it/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/it/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/ja/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/ja/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/ja/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/ja/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/ko/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/ko/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/ko/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/ko/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/pl/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/pl/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/pl/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/pl/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/pt/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/pt/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/pt/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/pt/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/ru/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/ru/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/ru/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/ru/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/zh-tw/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/zh-tw/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/zh-tw/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/zh-tw/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/nls/zh/colors.js b/spring-faces/src/main/resources/META-INF/dojo/nls/zh/colors.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/nls/zh/colors.js
rename to spring-faces/src/main/resources/META-INF/dojo/nls/zh/colors.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/number.js b/spring-faces/src/main/resources/META-INF/dojo/number.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/number.js
rename to spring-faces/src/main/resources/META-INF/dojo/number.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/parser.js b/spring-faces/src/main/resources/META-INF/dojo/parser.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/parser.js
rename to spring-faces/src/main/resources/META-INF/dojo/parser.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/regexp.js b/spring-faces/src/main/resources/META-INF/dojo/regexp.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/regexp.js
rename to spring-faces/src/main/resources/META-INF/dojo/regexp.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/resources/LICENSE b/spring-faces/src/main/resources/META-INF/dojo/resources/LICENSE
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/resources/LICENSE
rename to spring-faces/src/main/resources/META-INF/dojo/resources/LICENSE
diff --git a/spring-faces/src/main/java/META-INF/dojo/resources/blank.html b/spring-faces/src/main/resources/META-INF/dojo/resources/blank.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/resources/blank.html
rename to spring-faces/src/main/resources/META-INF/dojo/resources/blank.html
diff --git a/spring-faces/src/main/java/META-INF/dojo/resources/dnd.css b/spring-faces/src/main/resources/META-INF/dojo/resources/dnd.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/resources/dnd.css
rename to spring-faces/src/main/resources/META-INF/dojo/resources/dnd.css
diff --git a/spring-faces/src/main/java/META-INF/dojo/resources/dojo.css b/spring-faces/src/main/resources/META-INF/dojo/resources/dojo.css
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/resources/dojo.css
rename to spring-faces/src/main/resources/META-INF/dojo/resources/dojo.css
diff --git a/spring-faces/src/main/java/META-INF/dojo/resources/iframe_history.html b/spring-faces/src/main/resources/META-INF/dojo/resources/iframe_history.html
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/resources/iframe_history.html
rename to spring-faces/src/main/resources/META-INF/dojo/resources/iframe_history.html
diff --git a/spring-faces/src/main/java/META-INF/dojo/resources/images/dndCopy.png b/spring-faces/src/main/resources/META-INF/dojo/resources/images/dndCopy.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/resources/images/dndCopy.png
rename to spring-faces/src/main/resources/META-INF/dojo/resources/images/dndCopy.png
diff --git a/spring-faces/src/main/java/META-INF/dojo/resources/images/dndMove.png b/spring-faces/src/main/resources/META-INF/dojo/resources/images/dndMove.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/resources/images/dndMove.png
rename to spring-faces/src/main/resources/META-INF/dojo/resources/images/dndMove.png
diff --git a/spring-faces/src/main/java/META-INF/dojo/resources/images/dndNoCopy.png b/spring-faces/src/main/resources/META-INF/dojo/resources/images/dndNoCopy.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/resources/images/dndNoCopy.png
rename to spring-faces/src/main/resources/META-INF/dojo/resources/images/dndNoCopy.png
diff --git a/spring-faces/src/main/java/META-INF/dojo/resources/images/dndNoMove.png b/spring-faces/src/main/resources/META-INF/dojo/resources/images/dndNoMove.png
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/resources/images/dndNoMove.png
rename to spring-faces/src/main/resources/META-INF/dojo/resources/images/dndNoMove.png
diff --git a/spring-faces/src/main/java/META-INF/dojo/rpc/JsonService.js b/spring-faces/src/main/resources/META-INF/dojo/rpc/JsonService.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/rpc/JsonService.js
rename to spring-faces/src/main/resources/META-INF/dojo/rpc/JsonService.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/rpc/JsonpService.js b/spring-faces/src/main/resources/META-INF/dojo/rpc/JsonpService.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/rpc/JsonpService.js
rename to spring-faces/src/main/resources/META-INF/dojo/rpc/JsonpService.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/rpc/RpcService.js b/spring-faces/src/main/resources/META-INF/dojo/rpc/RpcService.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/rpc/RpcService.js
rename to spring-faces/src/main/resources/META-INF/dojo/rpc/RpcService.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/string.js b/spring-faces/src/main/resources/META-INF/dojo/string.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/string.js
rename to spring-faces/src/main/resources/META-INF/dojo/string.js
diff --git a/spring-faces/src/main/java/META-INF/dojo/tests.js b/spring-faces/src/main/resources/META-INF/dojo/tests.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/dojo/tests.js
rename to spring-faces/src/main/resources/META-INF/dojo/tests.js
diff --git a/spring-faces/src/main/java/META-INF/faces-config.xml b/spring-faces/src/main/resources/META-INF/faces-config.xml
similarity index 100%
rename from spring-faces/src/main/java/META-INF/faces-config.xml
rename to spring-faces/src/main/resources/META-INF/faces-config.xml
diff --git a/spring-faces/src/main/java/META-INF/spring.handlers b/spring-faces/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from spring-faces/src/main/java/META-INF/spring.handlers
rename to spring-faces/src/main/resources/META-INF/spring.handlers
diff --git a/spring-faces/src/main/java/META-INF/spring.schemas b/spring-faces/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from spring-faces/src/main/java/META-INF/spring.schemas
rename to spring-faces/src/main/resources/META-INF/spring.schemas
diff --git a/spring-faces/src/main/java/META-INF/spring/Spring-Dojo.js b/spring-faces/src/main/resources/META-INF/spring/Spring-Dojo.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/spring/Spring-Dojo.js
rename to spring-faces/src/main/resources/META-INF/spring/Spring-Dojo.js
diff --git a/spring-faces/src/main/java/META-INF/spring/Spring.js b/spring-faces/src/main/resources/META-INF/spring/Spring.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/spring/Spring.js
rename to spring-faces/src/main/resources/META-INF/spring/Spring.js
diff --git a/spring-faces/src/main/java/META-INF/spring/SpringFaces-Ext.js b/spring-faces/src/main/resources/META-INF/spring/SpringFaces-Ext.js
similarity index 100%
rename from spring-faces/src/main/java/META-INF/spring/SpringFaces-Ext.js
rename to spring-faces/src/main/resources/META-INF/spring/SpringFaces-Ext.js
diff --git a/spring-faces/src/main/java/META-INF/springfaces-ext.taglib.xml b/spring-faces/src/main/resources/META-INF/springfaces-ext.taglib.xml
similarity index 100%
rename from spring-faces/src/main/java/META-INF/springfaces-ext.taglib.xml
rename to spring-faces/src/main/resources/META-INF/springfaces-ext.taglib.xml
diff --git a/spring-faces/src/main/java/META-INF/springfaces.taglib.xml b/spring-faces/src/main/resources/META-INF/springfaces.taglib.xml
similarity index 100%
rename from spring-faces/src/main/java/META-INF/springfaces.taglib.xml
rename to spring-faces/src/main/resources/META-INF/springfaces.taglib.xml
diff --git a/spring-webflow-reference/.classpath b/spring-webflow-reference/.classpath
new file mode 100644
index 00000000..db9d1cd5
--- /dev/null
+++ b/spring-webflow-reference/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/junit/junit-4.4.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-4.4.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/common-build/templates/projects/standard/.project b/spring-webflow-reference/.project
similarity index 89%
rename from common-build/templates/projects/standard/.project
rename to spring-webflow-reference/.project
index 6f35c775..46458044 100644
--- a/common-build/templates/projects/standard/.project
+++ b/spring-webflow-reference/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>@PROJECT_NAME@</name>
+	<name>spring-webflow-reference</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/spring-webflow-reference/build.xml b/spring-webflow-reference/build.xml
new file mode 100644
index 00000000..abab6635
--- /dev/null
+++ b/spring-webflow-reference/build.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="spring-webflow-reference">
+
+	<property name="doc.type" value="reference"/>
+	<property file="${basedir}/../build.properties"/>
+	<import file="${basedir}/../spring-build/documentation/default.xml"/>
+
+</project>
diff --git a/spring-webflow-reference/css/html/stylesheet.css b/spring-webflow-reference/css/html/stylesheet.css
new file mode 100644
index 00000000..54e4ba76
--- /dev/null
+++ b/spring-webflow-reference/css/html/stylesheet.css
@@ -0,0 +1,56 @@
+html {
+  padding:       0pt;
+  margin:        0pt;
+}
+
+body {
+  margin-left:   10%;
+  margin-right:  10%;
+  font-family:   Arial, Sans-serif;
+}
+
+div {
+  margin:        0pt;
+}
+
+p {
+  text-align:    justify;
+}
+
+hr {
+  border:        1px solid gray;
+  background:    gray;
+}
+
+h1,h2,h3 {
+  color:         #234623;
+  font-family:   Arial, Sans-serif;
+}
+
+pre {
+  line-height:   1.0;
+  color:         black;
+}
+
+pre.programlisting {
+  font-size:     10pt;
+  padding:       7pt 3pt;
+  border:        1pt solid black;
+  background:    #eeeeee;
+}
+
+div.table {
+  margin:        1em;
+  padding:       0.5em;
+  text-align:    center;
+}
+
+div.table table {
+  display:       table;
+  width:         100%;
+}
+
+div.table td {
+  padding-left:  7px;
+  padding-right: 7px;
+}
diff --git a/spring-webflow/docs/reference/src/images/hotels-site-bookhotel-flow.png b/spring-webflow-reference/images/hotels-site-bookhotel-flow.png
similarity index 100%
rename from spring-webflow/docs/reference/src/images/hotels-site-bookhotel-flow.png
rename to spring-webflow-reference/images/hotels-site-bookhotel-flow.png
diff --git a/spring-webflow/docs/reference/src/images/hotels-site.png b/spring-webflow-reference/images/hotels-site.png
similarity index 100%
rename from spring-webflow/docs/reference/src/images/hotels-site.png
rename to spring-webflow-reference/images/hotels-site.png
diff --git a/spring-webflow/docs/reference/src/images/logo.jpg b/spring-webflow-reference/images/logo.jpg
similarity index 100%
rename from spring-webflow/docs/reference/src/images/logo.jpg
rename to spring-webflow-reference/images/logo.jpg
diff --git a/spring-webflow-reference/images/s2-logo.png b/spring-webflow-reference/images/s2-logo.png
new file mode 100644
index 00000000..7f418140
Binary files /dev/null and b/spring-webflow-reference/images/s2-logo.png differ
diff --git a/spring-webflow/docs/reference/src/images/xdev-spring_logo.jpg b/spring-webflow-reference/images/xdev-spring_logo.jpg
similarity index 100%
rename from spring-webflow/docs/reference/src/images/xdev-spring_logo.jpg
rename to spring-webflow-reference/images/xdev-spring_logo.jpg
diff --git a/spring-webflow-reference/ivy.xml b/spring-webflow-reference/ivy.xml
new file mode 100644
index 00000000..a796877a
--- /dev/null
+++ b/spring-webflow-reference/ivy.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
+
+	<info organisation="spring-webflow-reference" module="${ant.project.name}">
+		<ivyauthor name="sweeney"/>
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+	</publications>
+
+	<dependencies>
+		<dependency org="org.junit" name="junit" rev="4.4" conf="test->default"/>
+	</dependencies>
+
+</ivy-module>
diff --git a/spring-webflow/docs/reference/src/defining-flows.xml b/spring-webflow-reference/src/defining-flows.xml
similarity index 100%
rename from spring-webflow/docs/reference/src/defining-flows.xml
rename to spring-webflow-reference/src/defining-flows.xml
diff --git a/spring-webflow/docs/reference/src/overview.xml b/spring-webflow-reference/src/overview.xml
similarity index 100%
rename from spring-webflow/docs/reference/src/overview.xml
rename to spring-webflow-reference/src/overview.xml
diff --git a/spring-webflow/docs/reference/src/index.xml b/spring-webflow-reference/src/spring-webflow-reference.xml
similarity index 90%
rename from spring-webflow/docs/reference/src/index.xml
rename to spring-webflow-reference/src/spring-webflow-reference.xml
index dcc861cf..f5f3d31d 100644
--- a/spring-webflow/docs/reference/src/index.xml
+++ b/spring-webflow-reference/src/spring-webflow-reference.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                      "../lib/docbook-dtd/docbookx.dtd"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+     "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
 [
 <!ENTITY overview SYSTEM "overview.xml">
 <!ENTITY defining-flows SYSTEM "defining-flows.xml">
@@ -50,4 +50,4 @@
 	&overview;
 	&defining-flows;
 	
-</book>
\ No newline at end of file
+</book>
diff --git a/spring-webflow-reference/styles/html/custom.xsl b/spring-webflow-reference/styles/html/custom.xsl
new file mode 100644
index 00000000..7d06277d
--- /dev/null
+++ b/spring-webflow-reference/styles/html/custom.xsl
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'>
+
+<!-- Extensions -->
+    <xsl:param name="use.extensions">1</xsl:param>
+    <xsl:param name="tablecolumns.extension">0</xsl:param>
+    <xsl:param name="callout.extensions">1</xsl:param>
+
+<!-- Activate Graphics -->
+  <xsl:param name="admon.graphics" select="1"/>
+  <xsl:param name="admon.graphics.path">images/</xsl:param>
+  <xsl:param name="admon.graphics.extension">.gif</xsl:param>
+  <xsl:param name="callout.graphics" select="1" />
+  <xsl:param name="callout.defaultcolumn">120</xsl:param>
+  <xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
+  <xsl:param name="callout.graphics.extension">.gif</xsl:param>
+
+  <xsl:param name="table.borders.with.css" select="1"/>
+  <xsl:param name="html.stylesheet">css/stylesheet.css</xsl:param>
+  <xsl:param name="html.stylesheet.type">text/css</xsl:param>         
+  <xsl:param name="generate.toc">book toc,title</xsl:param>         
+
+  <xsl:param name="admonition.title.properties">text-align: left</xsl:param>
+
+  <!-- Label Chapters and Sections (numbering) -->
+  <xsl:param name="chapter.autolabel" select="1"/>
+  <xsl:param name="section.autolabel" select="1"/>
+  <xsl:param name="section.autolabel.max.depth" select="1"/>
+
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+  <xsl:param name="table.footnote.number.format" select="'1'"/>
+
+<!-- Remove "Chapter" from the Chapter titles... -->
+  <xsl:param name="local.l10n.xml" select="document('')"/>
+  <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+    <l:l10n language="en">
+      <l:context name="title-numbered">
+        <l:template name="chapter" text="%n.&#160;%t"/>
+        <l:template name="section" text="%n&#160;%t"/>
+      </l:context>
+    </l:l10n>
+  </l:i18n>      
+</xsl:stylesheet>
diff --git a/spring-webflow-reference/styles/html/titlepage.xml b/spring-webflow-reference/styles/html/titlepage.xml
new file mode 100644
index 00000000..0c0258f7
--- /dev/null
+++ b/spring-webflow-reference/styles/html/titlepage.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
+             xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
+             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup/>
+    <author/>
+    <mediaobject/>
+    <othercredit/>
+    <productname/>
+    <releaseinfo/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <hr/>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+</t:templates>
diff --git a/spring-webflow-reference/styles/pdf/custom.xsl b/spring-webflow-reference/styles/pdf/custom.xsl
new file mode 100644
index 00000000..dbd0c8e2
--- /dev/null
+++ b/spring-webflow-reference/styles/pdf/custom.xsl
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                version='1.0'>
+
+  <!-- Use nice graphics for admonitions -->
+  <xsl:param name="admon.graphics">'1'</xsl:param>
+  <xsl:param name="admon.graphics.path">@file.prefix@@dbf.xsl@/images/</xsl:param>
+  <xsl:param name="draft.watermark.image" select="'@file.prefix@@dbf.xsl@/images/draft.png'"/>
+  <xsl:param name="paper.type" select="'@paper.type@'"/>
+
+  <xsl:param name="page.margin.top" select="'1cm'"/>
+  <xsl:param name="region.before.extent" select="'1cm'"/>
+  <xsl:param name="body.margin.top" select="'1.5cm'"/>
+
+  <xsl:param name="body.margin.bottom" select="'1.5cm'"/>
+  <xsl:param name="region.after.extent" select="'1cm'"/>
+  <xsl:param name="page.margin.bottom" select="'1cm'"/>
+  <xsl:param name="title.margin.left" select="'0cm'"/>
+
+<!--###################################################
+                      Header
+    ################################################### -->
+
+    <!-- More space in the center header for long text -->
+    <xsl:attribute-set name="header.content.properties">
+        <xsl:attribute name="font-family">
+            <xsl:value-of select="$body.font.family"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-left">-5em</xsl:attribute>
+        <xsl:attribute name="margin-right">-5em</xsl:attribute>
+    </xsl:attribute-set>
+
+<!--###################################################
+                      Table of Contents
+    ################################################### -->
+
+    <xsl:param name="generate.toc">
+      book      toc,title
+    </xsl:param>
+
+<!--###################################################
+                      Custom Header
+    ################################################### -->
+
+    <xsl:template name="header.content">
+        <xsl:param name="pageclass" select="''"/>
+        <xsl:param name="sequence" select="''"/>
+        <xsl:param name="position" select="''"/>
+        <xsl:param name="gentext-key" select="''"/>
+
+        <xsl:variable name="Version">
+          <xsl:choose>
+            <xsl:when test="//productname">
+              <xsl:value-of select="//productname"/><xsl:text> </xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>please define productname in your docbook file!</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+
+        <xsl:choose>
+          <xsl:when test="$sequence='blank'">
+            <xsl:choose>
+              <xsl:when test="$position='center'">
+                <xsl:value-of select="$Version"/>
+              </xsl:when>
+
+              <xsl:otherwise>
+                <!-- nop -->
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:when>
+
+          <xsl:when test="$pageclass='titlepage'">
+          <!-- nop: other titlepage sequences have no header -->
+          </xsl:when>
+
+          <xsl:when test="$position='center'">
+            <xsl:value-of select="$Version"/>
+          </xsl:when>
+
+          <xsl:otherwise>
+          <!-- nop -->
+          </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+<!--###################################################
+                      Custom Footer
+    ################################################### -->
+
+    <xsl:template name="footer.content">
+        <xsl:param name="pageclass" select="''"/>
+        <xsl:param name="sequence" select="''"/>
+        <xsl:param name="position" select="''"/>
+        <xsl:param name="gentext-key" select="''"/>
+
+        <xsl:variable name="Version">
+          <xsl:choose>
+            <xsl:when test="//releaseinfo">
+              <xsl:value-of select="//releaseinfo"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <!-- nop -->
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+
+        <xsl:variable name="Title">
+          <xsl:value-of select="//title"/>
+        </xsl:variable>
+
+        <xsl:choose>
+          <xsl:when test="$sequence='blank'">
+            <xsl:choose>
+              <xsl:when test="$double.sided != 0 and $position = 'left'">
+                <xsl:value-of select="$Version"/>
+              </xsl:when>
+
+              <xsl:when test="$double.sided = 0 and $position = 'center'">
+                <!-- nop -->
+              </xsl:when>
+
+              <xsl:otherwise>
+                <fo:page-number/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:when>
+
+          <xsl:when test="$pageclass='titlepage'">
+          <!-- nop: other titlepage sequences have no footer -->
+          </xsl:when>
+
+          <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='left'">
+            <fo:page-number/>
+          </xsl:when>
+
+          <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='right'">
+            <fo:page-number/>
+          </xsl:when>
+
+          <xsl:when test="$double.sided = 0 and $position='right'">
+           <fo:page-number/>
+          </xsl:when>
+
+          <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='left'">
+            <xsl:value-of select="$Version"/>
+          </xsl:when>
+
+          <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='right'">
+            <xsl:value-of select="$Version"/>
+          </xsl:when>
+
+          <xsl:when test="$double.sided = 0 and $position='left'">
+            <xsl:value-of select="$Version"/>
+          </xsl:when>
+
+          <xsl:when test="$position='center'">
+            <xsl:value-of select="$Title"/>
+          </xsl:when>
+
+          <xsl:otherwise>
+          <!-- nop -->
+          </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="processing-instruction('hard-pagebreak')">
+      <fo:block break-before='page'/>
+    </xsl:template>
+
+<!--###################################################
+                      Extensions
+    ################################################### -->
+
+    <!-- These extensions are required for table printing and other stuff -->
+    <xsl:param name="use.extensions">1</xsl:param>
+    <xsl:param name="tablecolumns.extension">0</xsl:param>
+    <xsl:param name="callout.extensions">1</xsl:param>
+    <xsl:param name="fop.extensions">1</xsl:param>
+
+<!--###################################################
+                   Paper & Page Size
+    ################################################### -->
+
+    <!-- Paper type, no headers on blank pages, no double sided printing -->
+    <xsl:param name="double.sided">0</xsl:param>
+    <xsl:param name="headers.on.blank.pages">0</xsl:param>
+    <xsl:param name="footers.on.blank.pages">0</xsl:param>
+
+<!--###################################################
+                   Fonts & Styles
+    ################################################### -->
+
+    <xsl:param name="hyphenate">false</xsl:param>
+
+    <!-- Default Font size -->
+    <xsl:param name="body.font.master">11</xsl:param>
+    <xsl:param name="body.font.small">8</xsl:param>
+
+    <!-- Line height in body text -->
+    <xsl:param name="line-height">1.4</xsl:param>
+
+    <!-- Chapter title size -->
+    <xsl:attribute-set name="chapter.titlepage.recto.style">
+        <xsl:attribute name="text-align">left</xsl:attribute>
+        <xsl:attribute name="font-weight">bold</xsl:attribute>
+        <xsl:attribute name="font-size">
+            <xsl:value-of select="$body.font.master * 1.8"/>
+            <xsl:text>pt</xsl:text>
+        </xsl:attribute>
+    </xsl:attribute-set>
+
+    <!-- Why is the font-size for chapters hardcoded in the XSL FO templates? 
+        Let's remove it, so this sucker can use our attribute-set only... -->
+    <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
+        <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                  xsl:use-attribute-sets="chapter.titlepage.recto.style">
+            <xsl:call-template name="component.title">
+                <xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/>
+            </xsl:call-template>
+        </fo:block>
+    </xsl:template>
+    
+    <!-- Sections 1, 2 and 3 titles have a small bump factor and padding -->
+    <xsl:attribute-set name="section.title.level1.properties">
+        <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
+        <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
+        <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
+        <xsl:attribute name="font-size">
+            <xsl:value-of select="$body.font.master * 1.5"/>
+            <xsl:text>pt</xsl:text>
+        </xsl:attribute>
+        <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+    </xsl:attribute-set>
+    <xsl:attribute-set name="section.title.level2.properties">
+        <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
+        <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
+        <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
+        <xsl:attribute name="font-size">
+            <xsl:value-of select="$body.font.master * 1.25"/>
+            <xsl:text>pt</xsl:text>
+        </xsl:attribute>
+        <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+    </xsl:attribute-set>
+    <xsl:attribute-set name="section.title.level3.properties">
+        <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
+        <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
+        <xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
+        <xsl:attribute name="font-size">
+            <xsl:value-of select="$body.font.master * 1.0"/>
+            <xsl:text>pt</xsl:text>
+        </xsl:attribute>
+        <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+    </xsl:attribute-set>
+    
+<!--###################################################
+                   Tables
+    ################################################### -->
+
+    <!-- Some padding inside tables -->
+    <xsl:attribute-set name="table.cell.padding">
+        <xsl:attribute name="padding-left">4pt</xsl:attribute>
+        <xsl:attribute name="padding-right">4pt</xsl:attribute>
+        <xsl:attribute name="padding-top">4pt</xsl:attribute>
+        <xsl:attribute name="padding-bottom">4pt</xsl:attribute>
+    </xsl:attribute-set>
+
+    <!-- Only hairlines as frame and cell borders in tables -->
+    <xsl:param name="table.frame.border.thickness">0.1pt</xsl:param>
+    <xsl:param name="table.cell.border.thickness">0.1pt</xsl:param>
+
+<!--###################################################
+                         Labels
+    ################################################### -->
+
+    <!-- Label Chapters and Sections (numbering) -->
+    <xsl:param name="chapter.autolabel" select="1"/>
+    <xsl:param name="section.autolabel" select="1"/>
+    <xsl:param name="section.autolabel.max.depth" select="1"/>
+
+    <xsl:param name="section.label.includes.component.label" select="1"/>
+    <xsl:param name="table.footnote.number.format" select="'1'"/>
+
+<!--###################################################
+                      Programlistings
+    ################################################### -->
+
+    <!-- Verbatim text formatting (programlistings) -->
+    <xsl:attribute-set name="monospace.verbatim.properties">
+        <xsl:attribute name="font-size">
+            <xsl:value-of select="$body.font.small * 1.0"/>
+            <xsl:text>pt</xsl:text>
+        </xsl:attribute>
+    </xsl:attribute-set>
+
+    <xsl:attribute-set name="verbatim.properties">
+        <xsl:attribute name="space-before.minimum">1em</xsl:attribute>
+        <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+        <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
+        <!-- alef: commented out because footnotes were screwed because of it -->
+        <!--<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>-->
+
+        <xsl:attribute name="border-color">#444444</xsl:attribute>
+        <xsl:attribute name="border-style">solid</xsl:attribute>
+        <xsl:attribute name="border-width">0.1pt</xsl:attribute>
+        <xsl:attribute name="padding-top">0.5em</xsl:attribute>
+        <xsl:attribute name="padding-left">0.5em</xsl:attribute>
+        <xsl:attribute name="padding-right">0.5em</xsl:attribute>
+        <xsl:attribute name="padding-bottom">0.5em</xsl:attribute>
+        <xsl:attribute name="margin-left">0.5em</xsl:attribute>
+        <xsl:attribute name="margin-right">0.5em</xsl:attribute>
+    </xsl:attribute-set>
+
+    <!-- Shade (background) programlistings -->
+    <xsl:param name="shade.verbatim">1</xsl:param>
+    <xsl:attribute-set name="shade.verbatim.style">
+        <xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
+    </xsl:attribute-set>
+
+    <xsl:attribute-set name="list.block.spacing">
+      <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
+      <xsl:attribute name="space-before.minimum">0.1em</xsl:attribute>
+      <xsl:attribute name="space-before.maximum">0.1em</xsl:attribute>
+      <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+      <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+      <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+    </xsl:attribute-set>
+
+    <xsl:attribute-set name="example.properties">
+      <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
+      <xsl:attribute name="space-before.optimum">0.5em</xsl:attribute>
+      <xsl:attribute name="space-before.maximum">0.5em</xsl:attribute>
+      <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+      <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+      <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+      <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
+    </xsl:attribute-set>
+
+<!--###################################################
+        Title information for Figures, Examples etc.
+    ################################################### -->
+
+    <xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing">
+      <xsl:attribute name="font-weight">normal</xsl:attribute>
+      <xsl:attribute name="font-style">italic</xsl:attribute>
+      <xsl:attribute name="font-size">
+        <xsl:value-of select="$body.font.master"/>
+        <xsl:text>pt</xsl:text>
+      </xsl:attribute>
+      <xsl:attribute name="hyphenate">false</xsl:attribute>
+      <xsl:attribute name="space-before.minimum">0.1em</xsl:attribute>
+      <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
+      <xsl:attribute name="space-before.maximum">0.1em</xsl:attribute>
+    </xsl:attribute-set>
+
+<!--###################################################
+                         Callouts
+    ################################################### -->
+
+    <!-- don't use images for callouts -->
+    <xsl:param name="callout.graphics">0</xsl:param>
+    <xsl:param name="callout.unicode">1</xsl:param>
+
+    <!-- Place callout marks at this column in annotated areas -->
+    <xsl:param name="callout.defaultcolumn">90</xsl:param>
+
+<!--###################################################
+                          Misc
+    ################################################### -->
+
+    <!-- Placement of titles -->
+    <xsl:param name="formal.title.placement">
+        figure after
+        example after
+        equation before
+        table before
+        procedure before
+    </xsl:param>
+
+  <!-- Format Variable Lists as Blocks (prevents horizontal overflow) -->
+  <xsl:param name="variablelist.as.blocks">1</xsl:param>
+
+  <xsl:param name="body.start.indent">0pt</xsl:param>
+
+  <!-- Remove "Chapter" from the Chapter titles... -->
+  <xsl:param name="local.l10n.xml" select="document('')"/>
+  <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+    <l:l10n language="en">
+      <l:context name="title-numbered">
+        <l:template name="chapter" text="%n.&#160;%t"/>
+        <l:template name="section" text="%n&#160;%t"/>
+      </l:context>
+      <l:context name="title">
+        <l:template name="example" text="Example&#160;%n&#160;%t"/>
+      </l:context>
+    </l:l10n>
+  </l:i18n>
+</xsl:stylesheet>
diff --git a/spring-webflow-reference/styles/pdf/titlepage.xml b/spring-webflow-reference/styles/pdf/titlepage.xml
new file mode 100644
index 00000000..7f84106a
--- /dev/null
+++ b/spring-webflow-reference/styles/pdf/titlepage.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!DOCTYPE t:templates [
+<!ENTITY hsize0 "10pt">
+<!ENTITY hsize1 "12pt">
+<!ENTITY hsize2 "14.4pt">
+<!ENTITY hsize3 "17.28pt">
+<!ENTITY hsize4 "20.736pt">
+<!ENTITY hsize5 "24.8832pt">
+<!ENTITY hsize0space "7.5pt"> <!-- 0.75 * hsize0 -->
+<!ENTITY hsize1space "9pt"> <!-- 0.75 * hsize1 -->
+<!ENTITY hsize2space "10.8pt"> <!-- 0.75 * hsize2 -->
+<!ENTITY hsize3space "12.96pt"> <!-- 0.75 * hsize3 -->
+<!ENTITY hsize4space "15.552pt"> <!-- 0.75 * hsize4 -->
+<!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 -->
+]>
+<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
+             xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
+             xmlns:fo="http://www.w3.org/1999/XSL/Format"
+             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <t:titlepage t:element="book" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
+      <title
+             t:named-template="division.title"
+             param:node="ancestor-or-self::book[1]"
+             text-align="center"
+             font-size="&hsize5;"
+             space-before="&hsize5space;"
+             font-weight="bold"
+             font-family="{$title.fontset}"/>
+      <subtitle
+                text-align="center"
+                font-size="&hsize4;"
+                space-before="&hsize4space;"
+                font-family="{$title.fontset}"/>
+
+      <corpauthor space-before="0.5em"
+                  font-size="&hsize2;"/>
+      <authorgroup space-before="0.5em"
+                   font-size="&hsize2;"/>
+      <author space-before="0.5em"
+              font-size="&hsize2;"/>
+
+    <mediaobject space-before="2em" space-after="2em"/>   
+    <copyright space-before="1.5em"/>
+    <releaseinfo space-before="5em" font-size="&hsize2;"/>
+    <legalnotice space-before="15em"/>
+    <othercredit space-before="2em"
+              font-weight="normal"
+              font-size="8"/>
+    <pubdate space-before="0.5em"/>
+    <revision space-before="0.5em"/>
+    <revhistory space-before="0.5em"/>
+    <abstract space-before="0.5em"
+              text-align="start"
+              margin-left="0.5in"
+              margin-right="0.5in"
+              font-family="{$body.fontset}"/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+</t:templates>
diff --git a/spring-webflow-samples/booking-faces/.m7project b/spring-webflow-samples/booking-faces/.m7project
deleted file mode 100644
index d7fcf628..00000000
--- a/spring-webflow-samples/booking-faces/.m7project
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-project guid="swf-sellitem-jsf_107f67bf14a_bdd5802912dd9f2" version="5">
-	<web-app guid="webapp_107f67bf14a_eee4f0d2979070f0">
-		<root-path-uri>src/webapp</root-path-uri>
-		<web-app-type>com.m7.webapp.java</web-app-type>
-	</web-app>
-	<properties>
-		<property name="validation.compile" value="true"/>
-		<property name="validation.missingFile" value="true"/>
-		<property name="validation.unresolvedVar" value="false"/>
-		<property name="validation" value="true"/>
-		<property name="taglib.downloadRemote" value="true"/>
-		<property name="validation.unresolvedType" value="false"/>
-		<property name="validation.compile.jspQuotation" value="false"/>
-	</properties>
-</web-project>
diff --git a/spring-webflow-samples/booking-faces/build.xml b/spring-webflow-samples/booking-faces/build.xml
index caa27080..48ec38a9 100755
--- a/spring-webflow-samples/booking-faces/build.xml
+++ b/spring-webflow-samples/booking-faces/build.xml
@@ -1,16 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="swf-booking-faces">
 
-<project name="swf-booking-faces" default="dist">
+	<property name="source.version" value="1.5"/>
+	<property name="ivy.cache.dir" value="${basedir}/../../ivy-cache"/>
+	<property name="integration.repo.dir" value="${basedir}/../../integration-repo"/>
+	<property file="${basedir}/../../build.properties"/>
+	<import file="${basedir}/../../spring-build/war/default.xml"/>
 
-	<property file="build.properties" />
-	<property file="project.properties" />
-	<property file="${common.build.dir}/build.properties" />
-	<property file="${common.build.dir}/project.properties" />
-	<property file="${user.home}/build.properties" />
-
-	<property name="build.web" value="true" />
-
-	<import file="${common.build.dir}/common-targets.xml" />
-
-	<import file="${common.build.dir}/tomcat-targets.xml" />
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-webflow-samples/booking-faces/hibernate.cfg.xml b/spring-webflow-samples/booking-faces/hibernate.cfg.xml
deleted file mode 100755
index 3d1b6a6d..00000000
--- a/spring-webflow-samples/booking-faces/hibernate.cfg.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-configuration PUBLIC
-		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-		"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-<hibernate-configuration>
-    <session-factory name="bookingDatabase">
-        <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
-    </session-factory>
-</hibernate-configuration>
diff --git a/spring-webflow-samples/booking-faces/ivy.xml b/spring-webflow-samples/booking-faces/ivy.xml
index ece68536..1a250ce1 100755
--- a/spring-webflow-samples/booking-faces/ivy.xml
+++ b/spring-webflow-samples/booking-faces/ivy.xml
@@ -1,44 +1,55 @@
-<ivy-module version="1.1">
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
+
+	<info organisation="org.springframework.webflow.samples" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+		<ivyauthor name="Keith Donald"/>
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}" type="war" ext="war"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+	</publications>
+
+	<dependencies>
+		<!-- global dependencies -->
+		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="compile->default"/>
+		<dependency org="org.apache.taglibs" name="standard" rev="1.1.2" conf="compile->default"/>
+		<dependency org="javax.servlet" name="jstl" rev="1.1.2" conf="compile->default"/>
+		<dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.14" conf="compile->default"/>
+		<dependency org="org.aopalliance" name="aopalliance" rev="1.0" conf="compile->default"/>
+		<dependency org="org.springframework.webflow" name="spring-faces" rev="latest.integration" conf="compile->jsf12"/>
+		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="spring-aop" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-orm" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-jdbc" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.0.m2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-tx" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="compile->default"/>
+		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="compile->default"/>
+		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga" conf="compile->default"/>
+
+		<!-- Required by "jboss archive browsing" which is used by hibernate-entity manager but not noted in their docs -->
+		<dependency org="edu.oswego.cs" name="concurrent" rev="1.3.4" conf="compile->default"/>
+		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="compile->default"/>
+		<dependency org="javax.persistence" name="persistence-api" rev="1.0.0" conf="compile->default"/>
+		<dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.9" conf="compile->default"/>
+
+		<!-- build-time only dependencies -->
+		<dependency	org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default"/>
+		<dependency	org="javax.el" name="el-api" rev="1.0" conf="provided->default"/>
+
+		<!-- test-time only dependencies -->
+		<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default"/>
+		<dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default"/>
+	</dependencies>
 
-  <info organisation="org.springframework" module="swf-booking-faces"/>
-	
-  <configurations>
-    <conf name="default" extends="global"/>
-    <conf name="global" visibility="private"/>
-    <conf name="buildtime" visibility="private"/>
-    <conf name="test" visibility="private"/>
-  </configurations>
-	
-  <dependencies defaultconf="global->default">
-  	<!-- global dependencies -->
-    <dependency org="log4j" name="log4j" rev="1.2.14"/>
-    <dependency org="taglibs" name="standard" rev="1.1.2"/>
-    <dependency org="javax.servlet" name="jstl" rev="1.1.2"/>    
-    <dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.13"/>
-	<dependency org="aopalliance" name="aopalliance" rev="1.0" />
-    <dependency org="org.springframework" name="spring-faces" rev="latest.integration" conf="global->jsf12"/>
-    <dependency org="org.springframework" name="spring-webflow" rev="latest.integration" conf="global->default"/>
-    <dependency org="org.springframework" name="spring-aop" rev="2.5.2"/>
-    <dependency org="org.springframework" name="spring-orm" rev="2.5.2"/>
-    <dependency org="org.springframework" name="spring-jdbc" rev="2.5.2"/>
-    <dependency org="org.springframework.security" name="spring-security-core" rev="2.0-M2"/>    
-    <dependency org="org.springframework" name="spring-tx" rev="2.5.2"/>
-    <dependency org="jboss" name="jboss-el" rev="1.0"/>
-	<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" />
-	<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga"/>
-	<!-- Required by "jboss archive browsing" which is used by hibernate-entity manager but not noted in their docs -->
-	<dependency org="concurrent" name="concurrent" rev="1.3.4" />	
-	<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga"/>
-	<dependency org="javax.persistence" name="persistence-api" rev="1.0b"/>	
-	<dependency org="hsqldb" name="hsqldb" rev="1.8.0.7"/>
-    
-    <!-- build-time only dependencies -->
-	<dependency	org="javax.servlet" name="servlet-api" rev="2.4" conf="buildtime->default"/>
-	<dependency	org="javax.el" name="el-api" rev="1.0" conf="buildtime->default"/>
-	
-	<!-- test-time only dependencies -->
-    <dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
-    <dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default"/>
-  </dependencies>
-  
 </ivy-module>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml
deleted file mode 100644
index e5280907..00000000
--- a/spring-webflow-samples/booking-faces/pom.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>swf-booking-faces</artifactId>
-	<packaging>war</packaging>
-	<name>Spring Web Flow Hotel Booking JSF Example</name>
-	<version>2.0-m4-SNAPSHOT</version>
-	<description>Spring Web Flow Number Guess JSF Example</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-projects</connection>
-		<developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-projects</developerConnection>
-		<tag>1.0.2</tag>
-		<url>http://svn.sourceforge.net/viewcvs.cgi/springframework/spring-projects</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<repositories>
-		<repository>
-		  <id>java.net</id>
-		  <url>http://download.java.net/maven/1</url>
-		  <layout>legacy</layout>
-		</repository>
-		<repository>
-			<id>jboss</id>
-			<url>http://repository.jboss.com/maven2</url>
-		</repository>
-		<repository>
-    		<id>spring-snapshot</id>
-		    <name>Spring Portfolio Snapshot Repository</name>
-		    <url>http://s3.amazonaws.com/maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
-	<dependencies>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.14</version>
-		</dependency>
-		<dependency>
-			<groupId>taglibs</groupId>
-			<artifactId>standard</artifactId>
-			<version>1.1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<version>1.1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.facelets</groupId>
-			<artifactId>jsf-facelets</artifactId>
-			<version>1.1.13</version>
-		</dependency>
-		<dependency>
-			<groupId>aopalliance</groupId>
-			<artifactId>aopalliance</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-faces</artifactId>
-			<version>${project.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.el</groupId>
-					<artifactId>el-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webflow</artifactId>
-			<version>${project.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.el</groupId>
-					<artifactId>el-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-binding</artifactId>
-			<version>${project.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.el</groupId>
-					<artifactId>el-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aop</artifactId>
-			<version>2.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-			<version>2.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-			<version>2.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-			<version>2.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-core</artifactId>
-			<version>2.0-M2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.seam</groupId>
-			<artifactId>jboss-el</artifactId>
-			<version>2.0.0.GA</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.el</groupId>
-					<artifactId>el-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate</artifactId>
-			<version>3.2.5.ga</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.3.1.ga</version>
-		</dependency>
-		<dependency>
-			<groupId>hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.7</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.1</version>
-				<configuration>
-					<connectors>
-						<connector
-							implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-							<port>7001</port>
-							<maxIdleTime>60000</maxIdleTime>
-						</connector>
-					</connectors>
-					<scanIntervalSeconds>10</scanIntervalSeconds>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/project.properties b/spring-webflow-samples/booking-faces/project.properties
deleted file mode 100755
index f80ab3a7..00000000
--- a/spring-webflow-samples/booking-faces/project.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# properties defined in this file are overridable by a local build.properties in this project dir
-
-# The location of the common build system
-common.build.dir=${basedir}/../../common-build
-
-javac.source=1.5
-javac.target=1.5
-
-# Do not publish built artifacts to the integration repository
-do.publish=false
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/src/etc/filter.properties b/spring-webflow-samples/booking-faces/src/etc/filter.properties
deleted file mode 100755
index c54e5880..00000000
--- a/spring-webflow-samples/booking-faces/src/etc/filter.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Header$
-
-# Contains filterable project settings.  Setting placeholders in filterable project text
-# files will be replaced with these values when the 'statics' build target is run.
-#
-# You may add static settings directly to this source file in the format:
-#    setting=value  e.g MY_SETTING=myvalue
-# This is appropriate usage if you know the setting value will never change.
-#
-# At build time this source file is copied to the ${target.dir} where additional 
-# dynamic settings may be appended using the <propertyfile> task.  Use this approach
-# when a setting value depends on the build or the local user's environment.
-#
-# An example of this approach is shown below:
-#
-# build.xml
-# <target name="build.prepare" depends="common-targets.build.prepare">
-#   <!-- Append additional local settings that are applicable to this project -->
-#  	<propertyfile file="${target.filter.file}">
-#  		 <!-- key=the name of the setting
-#             value=the property in your build.properties file that has the local setting value -->
-#  	     <entry key="MY_LOCAL_SETTING" value="${my.local.setting}" />
-#  	</propertyfile>
-# </target>
-#
-# This allows for dynamic replacement values that are sourced from local properties files to facilitate
-# local user settings.
-#
-# To refer to filterable settings within project source files like config files, JSPs, or
-# other text files use the standard ant placeholder format:
-#     @SETTING_NAME@ e.g, @MY_SETTING@ and @MY_LOCAL_SETTING@
-#
-# Your settings:
diff --git a/spring-webflow-samples/booking-faces/src/etc/test-resources/log4j.properties b/spring-webflow-samples/booking-faces/src/etc/test-resources/log4j.properties
deleted file mode 100755
index 59974077..00000000
--- a/spring-webflow-samples/booking-faces/src/etc/test-resources/log4j.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-log4j.rootCategory=WARN, stdout, logfile
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=${@PROJECT_WEBAPP_NAME@.root}/@PROJECT_WEBAPP_NAME@.log
-log4j.appender.logfile.MaxFileSize=512KB
-
-# Keep three backup files
-log4j.appender.logfile.MaxBackupIndex=3
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-
-#Pattern to output : date priority [category] - <message>line_separator
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-#Enable webflow debug logging
-log4j.category.org.springframework.webflow=DEBUG
-log4j.category.org.springframework.binding=DEBUG
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/images/bg.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/bg.gif
old mode 100755
new mode 100644
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/images/btn.bg.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/btn.bg.gif
old mode 100755
new mode 100644
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/images/input.bg.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/input.bg.gif
old mode 100755
new mode 100644
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/images/th.bg.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/th.bg.gif
old mode 100755
new mode 100644
diff --git a/spring-webflow-samples/booking-mvc/build.xml b/spring-webflow-samples/booking-mvc/build.xml
index 737ac56c..eebb93eb 100755
--- a/spring-webflow-samples/booking-mvc/build.xml
+++ b/spring-webflow-samples/booking-mvc/build.xml
@@ -1,14 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="swf-booking-mvc">
 
-<project name="swf-booking-mvc" default="dist">
+	<property name="source.version" value="1.5"/>
+	<property name="ivy.cache.dir" value="${basedir}/../../ivy-cache"/>
+	<property name="integration.repo.dir" value="${basedir}/../../integration-repo"/>
+	<property file="${basedir}/../../build.properties"/>
+	<import file="${basedir}/../../spring-build/war/default.xml"/>
 
-	<property file="build.properties" />
-	<property file="project.properties" />
-	<property file="${common.build.dir}/build.properties" />
-	<property file="${common.build.dir}/project.properties" />
-	<property file="${user.home}/build.properties" />
-	<property name="build.web" value="true" />
-	
-	<import file="${common.build.dir}/common-targets.xml" />
-	<import file="${common.build.dir}/tomcat-targets.xml" />
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-webflow-samples/booking-mvc/hibernate.cfg.xml b/spring-webflow-samples/booking-mvc/hibernate.cfg.xml
deleted file mode 100755
index 3d1b6a6d..00000000
--- a/spring-webflow-samples/booking-mvc/hibernate.cfg.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-configuration PUBLIC
-		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-		"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-<hibernate-configuration>
-    <session-factory name="bookingDatabase">
-        <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
-    </session-factory>
-</hibernate-configuration>
diff --git a/spring-webflow-samples/booking-mvc/ivy.xml b/spring-webflow-samples/booking-mvc/ivy.xml
index 7118a60f..310ab0f4 100755
--- a/spring-webflow-samples/booking-mvc/ivy.xml
+++ b/spring-webflow-samples/booking-mvc/ivy.xml
@@ -1,48 +1,58 @@
-<ivy-module version="1.1">
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
 
-  <info organisation="org.springframework" module="swf-booking-mvc"/>
-	
-  <configurations>
-    <conf name="default" extends="global"/>
-    <conf name="global" visibility="private"/>
-    <conf name="buildtime" visibility="private"/>
-    <conf name="test" visibility="private"/>
-  </configurations>
-	
-  <dependencies defaultconf="global->default">
-  	<!-- global dependencies -->
-  	<dependency org="log4j" name="log4j" rev="1.2.14"/>
-    <dependency org="taglibs" name="standard" rev="1.1.2"/>
-    <dependency org="javax.servlet" name="jstl" rev="1.1.2"/>
-    <dependency org="aopalliance" name="aopalliance" rev="1.0" />
-	<dependency org="commons-codec" name="commons-codec" rev="1.3"/>
-	<dependency org="org.apache.tiles" name="tiles-api" rev="2.0.4" />
-	<dependency org="org.apache.tiles" name="tiles-core" rev="2.0.4" />
-	<dependency org="org.apache.tiles" name="tiles-jsp" rev="2.0.4" />
-    <dependency org="org.springframework" name="spring-faces" rev="latest.integration" />
-    <dependency org="org.springframework" name="spring-webflow" rev="latest.integration" conf="global->mvc"/>
-    <dependency org="org.springframework" name="spring-aop" rev="2.5.2"/>
-    <dependency org="org.springframework" name="spring-orm" rev="2.5.2"/>
-    <dependency org="org.springframework" name="spring-jdbc" rev="2.5.2"/>
-    <dependency org="org.springframework" name="spring-tx" rev="2.5.2"/>
-    <dependency org="org.springframework.security" name="spring-security-core" rev="2.0-M2"/>
-    <dependency org="org.springframework.security" name="spring-security-taglibs" rev="2.0-M2"/> 
-    <dependency org="jboss" name="jboss-el" rev="1.0"/>
-	<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" />
-	<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga"/>
-    <!-- Required by "jboss archive browsing" which is used by hibernate-entity manager but not noted in their docs -->
-	<dependency org="concurrent" name="concurrent" rev="1.3.4" />
-	<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga"/>
-	<dependency org="javax.persistence" name="persistence-api" rev="1.0b"/>	
-	<dependency org="hsqldb" name="hsqldb" rev="1.8.0.7"/>
-    
-    <!-- build-time only dependencies -->
-	<dependency	org="javax.servlet" name="servlet-api" rev="2.4" conf="buildtime->default"/>
-	<dependency	org="javax.el" name="el-api" rev="1.0" conf="buildtime->default"/>
-		
-	<!-- test-time only dependencies -->
-    <dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
-    <dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default"/>
-  </dependencies>
-  
-</ivy-module>
\ No newline at end of file
+	<info organisation="org.springframework.webflow.samples" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+		<ivyauthor name="Keith Donald"/>
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}" type="war" ext="war"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+	</publications>
+
+	<dependencies>
+		<!-- global dependencies -->
+		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="runtime->default"/>
+		<dependency org="org.apache.taglibs" name="standard" rev="1.1.2" conf="compile->default"/>
+		<dependency org="javax.servlet" name="jstl" rev="1.1.2" conf="compile->default"/>
+		<dependency org="org.aopalliance" name="aopalliance" rev="1.0" conf="compile->default"/>
+		<dependency org="org.apache" name="commons-codec" rev="1.3" conf="compile->default"/>
+		<dependency org="org.apache.tiles" name="tiles-api" rev="2.0.5" conf="compile->default"/>
+		<dependency org="org.apache.tiles" name="tiles-core" rev="2.0.5" conf="compile->default"/>
+		<dependency org="org.apache.tiles" name="tiles-jsp" rev="2.0.5" conf="compile->default"/>
+		<dependency org="org.springframework.webflow" name="spring-faces" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="spring-aop" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-orm" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-jdbc" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-tx" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.0.m2"/>
+		<dependency org="org.springframework.security" name="spring-security-taglibs" rev="2.0.0.m2"/>
+		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="compile->default"/>
+		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="compile->default"/>
+		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga" conf="compile->default"/>
+		<!-- Required by "jboss archive browsing" which is used by hibernate-entity manager but not noted in their docs -->
+		<dependency org="edu.oswego.cs" name="concurrent" rev="1.3.4" conf="compile->default"/>
+		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="compile->default"/>
+		<dependency org="javax.persistence" name="persistence-api" rev="1.0.0" conf="compile->default"/>
+		<dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.9" conf="compile->default"/>
+
+		<!-- build-time only dependencies -->
+		<dependency	org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default"/>
+		<dependency	org="javax.el" name="el-api" rev="1.0" conf="provided->default"/>
+
+		<!-- test-time only dependencies -->
+		<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default"/>
+		<dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default"/>
+	</dependencies>
+
+</ivy-module>
diff --git a/spring-webflow-samples/booking-mvc/project.properties b/spring-webflow-samples/booking-mvc/project.properties
deleted file mode 100755
index f80ab3a7..00000000
--- a/spring-webflow-samples/booking-mvc/project.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# properties defined in this file are overridable by a local build.properties in this project dir
-
-# The location of the common build system
-common.build.dir=${basedir}/../../common-build
-
-javac.source=1.5
-javac.target=1.5
-
-# Do not publish built artifacts to the integration repository
-do.publish=false
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-mvc/src/etc/filter.properties b/spring-webflow-samples/booking-mvc/src/etc/filter.properties
deleted file mode 100755
index c54e5880..00000000
--- a/spring-webflow-samples/booking-mvc/src/etc/filter.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Header$
-
-# Contains filterable project settings.  Setting placeholders in filterable project text
-# files will be replaced with these values when the 'statics' build target is run.
-#
-# You may add static settings directly to this source file in the format:
-#    setting=value  e.g MY_SETTING=myvalue
-# This is appropriate usage if you know the setting value will never change.
-#
-# At build time this source file is copied to the ${target.dir} where additional 
-# dynamic settings may be appended using the <propertyfile> task.  Use this approach
-# when a setting value depends on the build or the local user's environment.
-#
-# An example of this approach is shown below:
-#
-# build.xml
-# <target name="build.prepare" depends="common-targets.build.prepare">
-#   <!-- Append additional local settings that are applicable to this project -->
-#  	<propertyfile file="${target.filter.file}">
-#  		 <!-- key=the name of the setting
-#             value=the property in your build.properties file that has the local setting value -->
-#  	     <entry key="MY_LOCAL_SETTING" value="${my.local.setting}" />
-#  	</propertyfile>
-# </target>
-#
-# This allows for dynamic replacement values that are sourced from local properties files to facilitate
-# local user settings.
-#
-# To refer to filterable settings within project source files like config files, JSPs, or
-# other text files use the standard ant placeholder format:
-#     @SETTING_NAME@ e.g, @MY_SETTING@ and @MY_LOCAL_SETTING@
-#
-# Your settings:
diff --git a/spring-webflow-samples/booking-mvc/src/etc/test-resources/log4j.properties b/spring-webflow-samples/booking-mvc/src/etc/test-resources/log4j.properties
deleted file mode 100755
index 59974077..00000000
--- a/spring-webflow-samples/booking-mvc/src/etc/test-resources/log4j.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-log4j.rootCategory=WARN, stdout, logfile
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=${@PROJECT_WEBAPP_NAME@.root}/@PROJECT_WEBAPP_NAME@.log
-log4j.appender.logfile.MaxFileSize=512KB
-
-# Keep three backup files
-log4j.appender.logfile.MaxBackupIndex=3
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-
-#Pattern to output : date priority [category] - <message>line_separator
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-#Enable webflow debug logging
-log4j.category.org.springframework.webflow=DEBUG
-log4j.category.org.springframework.binding=DEBUG
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/bg.gif b/spring-webflow-samples/booking-mvc/src/main/webapp/images/bg.gif
old mode 100755
new mode 100644
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/btn.bg.gif b/spring-webflow-samples/booking-mvc/src/main/webapp/images/btn.bg.gif
old mode 100755
new mode 100644
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/input.bg.gif b/spring-webflow-samples/booking-mvc/src/main/webapp/images/input.bg.gif
old mode 100755
new mode 100644
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/spring-logo.jpg b/spring-webflow-samples/booking-mvc/src/main/webapp/images/spring-logo.jpg
old mode 100755
new mode 100644
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/th.bg.gif b/spring-webflow-samples/booking-mvc/src/main/webapp/images/th.bg.gif
old mode 100755
new mode 100644
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/webflow-logo.jpg b/spring-webflow-samples/booking-mvc/src/main/webapp/images/webflow-logo.jpg
old mode 100755
new mode 100644
diff --git a/spring-webflow-samples/booking-mvc/src/test/java/log4j.properties b/spring-webflow-samples/booking-mvc/src/test/resources/log4j.properties
similarity index 100%
rename from spring-webflow-samples/booking-mvc/src/test/java/log4j.properties
rename to spring-webflow-samples/booking-mvc/src/test/resources/log4j.properties
diff --git a/spring-webflow/build.xml b/spring-webflow/build.xml
index 84cac42b..9f04f78c 100644
--- a/spring-webflow/build.xml
+++ b/spring-webflow/build.xml
@@ -1,19 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="spring-webflow">
 
-<project name="spring-webflow" default="dist">
-
-	<property file="build.properties" />
-	<property file="project.properties" />
-	<property file="${common.build.dir}/build.properties" />
-	<property file="${common.build.dir}/project.properties" />
-	<property file="${user.home}/build.properties" />
-
-	<property name="project.title" value="Spring Web Flow" />
-	<property name="project.package" value="org.springframework.webflow" />
-	<property name="project.copyright" value="Copyright &#169; 2004-2007. All Rights Reserved."/>
-
-	<import file="${common.build.dir}/common-targets.xml" />
-	<import file="${common.build.dir}/clover-targets.xml" />
-	<import file="${common.build.dir}/doc-targets.xml" />
+	<property file="${basedir}/../build.properties"/>
+	<import file="${basedir}/../build-spring-webflow/package-bundle.xml"/>
+	<import file="${basedir}/../spring-build/standard/default.xml"/>
 
 </project>
diff --git a/spring-webflow/docs/reference/images/admons/blank.png b/spring-webflow/docs/reference/images/admons/blank.png
deleted file mode 100644
index 764bf4f0..00000000
Binary files a/spring-webflow/docs/reference/images/admons/blank.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/caution.gif b/spring-webflow/docs/reference/images/admons/caution.gif
deleted file mode 100644
index d9f5e5b1..00000000
Binary files a/spring-webflow/docs/reference/images/admons/caution.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/caution.png b/spring-webflow/docs/reference/images/admons/caution.png
deleted file mode 100644
index 5b7809ca..00000000
Binary files a/spring-webflow/docs/reference/images/admons/caution.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/caution.tif b/spring-webflow/docs/reference/images/admons/caution.tif
deleted file mode 100644
index 4a282948..00000000
Binary files a/spring-webflow/docs/reference/images/admons/caution.tif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/draft.png b/spring-webflow/docs/reference/images/admons/draft.png
deleted file mode 100644
index 0084708c..00000000
Binary files a/spring-webflow/docs/reference/images/admons/draft.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/home.gif b/spring-webflow/docs/reference/images/admons/home.gif
deleted file mode 100644
index 6784f5bb..00000000
Binary files a/spring-webflow/docs/reference/images/admons/home.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/home.png b/spring-webflow/docs/reference/images/admons/home.png
deleted file mode 100644
index cbb711de..00000000
Binary files a/spring-webflow/docs/reference/images/admons/home.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/important.gif b/spring-webflow/docs/reference/images/admons/important.gif
deleted file mode 100644
index 6795d9a8..00000000
Binary files a/spring-webflow/docs/reference/images/admons/important.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/important.png b/spring-webflow/docs/reference/images/admons/important.png
deleted file mode 100644
index 12c90f60..00000000
Binary files a/spring-webflow/docs/reference/images/admons/important.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/important.tif b/spring-webflow/docs/reference/images/admons/important.tif
deleted file mode 100644
index 184de637..00000000
Binary files a/spring-webflow/docs/reference/images/admons/important.tif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/next.gif b/spring-webflow/docs/reference/images/admons/next.gif
deleted file mode 100644
index aa1516e6..00000000
Binary files a/spring-webflow/docs/reference/images/admons/next.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/next.png b/spring-webflow/docs/reference/images/admons/next.png
deleted file mode 100644
index 45835bf8..00000000
Binary files a/spring-webflow/docs/reference/images/admons/next.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/note.gif b/spring-webflow/docs/reference/images/admons/note.gif
deleted file mode 100644
index f329d359..00000000
Binary files a/spring-webflow/docs/reference/images/admons/note.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/note.png b/spring-webflow/docs/reference/images/admons/note.png
deleted file mode 100644
index d0c3c645..00000000
Binary files a/spring-webflow/docs/reference/images/admons/note.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/note.tif b/spring-webflow/docs/reference/images/admons/note.tif
deleted file mode 100644
index 08644d6b..00000000
Binary files a/spring-webflow/docs/reference/images/admons/note.tif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/prev.gif b/spring-webflow/docs/reference/images/admons/prev.gif
deleted file mode 100644
index 64ca8f3c..00000000
Binary files a/spring-webflow/docs/reference/images/admons/prev.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/prev.png b/spring-webflow/docs/reference/images/admons/prev.png
deleted file mode 100644
index cf24654f..00000000
Binary files a/spring-webflow/docs/reference/images/admons/prev.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/tip.gif b/spring-webflow/docs/reference/images/admons/tip.gif
deleted file mode 100644
index 823f2b41..00000000
Binary files a/spring-webflow/docs/reference/images/admons/tip.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/tip.png b/spring-webflow/docs/reference/images/admons/tip.png
deleted file mode 100644
index 5c4aab3b..00000000
Binary files a/spring-webflow/docs/reference/images/admons/tip.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/tip.tif b/spring-webflow/docs/reference/images/admons/tip.tif
deleted file mode 100644
index 4a3d8c75..00000000
Binary files a/spring-webflow/docs/reference/images/admons/tip.tif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/toc-blank.png b/spring-webflow/docs/reference/images/admons/toc-blank.png
deleted file mode 100644
index 6ffad17a..00000000
Binary files a/spring-webflow/docs/reference/images/admons/toc-blank.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/toc-minus.png b/spring-webflow/docs/reference/images/admons/toc-minus.png
deleted file mode 100644
index abbb020c..00000000
Binary files a/spring-webflow/docs/reference/images/admons/toc-minus.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/toc-plus.png b/spring-webflow/docs/reference/images/admons/toc-plus.png
deleted file mode 100644
index 941312ce..00000000
Binary files a/spring-webflow/docs/reference/images/admons/toc-plus.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/up.gif b/spring-webflow/docs/reference/images/admons/up.gif
deleted file mode 100644
index aabc2d01..00000000
Binary files a/spring-webflow/docs/reference/images/admons/up.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/up.png b/spring-webflow/docs/reference/images/admons/up.png
deleted file mode 100644
index 07634de2..00000000
Binary files a/spring-webflow/docs/reference/images/admons/up.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/warning.gif b/spring-webflow/docs/reference/images/admons/warning.gif
deleted file mode 100644
index 3adf1912..00000000
Binary files a/spring-webflow/docs/reference/images/admons/warning.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/warning.png b/spring-webflow/docs/reference/images/admons/warning.png
deleted file mode 100644
index 1c33db8f..00000000
Binary files a/spring-webflow/docs/reference/images/admons/warning.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/admons/warning.tif b/spring-webflow/docs/reference/images/admons/warning.tif
deleted file mode 100644
index 7b6611ec..00000000
Binary files a/spring-webflow/docs/reference/images/admons/warning.tif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/1.gif b/spring-webflow/docs/reference/images/callouts/1.gif
deleted file mode 100644
index 0d669771..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/1.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/1.png b/spring-webflow/docs/reference/images/callouts/1.png
deleted file mode 100644
index 7d473430..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/1.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/10.gif b/spring-webflow/docs/reference/images/callouts/10.gif
deleted file mode 100644
index fb50b06d..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/10.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/10.png b/spring-webflow/docs/reference/images/callouts/10.png
deleted file mode 100644
index 997bbc82..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/10.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/11.gif b/spring-webflow/docs/reference/images/callouts/11.gif
deleted file mode 100644
index 9f5dba4f..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/11.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/11.png b/spring-webflow/docs/reference/images/callouts/11.png
deleted file mode 100644
index ce47dac3..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/11.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/12.gif b/spring-webflow/docs/reference/images/callouts/12.gif
deleted file mode 100644
index a373d0b4..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/12.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/12.png b/spring-webflow/docs/reference/images/callouts/12.png
deleted file mode 100644
index 31daf4e2..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/12.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/13.gif b/spring-webflow/docs/reference/images/callouts/13.gif
deleted file mode 100644
index b00b1637..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/13.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/13.png b/spring-webflow/docs/reference/images/callouts/13.png
deleted file mode 100644
index 14021a89..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/13.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/14.gif b/spring-webflow/docs/reference/images/callouts/14.gif
deleted file mode 100644
index 6d6642ee..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/14.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/14.png b/spring-webflow/docs/reference/images/callouts/14.png
deleted file mode 100644
index 64014b75..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/14.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/15.gif b/spring-webflow/docs/reference/images/callouts/15.gif
deleted file mode 100644
index cdd7072d..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/15.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/15.png b/spring-webflow/docs/reference/images/callouts/15.png
deleted file mode 100644
index 0d65765f..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/15.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/2.gif b/spring-webflow/docs/reference/images/callouts/2.gif
deleted file mode 100644
index 100ff79f..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/2.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/2.png b/spring-webflow/docs/reference/images/callouts/2.png
deleted file mode 100644
index 5d09341b..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/2.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/3.gif b/spring-webflow/docs/reference/images/callouts/3.gif
deleted file mode 100644
index 5008ca7d..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/3.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/3.png b/spring-webflow/docs/reference/images/callouts/3.png
deleted file mode 100644
index ef7b7004..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/3.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/4.gif b/spring-webflow/docs/reference/images/callouts/4.gif
deleted file mode 100644
index 0e5617d2..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/4.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/4.png b/spring-webflow/docs/reference/images/callouts/4.png
deleted file mode 100644
index adb8364e..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/4.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/5.gif b/spring-webflow/docs/reference/images/callouts/5.gif
deleted file mode 100644
index 9bc75ada..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/5.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/5.png b/spring-webflow/docs/reference/images/callouts/5.png
deleted file mode 100644
index 4d7eb460..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/5.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/6.gif b/spring-webflow/docs/reference/images/callouts/6.gif
deleted file mode 100644
index d3964070..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/6.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/6.png b/spring-webflow/docs/reference/images/callouts/6.png
deleted file mode 100644
index 0ba694af..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/6.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/7.gif b/spring-webflow/docs/reference/images/callouts/7.gif
deleted file mode 100644
index c90b2f3d..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/7.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/7.png b/spring-webflow/docs/reference/images/callouts/7.png
deleted file mode 100644
index 472e96f8..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/7.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/8.gif b/spring-webflow/docs/reference/images/callouts/8.gif
deleted file mode 100644
index 6fe3287d..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/8.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/8.png b/spring-webflow/docs/reference/images/callouts/8.png
deleted file mode 100644
index 5e60973c..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/8.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/9.gif b/spring-webflow/docs/reference/images/callouts/9.gif
deleted file mode 100644
index bc5c8125..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/9.gif and /dev/null differ
diff --git a/spring-webflow/docs/reference/images/callouts/9.png b/spring-webflow/docs/reference/images/callouts/9.png
deleted file mode 100644
index a0676d26..00000000
Binary files a/spring-webflow/docs/reference/images/callouts/9.png and /dev/null differ
diff --git a/spring-webflow/docs/reference/readme.txt b/spring-webflow/docs/reference/readme.txt
deleted file mode 100644
index f24f3b43..00000000
--- a/spring-webflow/docs/reference/readme.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-This project uses the 'DocBook XSL distribution' for HTML and PDF
-generation of project reference documentation.
-
-This project's build.xml file contains targets to generate the
-project reference documentation.
-
-To generate project documentation, execute one of the following
-build targets:
-
-* doc-all        - generate documentation in all formats
-* doc-pdf        - generate the PDF documentation
-* doc-html       - generate the HTML documentation
-* doc-htmlsingle - generate single page HTML documentation
-* doc-clean      - clean any output directories for docs
-
-For generation to complete successfully, you must have first extracted
-the .jar libraries contained in this archive:
-    - http://static.springframework.org/spring/files/docbook-reference-libs.zip
-... to ${basedir}/docs/reference.  If you have not yet done so, download this file
-and unzip the contents of the archive into ${basedir}/docs/reference.
\ No newline at end of file
diff --git a/spring-webflow/docs/reference/styles/fopdf.xsl b/spring-webflow/docs/reference/styles/fopdf.xsl
deleted file mode 100644
index d7eca1ad..00000000
--- a/spring-webflow/docs/reference/styles/fopdf.xsl
+++ /dev/null
@@ -1,475 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- 
-
-    This is the XSL FO (PDF) stylesheet for the Spring reference
-    documentation.
-    
-    Thanks are due to Christian Bauer of the Hibernate project
-    team for writing the original stylesheet upon which this one
-    is based.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY db_xsl_path        "../lib/docbook-xsl/">
-    <!ENTITY admon_gfx_path     "../images/admons/">
-    <!ENTITY copyright "&#xA9;">
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0"
-                xmlns="http://www.w3.org/TR/xhtml1/transitional"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                exclude-result-prefixes="#default">
-                
-<xsl:import href="&db_xsl_path;/fo/docbook.xsl"/>
-
-<!--###################################################
-                   Custom Title Page
-    ################################################### --> 
-    
-    <xsl:template name="book.titlepage.recto">
-        <fo:block>
-            <fo:table table-layout="fixed" width="175mm">
-                <fo:table-column column-width="175mm"/>
-                <fo:table-body>
-                    <fo:table-row>
-                        <fo:table-cell text-align="center">
-                            <fo:block>
-                                <fo:external-graphic src="file:images/logo.jpg"/>
-                            </fo:block>
-                            <fo:block font-family="Helvetica" font-size="22pt" padding-before="10mm">
-                                <xsl:value-of select="bookinfo/subtitle"/> 
-                            </fo:block>
-                            <fo:block font-family="Helvetica" font-size="12pt" padding="10mm">
-                                <xsl:value-of select="bookinfo/releaseinfo"/>  
-                            </fo:block>
-                        </fo:table-cell>
-                    </fo:table-row>
-                    <fo:table-row>
-                        <fo:table-cell text-align="center">
-                            <fo:block font-family="Helvetica" font-size="14pt" padding="10mm">
-                                <xsl:value-of select="bookinfo/pubdate"/> 
-                            </fo:block>
-                        </fo:table-cell>
-                    </fo:table-row>
-                    <fo:table-row>
-                        <fo:table-cell text-align="center">
-                            <fo:block font-family="Helvetica" font-size="12pt" padding="10mm">
-                                <xsl:text>Copyright &copyright; 2004-2007 </xsl:text>
-                                <xsl:for-each select="bookinfo/authorgroup/author">
-                                    <xsl:if test="position() > 1">
-                                        <xsl:text>, </xsl:text>
-                                    </xsl:if>
-                                    <xsl:value-of select="firstname"/>
-                                    <xsl:text> </xsl:text>
-                                    <xsl:value-of select="surname"/>
-                                </xsl:for-each>
-                            </fo:block>
-                            <fo:block font-family="Helvetica" font-size="10pt" padding="1mm">
-                                <xsl:value-of select="bookinfo/legalnotice"/>  
-                            </fo:block>
-                        </fo:table-cell>
-                    </fo:table-row>
-                </fo:table-body>
-            </fo:table>
-        </fo:block>
-    </xsl:template>
-
-    <!-- Prevent blank pages in output -->    
-    <xsl:template name="book.titlepage.before.verso">
-    </xsl:template>
-    <xsl:template name="book.titlepage.verso">
-    </xsl:template>
-    <xsl:template name="book.titlepage.separator">
-    </xsl:template>
-        
-<!--###################################################
-                      Header
-    ################################################### -->  
-
-    <!-- More space in the center header for long text -->
-    <xsl:attribute-set name="header.content.properties">
-        <xsl:attribute name="font-family">
-            <xsl:value-of select="$body.font.family"/>
-        </xsl:attribute>
-        <xsl:attribute name="margin-left">-5em</xsl:attribute>
-        <xsl:attribute name="margin-right">-5em</xsl:attribute>
-    </xsl:attribute-set>
-
-<!--###################################################
-                      Custom Footer
-    ################################################### -->     
-	<xsl:template name="footer.content">
-		<xsl:param name="pageclass" select="''" />
-		<xsl:param name="sequence" select="''" />
-		<xsl:param name="position" select="''" />
-		<xsl:param name="gentext-key" select="''" />
-		<xsl:variable name="Version">
-			<xsl:if test="//releaseinfo">
-				<xsl:text>Spring Web Flow </xsl:text><xsl:value-of select="//releaseinfo" /><xsl:text></xsl:text>
-			</xsl:if>
-		</xsl:variable>
-		<xsl:choose>
-			<xsl:when test="$sequence='blank'">
-				<xsl:if test="$position = 'center'">
-					<xsl:value-of select="$Version" />
-				</xsl:if>
-			</xsl:when>
-			<!-- for double sided printing, print page numbers on alternating sides (of the page) -->
-			<xsl:when test="$double.sided != 0">
-				<xsl:choose>
-					<xsl:when test="$sequence = 'even' and $position='left'">
-						<fo:page-number />
-					</xsl:when>
-					<xsl:when test="$sequence = 'odd' and $position='right'">
-						<fo:page-number />
-					</xsl:when>
-					<xsl:when test="$position='center'">
-						<xsl:value-of select="$Version" />
-					</xsl:when>
-				</xsl:choose>
-			</xsl:when>
-			<!-- for single sided printing, print all page numbers on the right (of the page) -->
-			<xsl:when test="$double.sided = 0">
-				<xsl:choose>
-					<xsl:when test="$position='center'">
-						<xsl:value-of select="$Version" />
-					</xsl:when>
-					<xsl:when test="$position='right'">
-						<fo:page-number />
-					</xsl:when>
-				</xsl:choose>
-			</xsl:when>
-		</xsl:choose>
-	</xsl:template>   
-    
-<!--###################################################
-                   Custom Toc Line
-    ################################################### -->
-    
-    <!-- The default DocBook XSL TOC printing is seriously broken... -->
-    <xsl:template name="toc.line">
-        <xsl:variable name="id">
-            <xsl:call-template name="object.id"/>
-        </xsl:variable>
-
-        <xsl:variable name="label">
-            <xsl:apply-templates select="." mode="label.markup"/>
-        </xsl:variable>
-
-        <!-- justify-end removed from block attributes (space problem in title.markup) -->
-        <fo:block  end-indent="{$toc.indent.width}pt"
-                   last-line-end-indent="-{$toc.indent.width}pt"
-                   white-space-treatment="preserve"
-                   text-align="left"
-                   white-space-collapse="false">
-            <fo:inline keep-with-next.within-line="always">
-                <!-- print Chapters in bold style -->
-                <xsl:choose>
-                    <xsl:when test="local-name(.) = 'chapter'">
-                        <xsl:attribute name="font-weight">bold</xsl:attribute>
-                    </xsl:when>
-                </xsl:choose>        
-                <fo:basic-link internal-destination="{$id}">
-                    <xsl:if test="$label != ''">
-                        <xsl:copy-of select="$label"/>
-                        <fo:inline white-space-treatment="preserve"
-                                    white-space-collapse="false">
-                            <xsl:value-of select="$autotoc.label.separator"/>
-                        </fo:inline>
-                    </xsl:if>
-                    <xsl:apply-templates select="." mode="title.markup"/>
-                </fo:basic-link>
-            </fo:inline>
-            <fo:inline keep-together.within-line="always">
-            <xsl:text> </xsl:text>
-            <fo:leader leader-pattern="dots"
-                        leader-pattern-width="3pt"
-                        leader-alignment="reference-area"
-                        keep-with-next.within-line="always"/>
-            <xsl:text> </xsl:text>
-            <fo:basic-link internal-destination="{$id}">
-                <fo:page-number-citation ref-id="{$id}"/>
-            </fo:basic-link>
-            </fo:inline>
-        </fo:block>
-    </xsl:template>
-    
-<!--###################################################
-                      Extensions
-    ################################################### -->  
-
-    <!-- These extensions are required for table printing and other stuff -->
-    <xsl:param name="use.extensions">1</xsl:param>
-    <xsl:param name="tablecolumns.extension">0</xsl:param>
-    <xsl:param name="callout.extensions">1</xsl:param>
-    <!-- FOP provide only PDF Bookmarks at the moment -->
-    <xsl:param name="fop.extensions">1</xsl:param>
-
-<!--###################################################
-                      Table Of Contents
-    ################################################### -->   
-
-    <!-- Generate the TOCs for named components only -->
-    <xsl:param name="generate.toc">
-        book   toc
-    </xsl:param>
-    
-    <!-- Show only Sections up to level 3 in the TOCs -->
-    <xsl:param name="toc.section.depth">2</xsl:param>
-    
-    <!-- Dot and Whitespace as separator in TOC between Label and Title-->
-    <xsl:param name="autotoc.label.separator" select="'.  '"/>
-
-        
-<!--###################################################
-                   Paper & Page Size
-    ################################################### -->  
-    
-    <!-- Paper type, no headers on blank pages, no double sided printing -->
-    <xsl:param name="paper.type" select="'A4'"/>
-    <xsl:param name="double.sided">0</xsl:param>
-    <xsl:param name="headers.on.blank.pages">0</xsl:param>
-    <xsl:param name="footers.on.blank.pages">0</xsl:param>
-
-    <!-- Space between paper border and content (chaotic stuff, don't touch) -->
-    <xsl:param name="page.margin.top">5mm</xsl:param>
-    <xsl:param name="region.before.extent">10mm</xsl:param>
-    <xsl:param name="body.margin.top">10mm</xsl:param>
-    
-    <xsl:param name="body.margin.bottom">15mm</xsl:param>
-    <xsl:param name="region.after.extent">10mm</xsl:param>
-    <xsl:param name="page.margin.bottom">0mm</xsl:param>
-    
-    <xsl:param name="page.margin.outer">18mm</xsl:param>
-    <xsl:param name="page.margin.inner">18mm</xsl:param>
-
-    <!-- No intendation of Titles -->
-    <xsl:param name="title.margin.left">0pc</xsl:param>
-
-<!--###################################################
-                   Fonts & Styles
-    ################################################### -->      
-
-    <!-- Left aligned text and no hyphenation -->
-    <xsl:param name="alignment">justify</xsl:param>
-    <xsl:param name="hyphenate">false</xsl:param>
-
-    <!-- Default Font size -->
-    <xsl:param name="body.font.master">11</xsl:param>
-    <xsl:param name="body.font.small">8</xsl:param>
-
-    <!-- Line height in body text -->
-    <xsl:param name="line-height">1.4</xsl:param>
-
-    <!-- Monospaced fonts are smaller than regular text -->
-    <xsl:attribute-set name="monospace.properties">
-        <xsl:attribute name="font-family">
-            <xsl:value-of select="$monospace.font.family"/>
-        </xsl:attribute>
-        <xsl:attribute name="font-size">0.8em</xsl:attribute>
-    </xsl:attribute-set>
-    
-<!--###################################################
-                   Tables
-    ################################################### -->
-
-    <!-- The table width should be adapted to the paper size -->
-    <xsl:param name="default.table.width">17.4cm</xsl:param>
-
-    <!-- Some padding inside tables -->    
-    <xsl:attribute-set name="table.cell.padding">
-        <xsl:attribute name="padding-left">4pt</xsl:attribute>
-        <xsl:attribute name="padding-right">4pt</xsl:attribute>
-        <xsl:attribute name="padding-top">4pt</xsl:attribute>
-        <xsl:attribute name="padding-bottom">4pt</xsl:attribute>
-    </xsl:attribute-set>
-    
-    <!-- Only hairlines as frame and cell borders in tables -->
-    <xsl:param name="table.frame.border.thickness">0.1pt</xsl:param>
-    <xsl:param name="table.cell.border.thickness">0.1pt</xsl:param>
-        
-<!--###################################################
-                         Labels
-    ################################################### -->   
-
-    <!-- Label Chapters and Sections (numbering) -->
-    <xsl:param name="chapter.autolabel">1</xsl:param>
-    <xsl:param name="section.autolabel" select="1"/>
-    <xsl:param name="section.label.includes.component.label" select="1"/>
-
-<!--###################################################
-                         Titles
-    ################################################### -->   
-    
-    <!-- Chapter title size -->
-    <xsl:attribute-set name="chapter.titlepage.recto.style">
-        <xsl:attribute name="text-align">left</xsl:attribute>
-        <xsl:attribute name="font-weight">bold</xsl:attribute>
-        <xsl:attribute name="font-size">
-            <xsl:value-of select="$body.font.master * 1.8"/>
-            <xsl:text>pt</xsl:text>
-        </xsl:attribute>        
-    </xsl:attribute-set>
-
-    <!-- Why is the font-size for chapters hardcoded in the XSL FO templates? 
-        Let's remove it, so this sucker can use our attribute-set only... -->
-    <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
-        <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                  xsl:use-attribute-sets="chapter.titlepage.recto.style">
-            <xsl:call-template name="component.title">
-                <xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/>
-            </xsl:call-template>
-            </fo:block>
-    </xsl:template>
-    
-    <!-- Sections 1, 2 and 3 titles have a small bump factor and padding -->    
-    <xsl:attribute-set name="section.title.level1.properties">
-        <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
-        <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-        <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-        <xsl:attribute name="font-size">
-            <xsl:value-of select="$body.font.master * 1.5"/>
-            <xsl:text>pt</xsl:text>
-        </xsl:attribute>
-        <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-        <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-        <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-    </xsl:attribute-set>
-    <xsl:attribute-set name="section.title.level2.properties">
-        <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-        <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
-        <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
-        <xsl:attribute name="font-size">
-            <xsl:value-of select="$body.font.master * 1.25"/>
-            <xsl:text>pt</xsl:text>
-        </xsl:attribute>
-        <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-        <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-        <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-    </xsl:attribute-set>
-    <xsl:attribute-set name="section.title.level3.properties">
-        <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
-        <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-        <xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
-        <xsl:attribute name="font-size">
-            <xsl:value-of select="$body.font.master * 1.0"/>
-            <xsl:text>pt</xsl:text>
-        </xsl:attribute>
-        <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-        <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-        <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-    </xsl:attribute-set>
-
-    <!-- Titles of formal objects (tables, examples, ...) -->
-    <xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing">
-        <xsl:attribute name="font-weight">bold</xsl:attribute>
-        <xsl:attribute name="font-size">
-            <xsl:value-of select="$body.font.master"/>
-            <xsl:text>pt</xsl:text>
-        </xsl:attribute>
-        <xsl:attribute name="hyphenate">false</xsl:attribute>
-        <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-        <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
-        <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
-    </xsl:attribute-set>    
-
-<!--###################################################
-                      Programlistings
-    ################################################### -->  
-    
-    <!-- Verbatim text formatting (programlistings) -->
-    <xsl:attribute-set name="monospace.verbatim.properties">
-        <xsl:attribute name="font-size">
-            <xsl:value-of select="$body.font.small * 1.0"/>
-            <xsl:text>pt</xsl:text>
-        </xsl:attribute>
-    </xsl:attribute-set>
-    
-    <xsl:attribute-set name="verbatim.properties">
-        <xsl:attribute name="space-before.minimum">1em</xsl:attribute>
-        <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-        <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
-        <xsl:attribute name="border-color">#444444</xsl:attribute>
-        <xsl:attribute name="border-style">solid</xsl:attribute>
-        <xsl:attribute name="border-width">0.1pt</xsl:attribute>      
-        <xsl:attribute name="padding-top">0.5em</xsl:attribute>      
-        <xsl:attribute name="padding-left">0.5em</xsl:attribute>      
-        <xsl:attribute name="padding-right">0.5em</xsl:attribute>      
-        <xsl:attribute name="padding-bottom">0.5em</xsl:attribute>      
-        <xsl:attribute name="margin-left">0.5em</xsl:attribute>      
-        <xsl:attribute name="margin-right">0.5em</xsl:attribute>      
-    </xsl:attribute-set>    
-
-    <!-- Shade (background) programlistings -->    
-    <xsl:param name="shade.verbatim">1</xsl:param>
-    <xsl:attribute-set name="shade.verbatim.style">
-        <xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
-    </xsl:attribute-set>
-                    
-<!--###################################################
-                         Callouts
-    ################################################### -->   
-
-    <!-- Use images for callouts instead of (1) (2) (3) -->
-    <xsl:param name="callout.graphics">0</xsl:param>
-    <xsl:param name="callout.unicode">1</xsl:param>
-    
-    <!-- Place callout marks at this column in annotated areas -->
-    <xsl:param name="callout.defaultcolumn">90</xsl:param>
-
-<!--###################################################
-                       Admonitions
-    ################################################### -->   
-
-    <!-- Use nice graphics for admonitions -->
-    <xsl:param name="admon.graphics">'1'</xsl:param>
-    <xsl:param name="admon.graphics.path">&admon_gfx_path;</xsl:param>
-
-<!--###################################################
-                          Misc
-    ################################################### -->   
-
-    <!-- Placement of titles -->
-    <xsl:param name="formal.title.placement">
-        figure after
-        example before
-        equation before
-        table before
-        procedure before
-    </xsl:param>
-    
-    <!-- Format Variable Lists as Blocks (prevents horizontal overflow) -->
-    <xsl:param name="variablelist.as.blocks">1</xsl:param>
-
-    <!-- The horrible list spacing problems -->
-    <xsl:attribute-set name="list.block.spacing">
-        <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
-        <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-        <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-        <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-        <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-        <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-    </xsl:attribute-set>
-    
-<!--###################################################
-              colored and hyphenated links 
-    ################################################### --> 
-	<xsl:template match="ulink"> 
-	<fo:basic-link external-destination="{@url}" 
-			xsl:use-attribute-sets="xref.properties" 
-			text-decoration="underline" 
-			color="blue"> 
-			<xsl:choose> 
-			<xsl:when test="count(child::node())=0"> 
-			<xsl:value-of select="@url"/> 
-			</xsl:when> 
-			<xsl:otherwise> 
-			<xsl:apply-templates/> 
-			</xsl:otherwise> 
-			</xsl:choose> 
-			</fo:basic-link> 
-	</xsl:template> 
-    
-</xsl:stylesheet>
diff --git a/spring-webflow/docs/reference/styles/html.css b/spring-webflow/docs/reference/styles/html.css
deleted file mode 100644
index 54e123b1..00000000
--- a/spring-webflow/docs/reference/styles/html.css
+++ /dev/null
@@ -1,277 +0,0 @@
-body {
-   text-align: justify;
-   margin-right: 2em;
-   margin-left: 2em;
-}
-
-a,
-a[accesskey^="h"],
-a[accesskey^="n"],
-a[accesskey^="u"],
-a[accesskey^="p"] {
-    font-family: Verdana, Arial, helvetica, sans-serif;
-    font-size: 12px;
-	color: #003399;
-}
-
-a:active {
-    color: #003399;
-}
-
-a:visited {
-    color: #888888;
-}
-
-p {
-	font-family: Verdana, Arial;
-}
-
-dt {
-	font-family: Verdana, Arial;
-	font-size: 12px;
-}
-
-p, dl, dt, dd, blockquote {
-    color: #000000;
-    margin-bottom: 3px;
-    margin-top: 3px;
-    padding-top: 0px;
-}
-
-ol, ul, p {
-    margin-top: 6px;
-    margin-bottom: 6px;
-}
-
-p, blockquote {
-    font-size: 90%;
-}
-
-p.releaseinfo {
-    font-size: 100%;
-    font-weight: bold;
-    font-family: Verdana, Arial, helvetica, sans-serif;
-    padding-top: 10px;
-}
-
-p.pubdate {
-    font-size: 120%;
-    font-weight: bold; 
-    font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-td {
-    font-size: 80%;
-}
-
-td, th, span {
-    color: #000000;
-}
-
-td[width^="40%"] {
-    font-family: Verdana, Arial, helvetica, sans-serif;
-    font-size: 12px;
-	color: #003399;
-}
-
-table[summary^="Navigation header"] tbody tr th[colspan^="3"] {
-    font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-blockquote {
-    margin-right: 0px;
-}
-
-h1, h2, h3, h4, h6, H6    {
-    color: #000000;
-    font-weight: 500;
-    margin-top: 0px;
-    padding-top: 14px;
-    font-family: Verdana, Arial, helvetica, sans-serif;
-    margin-bottom: 0px;
-}
-
-h2.title {
-    font-weight: 800;
-    margin-bottom: 8px;
-}
-
-h2.subtitle {
-    font-weight: 800;
-    margin-bottom: 20px;
-}
-
-.firstname, .surname {
-	font-size: 12px;
-    font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-    border: 1px black;
-    empty-cells: hide;
-    margin: 10px 0px 30px 50px;
-    width: 90%;
-}
-
-div.table {
-	margin: 30px 0px 30px 0px;
-	border: 1px dashed gray;
-	padding: 10px;
-}
-
-div.table > p.title {
-	padding-left: 10px;
-}
-
-table[summary^="Navigation footer"] {
-    border-collapse: collapse;
-    border-spacing: 0;
-    border: 1px black;
-    empty-cells: hide;    
-    margin: 0px;
-    width: 100%;
-}
-
-table[summary^="Note"], table[summary^="Warning"], table[summary^="Tip"] {
-    border-collapse: collapse;
-    border-spacing: 0;
-    border: 1px black;
-    empty-cells: hide;    
-    margin: 10px 0px 10px -20px;
-    width: 100%;
-}
-
-td {
-    padding: 4pt;
-    font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-div.warning TD {
-	text-align: justify;
-}
-
-h1 { 
-    font-size: 150%; 
-}
-
-h2 { 
-    font-size: 110%; 
-}
-
-h3 {
-    font-size: 100%; font-weight: bold; 
-}
-
-h4 { 
-    font-size: 90%; font-weight: bold;
-}
-
-h5 {
-    font-size: 90%; font-style: italic; 
-}
-
-h6 { 
-    font-size: 100%; font-style: italic; 
-}
-
-tt {
-    font-size: 110%;
-    font-family: "Courier New", Courier, monospace;
-    color: #000000;
-}
-
-.navheader, .navfooter {
-	border: none;
-}
-
-div.navfooter table {
-	border: dashed gray;
-	border-width: 1px 1px 1px 1px;
-	background-color: #cde48d;
-}
-
-pre {
-    font-size: 110%;
-    padding: 5px;
-    border-style: solid;
-    border-width: 1px;
-    border-color: #CCCCCC;
-    background-color: #F4F4F4;
-}
-
-ul, ol, li {
-    list-style: disc;
-}
-
-hr {
-    width: 100%;
-    height: 1px;
-    background-color: #CCCCCC;
-    border-width: 0px;
-    padding: 0px;
-}
-
-.variablelist { 
-    padding-top: 10px; 
-    padding-bottom: 10px; 
-    margin: 0;
-}
-
-.term { 
-    font-weight:bold;
-}
-
-.mediaobject {
-    padding-top: 30px; 
-    padding-bottom: 30px; 
-}
-
-.legalnotice {
-    font-family: Verdana, Arial, helvetica, sans-serif;
-    font-size: 12px;
-    font-style: italic;
-}
-
-.sidebar {
-    float: right;
-    margin: 10px 0px 10px 30px;
-    padding: 10px 20px 20px 20px;
-    width: 33%;
-    border: 1px solid black;
-    background-color: #F4F4F4;
-    font-size: 14px;
-}
-
-.property {
-	font-family: "Courier New", Courier, monospace;
-}
-
-a code {
-	font-family: Verdana, Arial;
-	font-size: 12px;
-}
-
-td code {
-    font-size: 110%;
-}
-
-div.note * td,
-div.tip * td,
-div.warning * td {
-	text-align: justify;
-	font-size: 100%;
-}
-
-.programlisting .interfacename,
-.programlisting .literal,
-.programlisting .classname {
-    font-size: 95%;
-}
-
-/* everything in a <lineannotation/> is displayed in a nice green, comment-like color */
-.programlisting * .lineannotation,
-.programlisting * .lineannotation * {
-	color: green;
-}
diff --git a/spring-webflow/docs/reference/styles/html.xsl b/spring-webflow/docs/reference/styles/html.xsl
deleted file mode 100644
index dd2ca2c1..00000000
--- a/spring-webflow/docs/reference/styles/html.xsl
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-    This is the XSL HTML configuration file for the Spring
-    Reference Documentation.
--->
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY db_xsl_path        "../lib/docbook-xsl/">
-    <!ENTITY callout_gfx_path   "../images/callouts/">
-    <!ENTITY admon_gfx_path     "../images/admons/">
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0"
-                xmlns="http://www.w3.org/TR/xhtml1/transitional"
-                exclude-result-prefixes="#default">
-                
-<xsl:import href="&db_xsl_path;/html/onechunk.xsl"/>
-
-<!--###################################################
-                     HTML Settings
-    ################################################### -->   
-
-    <xsl:param name="html.stylesheet">styles/html.css</xsl:param>
-
-    <!-- These extensions are required for table printing and other stuff -->
-    <xsl:param name="use.extensions">1</xsl:param>
-    <xsl:param name="tablecolumns.extension">0</xsl:param>
-    <xsl:param name="callout.extensions">1</xsl:param>
-    <xsl:param name="graphicsize.extension">0</xsl:param>
-
-<!--###################################################
-                      Table Of Contents
-    ################################################### -->   
-
-    <!-- Generate the TOCs for named components only -->
-    <xsl:param name="generate.toc">
-        book   toc
-    </xsl:param>
-    
-    <!-- Show only Sections up to level 3 in the TOCs -->
-    <xsl:param name="toc.section.depth">3</xsl:param>
-    
-<!--###################################################
-                         Labels
-    ################################################### -->   
-
-    <!-- Label Chapters and Sections (numbering) -->
-    <xsl:param name="chapter.autolabel">1</xsl:param>
-    <xsl:param name="section.autolabel" select="1"/>
-    <xsl:param name="section.label.includes.component.label" select="1"/>
-        
-<!--###################################################
-                         Callouts
-    ################################################### -->   
-
-    <!-- Use images for callouts instead of (1) (2) (3) -->
-    <xsl:param name="callout.graphics">1</xsl:param>
-    <xsl:param name="callout.graphics.path">&callout_gfx_path;</xsl:param>
-    
-    <!-- Place callout marks at this column in annotated areas -->
-    <xsl:param name="callout.defaultcolumn">90</xsl:param>
-
-<!--###################################################
-                       Admonitions
-    ################################################### -->   
-
-    <!-- Use nice graphics for admonitions -->
-    <xsl:param name="admon.graphics">'1'</xsl:param>
-    <xsl:param name="admon.graphics.path">&admon_gfx_path;</xsl:param>
-
-	<!--###################################################
-                          Misc
-    ################################################### -->
-	<!-- Placement of titles -->
-	<xsl:param name="formal.title.placement">
-        figure after
-        example before
-        equation before
-        table before
-        procedure before
-    </xsl:param>
-	<xsl:template match="author" mode="titlepage.mode">
-		<xsl:if test="name(preceding-sibling::*[1]) = 'author'">
-			<xsl:text>, </xsl:text>
-		</xsl:if>
-		<span class="{name(.)}">
-			<xsl:call-template name="person.name" />
-			<xsl:apply-templates mode="titlepage.mode" select="./contrib" />
-			<xsl:apply-templates mode="titlepage.mode" select="./affiliation" />
-		</span>
-	</xsl:template>
-	<xsl:template match="authorgroup" mode="titlepage.mode">
-		<div class="{name(.)}">
-			<h2>Authors</h2>
-			<p/>
-			<xsl:apply-templates mode="titlepage.mode" />
-		</div>
-	</xsl:template>
-
-    <!--###################################################
-                     Headers and Footers
-    ################################################### -->
-    <!-- let's have a Spring banner across the top of each page -->
-    <xsl:template name="user.header.navigation">
-        <div style="background-color:white;border:none;height:73px;border:1px solid black;">
-            <a style="border:none;" href="http://www.springframework.org/" title="The Spring Framework">
-                <img style="border:none;" src="images/xdev-spring_logo.jpg" />
-            </a>
-        </div>
-    </xsl:template>
-    <!-- no other header navigation (prev, next, etc.) -->
-    <xsl:template name="header.navigation" />
-    <!-- no other footer navigation (prev, next, etc.) -->
-    <xsl:template name="footer.navigation"/>
-  
-</xsl:stylesheet>
diff --git a/spring-webflow/docs/reference/styles/html_chunk.xsl b/spring-webflow/docs/reference/styles/html_chunk.xsl
deleted file mode 100644
index ab302b50..00000000
--- a/spring-webflow/docs/reference/styles/html_chunk.xsl
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" ?>
-<!-- 
-    This is the XSL HTML configuration file for the Spring Reference Documentation.
--->
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY db_xsl_path        "../lib/docbook-xsl/">
-    <!ENTITY callout_gfx_path   "../images/callouts/">
-    <!ENTITY admon_gfx_path     "../images/admons/">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns="http://www.w3.org/TR/xhtml1/transitional"
-    exclude-result-prefixes="#default">
-    <xsl:import href="&db_xsl_path;/html/chunk.xsl" />
-    <!--###################################################
-                     HTML Settings
-    ################################################### -->
-    <xsl:param name="chunk.section.depth">'5'</xsl:param>
-    <xsl:param name="use.id.as.filename">'1'</xsl:param>
-    <xsl:param name="html.stylesheet">styles/html.css</xsl:param>
-    <!-- These extensions are required for table printing and other stuff -->
-    <xsl:param name="use.extensions">1</xsl:param>
-    <xsl:param name="tablecolumns.extension">0</xsl:param>
-    <xsl:param name="callout.extensions">1</xsl:param>
-    <xsl:param name="graphicsize.extension">0</xsl:param>
-    <!--###################################################
-                      Table Of Contents
-    ################################################### -->
-    <!-- Generate the TOCs for named components only -->
-    <xsl:param name="generate.toc">
-        book   toc
-    </xsl:param>
-    <!-- Show only Sections up to level 3 in the TOCs -->
-    <xsl:param name="toc.section.depth">3</xsl:param>
-    <!--###################################################
-                         Labels
-    ################################################### -->
-    <!-- Label Chapters and Sections (numbering) -->
-    <xsl:param name="chapter.autolabel">1</xsl:param>
-    <xsl:param name="section.autolabel" select="1" />
-    <xsl:param name="section.label.includes.component.label" select="1" />
-    <!--###################################################
-                         Callouts
-    ################################################### -->
-    <!-- Use images for callouts instead of (1) (2) (3) -->
-    <xsl:param name="callout.graphics">1</xsl:param>
-    <xsl:param name="callout.graphics.path">&callout_gfx_path;</xsl:param>
-    <!-- Place callout marks at this column in annotated areas -->
-    <xsl:param name="callout.defaultcolumn">90</xsl:param>
-    <!--###################################################
-                       Admonitions
-    ################################################### -->
-    <!-- Use nice graphics for admonitions -->
-    <xsl:param name="admon.graphics">'1'</xsl:param>
-    <xsl:param name="admon.graphics.path">&admon_gfx_path;</xsl:param>
-    <!--###################################################
-                          Misc
-    ################################################### -->
-    <!-- Placement of titles -->
-    <xsl:param name="formal.title.placement">
-        figure after
-        example before
-        equation before
-        table before
-        procedure before
-    </xsl:param>
-    <xsl:template match="author" mode="titlepage.mode">
-        <xsl:if test="name(preceding-sibling::*[1]) = 'author'">
-            <xsl:text>, </xsl:text>
-        </xsl:if>
-        <span class="{name(.)}">
-            <xsl:call-template name="person.name" />
-            <xsl:apply-templates mode="titlepage.mode" select="./contrib" />
-            <xsl:apply-templates mode="titlepage.mode" select="./affiliation" />
-        </span>
-    </xsl:template>
-    <xsl:template match="authorgroup" mode="titlepage.mode">
-        <div class="{name(.)}">
-            <h2>Authors</h2>
-            <p />
-            <xsl:apply-templates mode="titlepage.mode" />
-        </div>
-    </xsl:template>
-    <!--###################################################
-                     Headers and Footers
-    ################################################### -->
-    <!-- let's have a Spring banner across the top of each page -->
-    <xsl:template name="user.header.navigation">
-        <div style="background-color:white;border:none;height:73px;border:1px solid black;">
-            <a style="border:none;" href="http://www.springframework.org/" title="The Spring Framework">
-                <img style="border:none;" src="images/xdev-spring_logo.jpg" />
-            </a>
-        </div>
-    </xsl:template>
-    <!-- no other header navigation (prev, next, etc.) -->
-    <xsl:template name="header.navigation" />
-    <xsl:param name="navig.showtitles">1</xsl:param>
-    <xsl:template name="footer.navigation">
-        <xsl:param name="prev" select="/foo" />
-        <xsl:param name="next" select="/foo" />
-        <xsl:param name="nav.context" />
-        <xsl:variable name="home" select="/*[1]" />
-        <xsl:variable name="up" select="parent::*" />
-        <xsl:variable name="row1" select="count($prev) &gt; 0
-                                        or count($up) &gt; 0
-                                        or count($next) &gt; 0" />
-        <xsl:variable name="row2" select="($prev and $navig.showtitles != 0)
-                                        or (generate-id($home) != generate-id(.)
-                                            or $nav.context = 'toc')
-                                        or ($chunk.tocs.and.lots != 0
-                                            and $nav.context != 'toc')
-                                        or ($next and $navig.showtitles != 0)" />
-        <xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'">
-            <div class="navfooter">
-                <xsl:if test="$footer.rule != 0">
-                    <hr />
-                </xsl:if>
-                <xsl:if test="$row1 or $row2">
-                    <table width="100%" summary="Navigation footer">
-                        <xsl:if test="$row1">
-                            <tr>
-                                <td width="40%" align="left">
-                                    <xsl:if test="count($prev)>0">
-                                        <a accesskey="p">
-                                            <xsl:attribute name="href">
-                                                <xsl:call-template name="href.target">
-                                                    <xsl:with-param name="object" select="$prev" />
-                                                </xsl:call-template>
-                                            </xsl:attribute>
-                                            <xsl:call-template name="navig.content">
-                                                <xsl:with-param name="direction" select="'prev'" />
-                                            </xsl:call-template>
-                                        </a>
-                                    </xsl:if>
-                                    <xsl:text>&#160;</xsl:text>
-                                </td>
-
-                                <td width="20%" align="center">
-                                    <xsl:choose>
-                                        <xsl:when test="$home != . or $nav.context = 'toc'">
-                                            <a accesskey="h">
-                                                <xsl:attribute name="href">
-                                                    <xsl:call-template name="href.target">
-                                                        <xsl:with-param name="object" select="$home" />
-                                                    </xsl:call-template>
-                                                </xsl:attribute>
-                                                <xsl:call-template name="navig.content">
-                                                    <xsl:with-param name="direction" select="'home'" />
-                                                </xsl:call-template>
-                                            </a>
-                                            <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
-                                                <xsl:text>&#160;|&#160;</xsl:text>
-                                            </xsl:if>
-                                        </xsl:when>
-                                        <xsl:otherwise>&#160;</xsl:otherwise>
-                                    </xsl:choose>
-                                    <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
-                                        <a accesskey="t">
-                                            <xsl:attribute name="href">
-                                                <xsl:apply-templates select="/*[1]" mode="recursive-chunk-filename">
-                                                    <xsl:with-param name="recursive" select="true()" />
-                                                </xsl:apply-templates>
-                                                <xsl:text>-toc</xsl:text>
-                                                <xsl:value-of select="$html.ext" />
-                                            </xsl:attribute>
-                                            <xsl:call-template name="gentext">
-                                                <xsl:with-param name="key" select="'nav-toc'" />
-                                            </xsl:call-template>
-                                        </a>
-                                    </xsl:if>
-                                </td>
-                                <td width="40%" align="right">
-                                    <xsl:text>&#160;</xsl:text>
-                                    <xsl:if test="count($next)>0">
-                                        <a accesskey="n">
-                                            <xsl:attribute name="href">
-                                                <xsl:call-template name="href.target">
-                                                    <xsl:with-param name="object" select="$next" />
-                                                </xsl:call-template>
-                                            </xsl:attribute>
-                                            <xsl:call-template name="navig.content">
-                                                <xsl:with-param name="direction" select="'next'" />
-                                            </xsl:call-template>
-                                        </a>
-                                    </xsl:if>
-                                </td>
-                            </tr>
-                        </xsl:if>
-                        <xsl:if test="$row2">
-                            <tr>
-                                <td width="40%" align="left" valign="top">
-                                    <xsl:if test="$navig.showtitles != 0">
-                                        <xsl:apply-templates select="$prev" mode="object.title.markup" />
-                                    </xsl:if>
-                                    <xsl:text>&#160;</xsl:text>
-                                </td>
-                                <td width="20%" align="center">
-                                </td>
-                                <td width="40%" align="right" valign="top">
-                                    <xsl:text>&#160;</xsl:text>
-                                    <xsl:if test="$navig.showtitles != 0">
-                                        <xsl:apply-templates select="$next" mode="object.title.markup" />
-                                    </xsl:if>
-                                </td>
-                            </tr>
-                        </xsl:if>
-                    </table>
-                </xsl:if>
-            </div>
-        </xsl:if>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/spring-webflow/docs/reference/styles/tld.to.docbook.xsl b/spring-webflow/docs/reference/styles/tld.to.docbook.xsl
deleted file mode 100644
index b8911664..00000000
--- a/spring-webflow/docs/reference/styles/tld.to.docbook.xsl
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Copyright 2004-2007 the original author or authors.
- 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
- 
-         http://www.apache.org/licenses/LICENSE-2.0
- 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<!--
-   Effects the transformation of taglib XML to DocBook XML.
-
-   Author: Rick Evans (based on Tim 'katentim' Nolan's original stylesheet)
--->
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xalan="http://xml.apache.org/xalan">
-
-    <xsl:output
-            method="xml"
-            indent="yes"
-            xalan:indent-amount="3"
-            omit-xml-declaration="no"/>
-
-    <xsl:param name="title"/>
-
-    <xsl:template match="taglib">
-        <xsl:element name="appendix">
-            <xsl:attribute name="id">
-                <xsl:value-of select="$title"/>
-            </xsl:attribute>
-            <xsl:element name="title"><xsl:value-of select="$title"/></xsl:element>
-
-            <xsl:element name="section">
-                <xsl:attribute name="id">
-                    <xsl:value-of select="$title"/>
-                    <xsl:text>-intro</xsl:text>
-                </xsl:attribute>
-                <xsl:element name="title"><xsl:text>Introduction</xsl:text></xsl:element>
-            </xsl:element>
-
-            <xsl:element name="para">
-                <xsl:text>One of the view technologies you can use with the Spring Framework
-			    is Java Server Pages (JSPs). To help you implement views using Java Server Pages
-			    the Spring Framework provides you with some tags for evaluating errors, setting
-			    themes and outputting internationalized messages.</xsl:text>
-            </xsl:element>
-
-            <xsl:element name="para">
-                <xsl:text>This appendix describes the </xsl:text>
-                <xsl:element name="literal">
-                    <xsl:value-of select="$title"/>
-                </xsl:element>
-                <xsl:text> tag library.</xsl:text>
-            </xsl:element>
-
-            <xsl:element name="itemizedlist">
-                <xsl:apply-templates select="tag" mode="mini-toc">
-                    <xsl:sort select="name" order="ascending"/>
-                </xsl:apply-templates>
-            </xsl:element>
-            <xsl:apply-templates select="tag">
-                <xsl:sort select="name" order="ascending"/>
-            </xsl:apply-templates>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="tag" mode="mini-toc">
-        <xsl:element name="listitem">
-            <xsl:element name="xref">
-                <xsl:attribute name="linkend">
-                    <xsl:call-template name="generate.id">
-                        <xsl:with-param name="id">
-                            <xsl:value-of select="./name"/>
-                        </xsl:with-param>
-                    </xsl:call-template>
-                </xsl:attribute>
-            </xsl:element>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="tag">
-        <xsl:element name="section">
-            <xsl:attribute name="id">
-                <xsl:call-template name="generate.id">
-                    <xsl:with-param name="id">
-                        <xsl:value-of select="./name"/>
-                    </xsl:with-param>
-                </xsl:call-template>
-            </xsl:attribute>
-            <xsl:element name="title">
-                <xsl:text>The </xsl:text>
-                <xsl:element name="literal">
-                    <xsl:value-of select="./name"/>
-                </xsl:element>
-                <xsl:text> tag</xsl:text>
-            </xsl:element>
-            <xsl:element name="para">
-                <xsl:value-of select="./description"/>
-            </xsl:element>
-            <xsl:element name="table">
-                <xsl:attribute name="id">
-                    <xsl:call-template name="generate.id">
-                        <xsl:with-param name="id">
-                            <xsl:value-of select="./name"/>
-                        </xsl:with-param>
-                    </xsl:call-template>
-                    <xsl:text>.table</xsl:text>
-                </xsl:attribute>
-                <xsl:element name="title">
-                    <xsl:text>Attributes</xsl:text>
-                </xsl:element>
-                <xsl:element name="tgroup">
-                    <xsl:attribute name="cols">
-                        <xsl:text>3</xsl:text>
-                    </xsl:attribute>
-                    <xsl:element name="spanspec">
-                        <xsl:attribute name="spanname">
-                            <xsl:text>description.span</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="namest">
-                            <xsl:text>Attribute</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="nameend">
-                            <xsl:text>Runtime.Expression</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="align">
-                            <xsl:text>left</xsl:text>
-                        </xsl:attribute>
-                    </xsl:element>
-                    <xsl:element name="colspec">
-                        <xsl:attribute name="align">
-                            <xsl:text>center</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="colname">
-                            <xsl:text>Attribute</xsl:text>
-                        </xsl:attribute>
-                    </xsl:element>
-                    <xsl:element name="colspec">
-                        <xsl:attribute name="align">
-                            <xsl:text>center</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="colname">
-                            <xsl:text>Required</xsl:text>
-                        </xsl:attribute>
-                    </xsl:element>
-                    <xsl:element name="colspec">
-                        <xsl:attribute name="align">
-                            <xsl:text>center</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="colname">
-                            <xsl:text>Runtime.Expression</xsl:text>
-                        </xsl:attribute>
-                    </xsl:element>
-
-                    <xsl:element name="thead">
-                        <xsl:element name="row">
-                            <xsl:element name="entry">
-                                <xsl:attribute name="align">
-                                    <xsl:text>center</xsl:text>
-                                </xsl:attribute>
-                                <xsl:text>Attribute</xsl:text>
-                            </xsl:element>
-                            <xsl:element name="entry">
-                                <xsl:attribute name="align">
-                                    <xsl:text>center</xsl:text>
-                                </xsl:attribute>
-                                <xsl:text>Required?</xsl:text>
-                            </xsl:element>
-                            <xsl:element name="entry">
-                                <xsl:attribute name="align">
-                                    <xsl:text>center</xsl:text>
-                                </xsl:attribute>
-                                <xsl:text>Runtime Expression?</xsl:text>
-                            </xsl:element>
-                        </xsl:element>
-
-                    </xsl:element>
-                    <xsl:element name="tbody">
-                        <xsl:apply-templates select="attribute">
-                            <xsl:sort select="name" order="ascending"/>
-                        </xsl:apply-templates>
-                    </xsl:element>
-                </xsl:element>
-            </xsl:element>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="attribute">
-        <xsl:element name="row">
-            <xsl:element name="entry">
-                <xsl:element name="para">
-                    <xsl:value-of select="name"/>
-                </xsl:element>
-            </xsl:element>
-            <xsl:element name="entry">
-                <xsl:element name="para">
-                    <xsl:value-of select="required"/>
-                </xsl:element>
-            </xsl:element>
-            <xsl:element name="entry">
-                <xsl:element name="para">
-                    <xsl:value-of select="rtexprvalue"/>
-                </xsl:element>
-            </xsl:element>
-        </xsl:element>
-        <xsl:element name="row">
-            <xsl:element name="entry">
-                <xsl:attribute name="spanname">
-                    <xsl:text>description.span</xsl:text>
-                </xsl:attribute>
-                <xsl:element name="para">
-                    <xsl:value-of select="description"/>
-                </xsl:element>
-            </xsl:element>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="attribute/description">
-        <xsl:element name="row">
-            <xsl:element name="entry">
-                <xsl:attribute name="spanname">
-                    <xsl:text>description.span</xsl:text>
-                </xsl:attribute>
-                <xsl:element name="para">
-                    <xsl:value-of select="description"/>
-                </xsl:element>
-            </xsl:element>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template name="generate.id">
-        <xsl:param name="id"/>
-        <xsl:value-of select="$title"/>.<xsl:value-of select="$id"/>
-    </xsl:template>
-    
-</xsl:stylesheet>
diff --git a/spring-webflow/docs/reference/styles/xsd.to.docbook.xsl b/spring-webflow/docs/reference/styles/xsd.to.docbook.xsl
deleted file mode 100644
index a29a9159..00000000
--- a/spring-webflow/docs/reference/styles/xsd.to.docbook.xsl
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Copyright 2004-2007 the original author or authors.
- 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
- 
-         http://www.apache.org/licenses/LICENSE-2.0
- 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<!--
-   Effects the transformation of the various Spring schema definitions to DocBook XML.
-
-   Author: Rick Evans
--->
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                xmlns:xalan="http://xml.apache.org/xalan">
-
-    <xsl:output
-            method="xml"
-            indent="yes"
-            xalan:indent-amount="3"
-            omit-xml-declaration="no"/>
-
-    <xsl:param name="title"/>
-
-    <xsl:template match="xsd:schema">
-        <xsl:element name="appendix">
-            <xsl:attribute name="id">
-                <xsl:value-of select="$title"/>
-            </xsl:attribute>
-            <xsl:element name="title">
-                <xsl:element name="literal">
-                    <xsl:value-of select="$title"/>
-                </xsl:element>
-            </xsl:element>
-
-            <xsl:element name="section">
-                <xsl:attribute name="id">
-                    <xsl:value-of select="$title"/>
-                    <xsl:text>-intro</xsl:text>
-                </xsl:attribute>
-                <xsl:element name="title">
-                    <xsl:text>Introduction</xsl:text>
-                </xsl:element>
-            </xsl:element>
-
-            <xsl:element name="para">
-                <xsl:text>This appendix describes the </xsl:text>
-                <xsl:element name="literal">
-                    <xsl:value-of select="$title"/>
-                </xsl:element>
-                <xsl:text> schema.</xsl:text>
-            </xsl:element>
-
-            <xsl:element name="itemizedlist">
-                <xsl:apply-templates select="xsd:element" mode="mini-toc">
-                    <xsl:sort select="name" order="ascending"/>
-                </xsl:apply-templates>
-            </xsl:element>
-
-            <xsl:apply-templates select="xsd:element">
-                <xsl:sort select="name" order="ascending"/>
-            </xsl:apply-templates>
-
-        </xsl:element>
-    </xsl:template>
-
-    <!--
-    creates the elements of an <itemizedlist/> containing (hyper)links
-    to the actual content
-    -->
-    <xsl:template match="xsd:element" mode="mini-toc">
-        <xsl:element name="listitem">
-            <xsl:element name="xref">
-                <xsl:attribute name="linkend">
-                    <xsl:call-template name="generate.id">
-                        <xsl:with-param name="id">
-                            <xsl:value-of select="@name"/>
-                        </xsl:with-param>
-                    </xsl:call-template>
-                </xsl:attribute>
-            </xsl:element>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="xsd:element">
-        <xsl:element name="section">
-            <xsl:attribute name="id">
-                <xsl:call-template name="generate.id">
-                    <xsl:with-param name="id">
-                        <xsl:value-of select="@name"/>
-                    </xsl:with-param>
-                </xsl:call-template>
-            </xsl:attribute>
-            <xsl:element name="title">
-                <xsl:text>The </xsl:text>
-                <xsl:element name="literal">
-                    <xsl:value-of select="@name"/>
-                </xsl:element>
-                <xsl:text> element</xsl:text>
-            </xsl:element>
-            <xsl:element name="para">
-                <xsl:text>[TODO : insert the description of the element here]</xsl:text>
-            </xsl:element>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template name="generate.id">
-        <xsl:param name="id"/>
-        <xsl:value-of select="$title"/>.<xsl:value-of select="$id"/>
-    </xsl:template>
-
-</xsl:stylesheet>
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index 3b4f4392..a5adc9d6 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -1,62 +1,64 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
 
-<ivy-module version="1.3">
-
-	<info organisation="org.springframework" module="spring-webflow" />
+	<info organisation="org.springframework.webflow" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+		<ivyauthor name="Keith Donald"/>
+	</info>
 
 	<configurations>
-		<conf name="global" visibility="private" />
-		<conf name="buildtime" visibility="private" />
-		<conf name="test" visibility="private" />
-
-		<!-- public webflow configurations other projects may use -->
-		<conf name="default" extends="mvc" />
-		<conf name="mvc" visibility="public" extends="global" />
-		<conf name="portlet" visibility="public" extends="mvc" />
-		<conf name="testing" visibility="public" extends="global" />
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
 	</configurations>
 
-	<dependencies defaultconf="global->default">
+	<publications>
+		<artifact name="${ant.project.name}"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+	</publications>
+
+	<dependencies>
 		<!--  global (core) dependencies -->
-		<dependency org="commons-logging" name="commons-logging" rev="1.1.1" />
+		<dependency org="org.apache" name="commons-logging" rev="1.1.1" conf="compile->default"/>
 		<!-- Xerces and XML-apis are required only under JDK 1.4 for XSD support -->
 		<!-- Note: POMs are incorrect in m2 repo; ignoring since they are optional anyway
 		<dependency org="xerces" name="xercesImpl" rev="2.8.0"/>
 		<dependency org="xml-apis" name="xml-apis" rev="1.3.03"/>
 		-->
-		<dependency org="org.springframework" name="spring-beans" rev="2.5.2" />
-		<dependency org="org.springframework" name="spring-binding" rev="latest.integration" />
-		<dependency org="org.springframework" name="spring-core" rev="2.5.2" />
-		<dependency org="org.springframework" name="spring-context" rev="2.5.2" />
-		<dependency org="org.springframework" name="spring-web" rev="2.5.2" />
-		<dependency org="org.springframework" name="spring-webmvc" rev="2.5.2" />
+		<dependency org="org.springframework" name="spring-beans" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework.webflow" name="spring-binding" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="spring-core" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-context" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-web" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-webmvc" rev="2.5.2" conf="compile->default"/>
 
 		<!-- testing support only dependencies -->
-		<dependency org="junit" name="junit" rev="3.8.2" conf="buildtime, testing->default" />
+		<dependency org="org.junit" name="junit" rev="3.8.2" conf="compile, test->default" />
 
 		<!-- build time only dependencies -->		
-		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="buildtime->default" />
-		<dependency org="javax.portlet" name="portlet-api" rev="1.0" conf="buildtime->default" />
-		<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default" />
-		<dependency org="ognl" name="ognl" rev="2.6.9" conf="buildtime->default" />
-		<dependency org="org.springframework" name="spring-orm" rev="2.5.2" conf="buildtime->default" />
-		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.2" conf="buildtime, portlet->default" />
-		<dependency org="org.springframework" name="spring-tx" rev="2.5.2" conf="buildtime->default" />
-		<dependency org="org.springframework.security" name="spring-security-core" rev="2.0-M2" conf="buildtime->default" />
-		<dependency org="javax.persistence" name="persistence-api" rev="1.0b" conf="buildtime->default" />
-		<dependency org="concurrent" name="concurrent" rev="1.3.4" conf="buildtime->default" />
+		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="compile->default" />
+		<dependency org="javax.portlet" name="portlet-api" rev="1.0" conf="compile->default" />
+		<dependency org="javax.el" name="el-api" rev="1.0" conf="compile->default" />
+		<dependency org="org.ognl" name="ognl" rev="2.6.9" conf="compile->default" />
+		<dependency org="org.springframework" name="spring-orm" rev="2.5.2" conf="compile->default" />
+		<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.2" conf="compile->default" />
+		<dependency org="org.springframework" name="spring-tx" rev="2.5.2" conf="compile->default" />
+		<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.0.m2" conf="compile->default" />
+		<dependency org="javax.persistence" name="persistence-api" rev="1.0.0" conf="compile->default" />
+		<dependency org="edu.oswego.cs" name="concurrent" rev="1.3.4" conf="compile->default" />
 	
 		<!-- test time only dependencies -->
-		<dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="test->default" />
-		<dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default" />
+		<dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.9" conf="test->default" />
+		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="test->default" />
 		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="test->default"/>
 		<dependency org="org.easymock" name="easymock" rev="2.3" conf="test->default" />
-		<dependency org="com.cenqua.clover" name="clover" rev="1.3.12" conf="test->default" />
-		<dependency org="aopalliance" name="aopalliance" rev="1.0" conf="test->default"/>
+		<dependency org="org.aopalliance" name="aopalliance" rev="1.0" conf="test->default"/>
 		<dependency org="org.springframework" name="spring-aop" rev="2.5.2" conf="test->default" />		
 		<dependency org="org.springframework" name="spring-jdbc" rev="2.5.2" conf="test->default" />
 		<dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default" />
-		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="buildtime, test->default" />
+		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="compile, test->default" />
 		<dependency org="org.apache.openjpa" name="openjpa" rev="1.0.2" conf="test->default">
 			<!-- Exclusions required because open jpa pom is poorly designed -->
 			<exclude module="openjpa-lib" />
@@ -69,9 +71,10 @@
 			<exclude module="openjpa-xmlstore" />
 		</dependency>
 		<!-- lang and serp are required by open jpa -->
-		<dependency org="commons-lang" name="commons-lang" rev="2.1" conf="test->default" />
-		<dependency org="commons-collections" name="commons-collections" rev="3.2" conf="test->default" />
+		<dependency org="org.apache.commons" name="commons-lang" rev="2.1" conf="test->default" />
+		<dependency org="org.apache.commons" name="commons-collections" rev="3.2" conf="test->default" />
+		<dependency org="net.sf.cglib" name="cglib_nodep" rev="2.1.3" conf="test->default"/>
 		<dependency org="net.sourceforge.serp" name="serp" rev="1.13.1" conf="test->default" />
-	</dependencies>
+	   </dependencies>
 
 </ivy-module>
\ No newline at end of file
diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml
deleted file mode 100644
index e23d44b3..00000000
--- a/spring-webflow/pom.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-webflow</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Web Flow</name>
-	<version>2.0-rc1-SNAPSHOT</version>
-	<description>Spring Web Flow</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</connection>
-		<developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/springframework/spring-webflow</developerConnection>
-		<url>http://svn.sourceforge.net/viewcvs.cgi/springframework/spring-webflow</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>concurrent</groupId>
-			<artifactId>concurrent</artifactId>
-			<version>1.3.4</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>el-api</artifactId>
-			<version>1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>persistence-api</artifactId>
-			<version>1.0b</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.portlet</groupId>
-			<artifactId>portlet-api</artifactId>
-			<version>1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>ognl</groupId>
-			<artifactId>ognl</artifactId>
-			<version>2.6.9</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate</artifactId>
-			<version>3.2.5.ga</version>
-			<optional>true</optional>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>2.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-binding</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>2.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>2.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-			<version>2.5.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-core</artifactId>
-			<version>2.0-M2</version>
-			<optional>true</optional>
-		</dependency>		
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-			<version>2.5.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>2.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>2.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc-portlet</artifactId>
-			<version>2.5.2</version>
-			<optional>true</optional>
-		</dependency>
-<!-- Runtime Dependencies -->
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.14</version>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-<!-- Test Dependencies -->
-		<dependency>
-			<groupId>com.cenqua.clover</groupId>
-			<artifactId>clover</artifactId>
-			<version>1.3.12</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymock</artifactId>
-			<version>2.3</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.7</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.3.1.ga</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-commons-annotations</artifactId>
-			<version>3.3.0.ga</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openjpa</groupId>
-			<artifactId>openjpa</artifactId>
-			<version>1.0.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>aopalliance</groupId>
-			<artifactId>aopalliance</artifactId>
-			<version>1.0</version>
-			<scope>test</scope>
-		</dependency>		
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aop</artifactId>
-			<version>2.5.2</version>
-			<scope>test</scope>
-		</dependency>		
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-			<version>2.5.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>2.5.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.seam</groupId>
-			<artifactId>jboss-el</artifactId>
-			<version>2.0.0.GA</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/spring-webflow/project.properties b/spring-webflow/project.properties
deleted file mode 100644
index 23229411..00000000
--- a/spring-webflow/project.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Properties defined in this file are overridable by a local build.properties in this project dir
-
-# The location of the common build system
-common.build.dir=${basedir}/../common-build
-
-project.base.version=2.0-rc1-SNAPSHOT
-#project.version=${project.base.version}
-#ivy.status=release
-
-javac.source=1.4
-javac.target=1.4
diff --git a/spring-webflow/src/etc/filter.properties b/spring-webflow/src/etc/filter.properties
deleted file mode 100644
index 3aaac7e3..00000000
--- a/spring-webflow/src/etc/filter.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contains filterable project settings.  Setting placeholders in filterable project text
-# files will be replaced with these values when the 'statics' build target is run.
-#
-# You may add static settings directly to this source file in the format:
-#    setting=value  e.g MY_SETTING=myvalue
-# This is appropriate usage if you know the setting value will never change.
-#
-# At build time this source file is copied to the ${target.dir} where additional 
-# dynamic settings may be appended using the <propertyfile> task.  Use this approach
-# when a setting value depends on the build or the local user's environment.
-#
-# An example of this approach is shown below:
-#
-# build.xml
-# <target name="build.prepare" depends="common-targets.build.prepare">
-#   <!-- Append additional local settings that are applicable to this project -->
-#  	<propertyfile file="${target.filter.file}">
-#  		 <!-- key=the name of the setting
-#             value=the property in your build.properties file that has the local setting value -->
-#  	     <entry key="MY_LOCAL_SETTING" value="${my.local.setting}" />
-#  	</propertyfile>
-# </target>
-#
-# This allows for dynamic replacement values that are sourced from local properties files to facilitate
-# local user settings.
-#
-# To refer to filterable settings within project source files like config files, JSPs, or
-# other text files use the standard ant placeholder format:
-#     @SETTING_NAME@ e.g, @MY_SETTING@ and @MY_LOCAL_SETTING@
-#
-# Your settings:
diff --git a/spring-webflow/src/etc/test-resources/log4j.properties b/spring-webflow/src/etc/test-resources/log4j.properties
deleted file mode 100644
index eaa1b2ae..00000000
--- a/spring-webflow/src/etc/test-resources/log4j.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-log4j.rootCategory=WARN, stdout, logfile
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=@TEST_RESULTS_DIR@/@PROJECT_NAME@.log
-log4j.appender.logfile.MaxFileSize=512KB
-
-# Keep three backup files
-log4j.appender.logfile.MaxBackupIndex=3
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-#Pattern to output : date priority [category] - <message>line_separator
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-log4j.category.org.springframework.webflow=DEBUG
-log4j.category.org.springframework.binding=DEBUG
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/META-INF/spring.handlers b/spring-webflow/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from spring-webflow/src/main/java/META-INF/spring.handlers
rename to spring-webflow/src/main/resources/META-INF/spring.handlers
diff --git a/spring-webflow/src/main/java/META-INF/spring.schemas b/spring-webflow/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from spring-webflow/src/main/java/META-INF/spring.schemas
rename to spring-webflow/src/main/resources/META-INF/spring.schemas
diff --git a/spring-webflow/src/test/java/log4j.xml b/spring-webflow/src/test/resources/log4j.xml
similarity index 100%
rename from spring-webflow/src/test/java/log4j.xml
rename to spring-webflow/src/test/resources/log4j.xml