diff --git a/build.xml b/build.xml
index bd68c61..fb05e81 100644
--- a/build.xml
+++ b/build.xml
@@ -5,26 +5,50 @@
          basedir="."
          default="install">
 
+  <!--
+    javaee7-web
+      target                             <= work directory to test archetype > ${workdir}
+        javaee7-web-min-test-site
+      javaee7-web-min
+        pom.xml
+        distribution
+          pom.xml                        <= *1
+        target
+          generated-sources/archetype    <= output of archetype:create-from-project
+                                            and files of new archetype > ${newarchres}
+            pom.xml                      <= copy overwrite with *1
+            src/main/resources
+              META-INF
+              archetype-resources        <= fillerd javaee7-web-min files > ${archresdir}
+                pom.xml                       
+                src
+                testscript
+                tools
+  -->
+  <property environment="env" />
+
+  <property name="newVersion" value="0.13" />
   <input addproperty="artifactId"
          validargs="javaee7-web-min,javaee7-web-tips"
          defaultvalue="javaee7-web-min" />
-  <property name="newVersion" value="0.12" />
-  <property environment="env" />
-  <property name="workdir" value="${basedir}/target" />
+
+  <property name="workdir" value="${basedir}/${artifactId}/target" />
   <property name="archresdir"
-            value="${artifactId}/target/generated-sources/archetype/src"
-            description="「mvn archetye:create-from-project」コマンドで作成された、アーキタイプとして格納される資源のディレクトリ" />
-  <property name="newarchdir" value="${workdir}/${artifactId}/newarch" description="新しいアーキタイプを作成するディレクトリ" />
-  <property name="resdir" value="${newarchdir}/src" />
-  <property name="db" value="derby" />
+            value="${artifactId}/target/generated-sources/archetype/src/main/resources/archetype-resources" />
+  <property name="newarchdir" value="${basedir}/${artifactId}/target/generated-sources/archetype" />
+
+  <condition property="test.glassfish">
+    <equals arg1="${artifactId}" arg2="javaee7-web-min" />
+  </condition>
+  <property name="test.site" value="false" />
+  <property name="test.glassfish" value="false" />
+  <property name="test.was-liberty" value="true" />
+  <property name="test.wildfly" value="false" />
 
   <condition property="mvn.cmd" value="${env.MAVEN_HOME}/bin/mvn.cmd" else="/usr/local/bin/mvn">
     <os family="windows" />
   </condition>
 
-  <condition property="glassfish">
-    <equals arg1="${artifactId}" arg2="javaee7-web-min" />
-  </condition>
 
 
   <target name="install">
@@ -43,59 +67,53 @@
 
   <target name="process-all">
     <antcall target="01_create-from-archetype" />
-    <antcall target="02_copy-archetype-resource" />
+    <antcall target="02_modify-archetype-resource" />
     <antcall target="03_process-archetype" />
     <antcall target="04_acceptance-test" />
   </target>
 
-
   <target name="01_create-from-archetype">
 
+    <echo message="${basedir}/${archresdir}>mvn clean archetype:create-from-project"/>
     <exec executable="${mvn.cmd}" dir="${basedir}/${artifactId}" failonerror="true">
       <env key="JAVA_HOME" value="${java.home}" />
-      <arg value="-Darchetype.filteredExtentions=java,xml,txt,groovy,cs,mdo,aj,jsp,gsp,vm,html,xhtml,properties,.classpath,.project,launch,component" />
       <arg value="clean" />
       <arg value="archetype:create-from-project" />
+      <arg value="-Darchetype.filteredExtentions=java,xml,txt,groovy,cs,mdo,aj,jsp,gsp,vm,html,xhtml,properties,.classpath,.project,launch,component" />
     </exec>
 
   </target>
 
-
-
-  <target name="02_copy-archetype-resource">
-
-    <copy todir="${resdir}">
-      <fileset dir="${archresdir}">
-        <exclude name=".git" />
-        <exclude name=".gitignore" />
-        <exclude name="/archetype/**" />
-        <exclude name="generated-sources/archetype/target" />
-        <exclude name="LICENSE" />
-        <exclude name="NOTICE" />
-        <exclude name="README.md" />
-        <exclude name="**/target/**" />
-      </fileset>
-    </copy>
-
-    <property name="settings" value="${resdir}/main/resources/archetype-resources/.settings" />
-
+  
+  <target name="02_modify-archetype-resource">
+    
+    <delete dir="${archresdir}/distribution" verbose="true"/>
+    <delete dir="${archresdir}/tools/derby/target" verbose="true"/>
+    <delete dir="${archresdir}/tools/mysql/data" verbose="true"/>
+    <delete dir="${archresdir}/tools/mysql/target" verbose="true"/>
+    <delete verbose="true">
+      <fileset dir="${archresdir}" includes="**/.DS_Store"/>
+    </delete>
+
+    <property name="settings" value="${archresdir}/.settings" />
     <move todir="${settings}" includeemptydirs="false">
       <fileset dir="${settings}" includes="*.launch" />
       <globmapper from="${artifactId}*.launch" to="__artifactId__*.launch" />
     </move>
 
-    <copy file="${basedir}/${artifactId}/distribution/pom.xml" todir="${newarchdir}" />
+    <copy file="${basedir}/${artifactId}/distribution/pom.xml" todir="${newarchdir}" overwrite="true" />
 
   </target>
 
 
-
   <target name="03_process-archetype">
 
+    <echo message="${newarchdir}>mvn version:set -DnewVewsion=${newVersion}"/>
     <exec executable="${mvn.cmd}" dir="${newarchdir}" failonerror="true">
       <env key="JAVA_HOME" value="${java.home}" />
-      <arg value="-DnewVersion=${newVersion}" />
       <arg value="versions:set" />
+      <arg value="-DnewVersion=${newVersion}" />
+      <arg value="-e"/>
     </exec>
 
     <condition property="mvn.phase" value="install">
@@ -104,10 +122,13 @@
       </not>
     </condition>
 
+    <echo message="${newarchdir}>mvn clean ${mvn.phase} -DperformReleease=${mvn.performRelease}"/>
     <exec executable="${mvn.cmd}" dir="${newarchdir}" failonerror="true">
       <env key="JAVA_HOME" value="${java.home}" />
-      <arg value="-DperformRelease=${mvn.performRelease}" />
+      <arg value="clean" />
       <arg value="${mvn.phase}" />
+      <arg value="-DperformRelease=${mvn.performRelease}" />
+      <arg value="-e"/>
     </exec>
 
   </target>
@@ -115,18 +136,16 @@
 
   <target name="04_acceptance-test">
 
-    <antcall target="test-site"/>
-    <antcall target="test-glassfish"/>
-    <antcall target="test-was-liberty"/>
-    <antcall target="test-wildfly"/>
+    <antcall target="test-site" />
+    <antcall target="test-glassfish" />
+    <antcall target="test-was-liberty" />
+    <antcall target="test-wildfly" />
 
   </target>
-  
-  
+
+
   <target name="archetype-generate">
-    
-    <delete dir="${workdir}/${testArtifactId}"/>
-    
+
     <exec executable="${mvn.cmd}" dir="${workdir}" failonerror="true">
       <env key="JAVA_HOME" value="${java.home}" />
       <arg value="-DarchetypeGroupId=org.sitoolkit.ad.archetype" />
@@ -142,104 +161,119 @@
 
   </target>
 
-  
-  <target name="test-site">
 
-    <property name="testArtifactId" value="${artifactId}-test-site"/>
-    <antcall target="archetype-generate"/>    
+  <target name="test-site" if="${test.site}">
+
+    <property name="testArtifactId" value="${artifactId}-test-site" />
+    <antcall target="archetype-generate" />
+
+    <exec executable="${mvn.cmd}" dir="${workdir}/${testArtifactId}">
+      <env key="JAVA_HOME" value="${java.home}" />
+      <arg value="-Ddb.port=3307" />
+      <arg value="-Dmysql=stop" />
+    </exec>
 
     <exec executable="${mvn.cmd}" dir="${workdir}/${testArtifactId}" failonerror="true">
       <env key="JAVA_HOME" value="${java.home}" />
       <arg value="-Dfile.encoding=UTF-8" />
-      <arg value="-Ddb.port=1528" />
-      <arg value="-P${db},db-migrate" />
+      <arg value="-Ddb.port=3307" />
+      <arg value="-Dmpir.skip=true" />
+      <arg value="-Pmysql,db-migrate" />
       <arg value="site" />
     </exec>
 
+    <exec executable="${mvn.cmd}" dir="${workdir}/${testArtifactId}">
+      <env key="JAVA_HOME" value="${java.home}" />
+      <arg value="-Dmysql=stop" />
+    </exec>
+
   </target>
 
 
-  <target name="test-glassfish">
-  
-    <property name="testArtifactId" value="${artifactId}-test-glassfish"/>
-    <antcall target="archetype-generate"/>    
-  
-    <exec executable="${mvn.cmd}"
-          dir="${workdir}/${testArtifactId}"
-          failonerror="true"
-          if:set="glassfish">
+  <target name="test-glassfish" if="${test.glassfish}">
+
+    <property name="testArtifactId" value="${artifactId}-test-glassfish" />
+    <antcall target="archetype-generate" />
+
+    <exec executable="${mvn.cmd}" dir="${workdir}/${testArtifactId}" failonerror="true">
       <env key="JAVA_HOME" value="${java.home}" />
-      <arg value="-P${db},db-migrate,embedded-glassfish,it" />
+      <arg value="verify" />
+      <arg value="-Pderby,db-migrate,embedded-glassfish,it" />
       <arg value="-Devidence.open=false" />
       <arg value="-Dfile.encoding=UTF-8" />
       <arg value="-Ddb.port=1528" />
       <arg value="-Das.port=8081" />
-      <arg value="verify" />
+      <arg value="-e"/>
     </exec>
-    
+
   </target>
-  
-  
-  <target name="test-was-liberty">
-    
-    <property name="testArtifactId" value="${artifactId}-test-was-liberty"/>
-    <antcall target="archetype-generate"/>    
+
+
+  <target name="test-was-liberty" if="${test.was-liberty}">
+
+    <property name="testArtifactId" value="${artifactId}-test-was-liberty" />
+    <antcall target="archetype-generate" />
 
     <exec executable="${mvn.cmd}" dir="${workdir}/${testArtifactId}" failonerror="true">
       <env key="JAVA_HOME" value="${java.home}" />
-      <arg value="-P${db},db-migrate,was-liberty,it" />
+      <arg value="verify" />
+      <arg value="-Pmysql,db-migrate,was-liberty,it" />
       <arg value="-Devidence.open=false" />
       <arg value="-Dfile.encoding=UTF-8" />
-      <arg value="-Ddb.port=1529" />
+      <arg value="-Ddb.port=3308" />
       <arg value="-Das.port=8082" />
-      <arg value="verify" />
+      <arg value="-e"/>
     </exec>
 
   </target>
 
-  
-  <target name="test-wildfly">
 
-    <property name="testArtifactId" value="${artifactId}-test-wildfly"/>
-    <antcall target="archetype-generate"/>    
+  <target name="test-wildfly" if="${test.wildfly}">
+
+    <property name="testArtifactId" value="${artifactId}-test-wildfly" />
+    <antcall target="archetype-generate" />
 
     <exec executable="${mvn.cmd}" dir="${workdir}/${testArtifactId}" failonerror="true">
       <env key="JAVA_HOME" value="${java.home}" />
-      <env key="JBOSS_HOME" value="${workdir}/${testArtifactId}/target/wildfly-run/wildfly-10.0.0.Final" />
-      <arg value="-P${db},db-migrate,wildfly,it" />
+      <env key="JBOSS_HOME"
+           value="${workdir}/${testArtifactId}/target/wildfly-run/wildfly-10.0.0.Final" />
+      <arg value="verify" />
+      <arg value="-Pderby,db-migrate,wildfly,it" />
       <arg value="-Dmaven.test.skip=false" />
       <arg value="-Devidence.open=false" />
       <arg value="-Dfile.encoding=UTF-8" />
       <arg value="-Ddb.port=1530" />
       <arg value="-Das.port=8083" />
-      <arg value="verify" />
+      <arg value="-e"/>
     </exec>
-    
+
   </target>
-  
-  
+
+
   <target name="set-version">
-    
+
     <exec executable="${mvn.cmd}" dir="${basedir}" failonerror="true">
       <env key="JAVA_HOME" value="${java.home}" />
       <arg value="-DnewVersion=${newVersion}" />
-      <arg value="versions:set" />
       <arg value="clean" />
+      <arg value="versions:set" />
       <arg value="install" />
     </exec>
 
     <exec executable="${mvn.cmd}" dir="${basedir}/javaee7-web-min" failonerror="true">
       <env key="JAVA_HOME" value="${java.home}" />
+      <arg value="clean" />
       <arg value="-DallowSnapshots=true" />
       <arg value="versions:update-parent" />
     </exec>
 
     <exec executable="${mvn.cmd}" dir="${basedir}/javaee7-web-tips" failonerror="true">
       <env key="JAVA_HOME" value="${java.home}" />
+      <arg value="clean" />
       <arg value="-DallowSnapshots=true" />
       <arg value="versions:update-parent" />
     </exec>
 
   </target>
-  
+
 </project>
\ No newline at end of file
diff --git a/javaee7-web-min/.gitignore b/javaee7-web-min/.gitignore
index 54088d5..db7fca5 100644
--- a/javaee7-web-min/.gitignore
+++ b/javaee7-web-min/.gitignore
@@ -1,2 +1,6 @@
-target
+/target/
+/tools/derby/data/
+/tools/hibernate-tools/target
+/tools/mysql/data/
+/tools/mysql/target
 .DS_Store
diff --git a/javaee7-web-min/.settings/javaee7-web-min_00_build-all.launch b/javaee7-web-min/.settings/javaee7-web-min_00_build-all.launch
index f0329af..2314e75 100644
--- a/javaee7-web-min/.settings/javaee7-web-min_00_build-all.launch
+++ b/javaee7-web-min/.settings/javaee7-web-min_00_build-all.launch
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean verify"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="db-migrate,derby,was-liberty,it"/>
-<listAttribute key="M2_PROPERTIES">
-<listEntry value="maven.test.skip=false"/>
-</listAttribute>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<intAttribute key="M2_THREADS" value="1"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<stringAttribute key="M2_USER_SETTINGS" value=""/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/javaee7-web-min}"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean verify"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value="mysql,db-migrate,was-liberty,it"/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="maven.test.skip=false"/>
+</listAttribute>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/javaee7-web-min}"/>
+</launchConfiguration>
diff --git a/javaee7-web-min/.settings/javaee7-web-min_10_mysql-run.launch b/javaee7-web-min/.settings/javaee7-web-min_10_mysql-run.launch
new file mode 100644
index 0000000..207495e
--- /dev/null
+++ b/javaee7-web-min/.settings/javaee7-web-min_10_mysql-run.launch
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="antrun:run"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value="mysql"/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="mysql=run"/>
+</listAttribute>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/javaee7-web-min}"/>
+</launchConfiguration>
diff --git a/javaee7-web-min/.settings/javaee7-web-min_11_mysql-stop.launch b/javaee7-web-min/.settings/javaee7-web-min_11_mysql-stop.launch
new file mode 100644
index 0000000..8c57a25
--- /dev/null
+++ b/javaee7-web-min/.settings/javaee7-web-min_11_mysql-stop.launch
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="antrun:run"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value="mysql"/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="mysql=stop"/>
+</listAttribute>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/javaee7-web-min}"/>
+</launchConfiguration>
diff --git a/javaee7-web-min/.settings/javaee7-web-min_20_wildfly-run.launch b/javaee7-web-min/.settings/javaee7-web-min_20_wildfly-run.launch
index 5e470b5..71aa033 100644
--- a/javaee7-web-min/.settings/javaee7-web-min_20_wildfly-run.launch
+++ b/javaee7-web-min/.settings/javaee7-web-min_20_wildfly-run.launch
@@ -12,9 +12,6 @@
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="JBOSS_HOME" value="${workspace_loc:/javaee7-web-min}/target/wildfly-run/wildfly-10.0.0.Final"/>
-</mapAttribute>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
diff --git a/javaee7-web-min/.settings/javaee7-web-tips_21_wildfly-stop.launch b/javaee7-web-min/.settings/javaee7-web-min_21_wildfly-stop.launch
similarity index 85%
rename from javaee7-web-min/.settings/javaee7-web-tips_21_wildfly-stop.launch
rename to javaee7-web-min/.settings/javaee7-web-min_21_wildfly-stop.launch
index 255225e..edd123f 100644
--- a/javaee7-web-min/.settings/javaee7-web-tips_21_wildfly-stop.launch
+++ b/javaee7-web-min/.settings/javaee7-web-min_21_wildfly-stop.launch
@@ -12,9 +12,6 @@
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="JBOSS_HOME" value="${workspace_loc:/javaee7-web-min}/target/wildfly-run/wildfly-10.0.0.Final"/>
-</mapAttribute>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
diff --git a/javaee7-web-min/.settings/org.eclipse.core.resources.prefs b/javaee7-web-min/.settings/org.eclipse.core.resources.prefs
index 3f2340e..33cbced 100755
--- a/javaee7-web-min/.settings/org.eclipse.core.resources.prefs
+++ b/javaee7-web-min/.settings/org.eclipse.core.resources.prefs
@@ -4,5 +4,4 @@ encoding//src/main/resources=UTF-8
 encoding//src/main/webapp=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
-encoding//target/generated-sources/hibernate-tools=UTF-8
 encoding/<project>=UTF-8
diff --git a/javaee7-web-min/.settings/org.eclipse.jpt.core.prefs b/javaee7-web-min/.settings/org.eclipse.jpt.core.prefs
index 730fbc1..d64f8ce 100755
--- a/javaee7-web-min/.settings/org.eclipse.jpt.core.prefs
+++ b/javaee7-web-min/.settings/org.eclipse.jpt.core.prefs
@@ -1,3 +1,2 @@
 eclipse.preferences.version=1
 org.eclipse.jpt.core.platform=eclipselink2_5
-org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=true
diff --git a/javaee7-web-min/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/javaee7-web-min/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
index 909c1fd..9b4b9fc 100755
--- a/javaee7-web-min/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
+++ b/javaee7-web-min/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -4,9 +4,4 @@
       <attribute name="provider-id" value="jsf-user-library-provider"/>
     </node>
   </facet>
-  <facet id="jst.jaxrs">
-    <node name="libprov">
-      <attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
-    </node>
-  </facet>
 </root>
diff --git a/javaee7-web-min/.settings/org.eclipse.wst.common.project.facet.core.xml b/javaee7-web-min/.settings/org.eclipse.wst.common.project.facet.core.xml
index a47fdf0..1c89fc0 100755
--- a/javaee7-web-min/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/javaee7-web-min/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -5,5 +5,4 @@
   <installed facet="java" version="1.8"/>
   <installed facet="jst.web" version="3.1"/>
   <installed facet="jst.jsf" version="2.2"/>
-  <installed facet="jst.jaxrs" version="2.0"/>
 </faceted-project>
diff --git a/javaee7-web-min/distribution/pom.xml b/javaee7-web-min/distribution/pom.xml
index da24ad2..409230f 100644
--- a/javaee7-web-min/distribution/pom.xml
+++ b/javaee7-web-min/distribution/pom.xml
@@ -32,6 +32,29 @@
     </pluginManagement>
 
     <plugins>
+      <!-- 
+        .gitignore isn't included in new archetype because of this issue. 
+        https://issues.apache.org/jira/browse/MRESOURCES-190
+        So it needs to copy explicitly.
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <copy file="${project.basedir}/../../../.gitignore" todir="${project.build.outputDirectory}/archetype-resources"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
diff --git a/javaee7-web-min/nbactions.xml b/javaee7-web-min/nbactions.xml
index 08f01af..8272f56 100644
--- a/javaee7-web-min/nbactions.xml
+++ b/javaee7-web-min/nbactions.xml
@@ -6,10 +6,11 @@
         <recursive>false</recursive>
         <goals>
             <goal>verify</goal>
+            <goal>-e</goal>
         </goals>
         <activatedProfiles>
+            <activatedProfile>mysql</activatedProfile>
             <activatedProfile>db-migrate</activatedProfile>
-            <activatedProfile>derby</activatedProfile>
             <activatedProfile>was-liberty</activatedProfile>
             <activatedProfile>it</activatedProfile>
         </activatedProfiles>
@@ -18,6 +19,9 @@
             <actionName>CUSTOM-01_db-migrate</actionName>
             <displayName>01_db-migrate</displayName>
             <recursive>false</recursive>
+            <goals>
+                <goal>-e</goal>
+            </goals>
             <activatedProfiles>
                 <activatedProfile>db-migrate</activatedProfile>
             </activatedProfiles>
@@ -29,6 +33,22 @@
             <goals>
                 <goal>derby:run</goal>
             </goals>
+            <activatedProfiles>
+                <activatedProfile>derby</activatedProfile>
+            </activatedProfiles>
+        </action>
+    <action>
+            <actionName>CUSTOM-10_mysql-run</actionName>
+            <displayName>10_mysql-run</displayName>
+            <goals>
+                <goal>-e</goal>
+            </goals>
+            <properties>
+                <mysql>run</mysql>
+            </properties>
+            <activatedProfiles>
+                <activatedProfile>mysql</activatedProfile>
+            </activatedProfiles>
         </action>
     <action>
             <actionName>CUSTOM-11_derby-stop</actionName>
@@ -37,6 +57,19 @@
             <goals>
                 <goal>derby:stop</goal>
             </goals>
+            <activatedProfiles>
+                <activatedProfile>deeby</activatedProfile>
+            </activatedProfiles>
+        </action>
+    <action>
+            <actionName>CUSTOM-11_mysql-stop</actionName>
+            <displayName>11_mysql-stop</displayName>
+            <properties>
+                <mysql>stop</mysql>
+            </properties>
+            <activatedProfiles>
+                <activatedProfile>mysql</activatedProfile>
+            </activatedProfiles>
         </action>
     <action>
             <actionName>CUSTOM-20_was-liberty-run</actionName>
@@ -46,6 +79,13 @@
                 <activatedProfile>was-liberty</activatedProfile>
             </activatedProfiles>
         </action>
+    <action>
+            <actionName>CUSTOM-20_wildfly-run</actionName>
+            <displayName>20_wildfly-run</displayName>
+            <activatedProfiles>
+                <activatedProfile>wildfly</activatedProfile>
+            </activatedProfiles>
+        </action>
     <action>
             <actionName>CUSTOM-21_was-liberty-stop</actionName>
             <displayName>21_was-liberty-stop</displayName>
@@ -57,6 +97,16 @@
                 <activatedProfile>was-liberty</activatedProfile>
             </activatedProfiles>
         </action>
+    <action>
+            <actionName>CUSTOM-21_wildfly-stop</actionName>
+            <displayName>21_wildfly-stop</displayName>
+            <goals>
+                <goal>wildfly:shutdown</goal>
+            </goals>
+            <activatedProfiles>
+                <activatedProfile>wildfly</activatedProfile>
+            </activatedProfiles>
+        </action>Ï
     <action>
             <actionName>CUSTOM-30_it</actionName>
             <displayName>30_it</displayName>
@@ -67,5 +117,15 @@
             <activatedProfiles>
                 <activatedProfile>it</activatedProfile>
             </activatedProfiles>
-        </action>Ï
+        </action>
+    <action>
+            <actionName>CUSTOM-40_site</actionName>
+            <displayName>40_site</displayName>
+            <goals>
+                <goal>site</goal>
+            </goals>
+            <activatedProfiles>
+                <activatedProfile>db-migrate</activatedProfile>
+            </activatedProfiles>
+        </action>
 </actions>
diff --git a/javaee7-web-min/pom.xml b/javaee7-web-min/pom.xml
index 4a6213a..394f671 100755
--- a/javaee7-web-min/pom.xml
+++ b/javaee7-web-min/pom.xml
@@ -9,34 +9,94 @@
   <parent>
     <groupId>org.sitoolkit.ad.archetype</groupId>
     <artifactId>javaee7-web</artifactId>
-    <version>0.12</version>
+    <version>0.13</version>
   </parent>
   <properties>
-    <db.client.groupId>org.apache.derby</db.client.groupId>
-    <db.client.artifactId>derbyclient</db.client.artifactId>
-    <db.client.version>10.10.1.1</db.client.version>
-    <db.client.lib>${settings.localRepository}/org/apache/derby/derbyclient/${db.client.version}</db.client.lib>
-    <db.jdbc.driver>org.apache.derby.jdbc.ClientDriver</db.jdbc.driver>
-    <db.jdbc.dsclass>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</db.jdbc.dsclass>
-    <db.name>${project.artifactId}-db</db.name>
-    <db.host>localhost</db.host>
-    <db.port>1527</db.port>
-    <db.jdbc.url>jdbc:derby://${db.host}:${db.port}/${db.name};create=true</db.jdbc.url>
-    <db.username>app</db.username>
-    <db.password>app</db.password>
-    <db.flyway.comment>aaa</db.flyway.comment>
-    <db.was-liberty.ds-properties><![CDATA[<properties.derby.client createDatabase="create" databaseName="${db.name}" serverName="${db.host}" portNumber="${db.port}" user="${db.username}" password="${db.password}" />]]></db.was-liberty.ds-properties>
-    <db.was-liberty.fileset><![CDATA[<fileset dir="${db.client.lib}" />]]></db.was-liberty.fileset>
+    <flyway.location>filesystem:${toolsdir}/flyway</flyway.location>
+    <payara.version>4.1.153</payara.version>
+    <was-liberty.version>8.5.5.9</was-liberty.version>
+    <was-liberty.plugin.version>1.1</was-liberty.plugin.version>
+    <wildfly.version>10.0.0.Final</wildfly.version>
+    <wildfly.plugin.version>1.1.0.Alpha7</wildfly.plugin.version>
     <selenium.version>2.53.0</selenium.version>
+    <appium.version>3.4.1</appium.version>
+    <sitwt.version>0.12.2</sitwt.version>
     <cf.appname>${project.artifactId}</cf.appname>
     <cf.target>your target</cf.target>
     <cf.org>your org</cf.org>
     <cf.space>your space</cf.space>
     <cf.instances>1</cf.instances>
-    <cf.memory>512</cf.memory>    
+    <cf.memory>512</cf.memory>
   </properties>
 
   <profiles>
+    <profile>
+      <id>derby</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <db.client.groupId>org.apache.derby</db.client.groupId>
+        <db.client.artifactId>derbyclient</db.client.artifactId>
+        <db.client.version>10.10.1.1</db.client.version>
+        <db.client.lib>${settings.localRepository}/org/apache/derby/derbyclient/${db.client.version}</db.client.lib>
+        <db.jdbc.driver>org.apache.derby.jdbc.ClientDriver</db.jdbc.driver>
+        <db.jdbc.dsclass>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</db.jdbc.dsclass>
+        <db.name>${project.artifactId}-db</db.name>
+        <db.host>localhost</db.host>
+        <db.port>1527</db.port>
+        <db.jdbc.url>jdbc:derby://${db.host}:${db.port}/${db.name};create=true</db.jdbc.url>
+        <db.username>app</db.username>
+        <db.password>app</db.password>
+        <db.was-liberty.ds-properties><![CDATA[<properties.derby.client createDatabase="create" databaseName="${db.name}" serverName="${db.host}" portNumber="${db.port}" user="${db.username}" password="${db.password}" />]]></db.was-liberty.ds-properties>
+        <db.was-liberty.fileset><![CDATA[<fileset dir="${db.client.lib}" />]]></db.was-liberty.fileset>
+        <flyway.location>filesystem:${toolsdir}/derby</flyway.location>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>mysql</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <db.client.groupId>mysql</db.client.groupId>
+        <db.client.artifactId>mysql-connector-java</db.client.artifactId>
+        <db.client.version>5.1.38</db.client.version>
+        <db.client.lib>${settings.localRepository}/mysql/mysql-connector-java/${db.client.version}</db.client.lib>
+        <db.jdbc.driver>com.mysql.jdbc.Driver</db.jdbc.driver>
+        <db.jdbc.dsclass>com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource</db.jdbc.dsclass>
+<!-- Hibernate ToolsはMySQLのハイフン入りDB名に対応していないので注意してください。 -->
+<!-- https://hibernate.atlassian.net/browse/HBX-1175 -->
+<!--         <db.name>${project.artifactId}-db</db.name> -->
+        <db.name>mydb</db.name>
+        <db.host>localhost</db.host>
+        <db.port>3306</db.port>
+        <db.jdbc.url>jdbc:mysql://${db.host}:${db.port}/${db.name}</db.jdbc.url>
+        <db.username>app</db.username>
+        <db.password>app</db.password>
+        <db.was-liberty.ds-properties>&lt;properties databaseName="${db.name}"
+          serverName="${db.host}" portNumber="${db.port}" user="${db.username}"
+          password="${db.password}"/&gt;</db.was-liberty.ds-properties>
+        <db.was-liberty.fileset>&lt;fileset dir="${db.client.lib}"
+          includes="mysql-connector-java-${db.client.version}.jar"/&gt;</db.was-liberty.fileset>
+        <flyway.location>filesystem:${toolsdir}/mysql</flyway.location>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>mysql-bluemix</id>
+      <properties>
+        <mysql.remote>true</mysql.remote>
+        <db.name>dbname</db.name>
+        <db.host>host</db.host>
+        <db.username>username</db.username>
+        <db.password>password</db.password>
+        <cf.service.label>cleardb</cf.service.label>
+        <cf.service.plan>spark</cf.service.plan>
+      </properties>
+    </profile>
+
     <profile>
       <id>db2</id>
       <activation>
diff --git a/javaee7-web-min/src/site/site.xml b/javaee7-web-min/src/site/site.xml
new file mode 100644
index 0000000..47d2d40
--- /dev/null
+++ b/javaee7-web-min/src/site/site.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd">
+  <skin>
+    <groupId>org.apache.maven.skins</groupId>
+    <artifactId>maven-fluido-skin</artifactId>
+    <version>1.5</version>
+  </skin>
+</project>
\ No newline at end of file
diff --git a/javaee7-web-min/tools/derby/migration/V1__create_content_table.sql b/javaee7-web-min/tools/derby/migration/V1__create_content_table.sql
new file mode 100644
index 0000000..fc4f5e2
--- /dev/null
+++ b/javaee7-web-min/tools/derby/migration/V1__create_content_table.sql
@@ -0,0 +1,7 @@
+CREATE TABLE content (
+    id CHAR(3) NOT NULL,
+    value VARCHAR(64),
+    PRIMARY KEY (id)
+);
+
+INSERT INTO content (id, value) VALUES('001', 'Content');
\ No newline at end of file
diff --git a/javaee7-web-min/tools/flyway/V1__create_content_table.sql b/javaee7-web-min/tools/flyway/V1__create_content_table.sql
index b8be48a..fc4f5e2 100644
--- a/javaee7-web-min/tools/flyway/V1__create_content_table.sql
+++ b/javaee7-web-min/tools/flyway/V1__create_content_table.sql
@@ -4,4 +4,4 @@ CREATE TABLE content (
     PRIMARY KEY (id)
 );
 
-INSERT INTO content (id, value) VALUES('001', 'Content');
+INSERT INTO content (id, value) VALUES('001', 'Content');
\ No newline at end of file
diff --git a/javaee7-web-min/tools/hibernate-tools/hibernate.reveng.xml b/javaee7-web-min/tools/hibernate-tools/hibernate.reveng.xml
index 9e8eec9..98a7809 100644
--- a/javaee7-web-min/tools/hibernate-tools/hibernate.reveng.xml
+++ b/javaee7-web-min/tools/hibernate-tools/hibernate.reveng.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-reverse-engineering 
+<!DOCTYPE hibernate-reverse-engineering
   SYSTEM "http://hibernate.sourceforge.net/hibernate-reverse-engineering-3.0.dtd" >
 
 <!-- See also -->
@@ -7,6 +7,7 @@
 
 <hibernate-reverse-engineering>
     <table-filter match-name="schema_version" exclude="true"/>
-    
+
+    <table-filter match-name="content" package="org.sitoolkit.ad.archetype.javaee7min" ></table-filter>
     <table-filter match-name="CONTENT" package="org.sitoolkit.ad.archetype.javaee7min" ></table-filter>
 </hibernate-reverse-engineering>
diff --git a/javaee7-web-min/tools/mysql/build-osx.xml b/javaee7-web-min/tools/mysql/build-osx.xml
new file mode 100644
index 0000000..5bcadbb
--- /dev/null
+++ b/javaee7-web-min/tools/mysql/build-osx.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:if="ant:if" xmlns:unless="ant:unless" name="mysql-osx">
+
+  <property name="mysql.binary" value="mysql-5.7.12-osx10.11-x86_64" />
+  <property name="mysql.binary.file" value="${mysql.binary}.tar.gz" />
+
+
+  <target name="unarchive" unless="${mysql.unarchived}">
+    <untar src="${download.home}/${mysql.binary}.tar.gz"
+           dest="${mysql.basedir}"
+           compression="gzip" />
+    <move file="${mysql.basedir}/${mysql.binary}" tofile="${mysql.basedir}" />
+  </target>
+
+
+  <target name="create-datadir" unless="${mysql.datadir.created}">
+    <chmod perm="u=rwx" file="${mysql.basedir}/bin/**" type="both" failonerror="true" />
+
+    <mkdir dir="${mysql.datadir}" />
+
+    <exec executable="${mysql.basedir}/bin/mysqld" failonerror="true">
+      <arg value="--initialize-insecure" />
+      <arg value="--basedir=${mysql.basedir}" />
+      <arg value="--datadir=${mysql.datadir}" />
+    </exec>
+
+    <exec executable="${mysql.basedir}/bin/mysql_ssl_rsa_setup" failonerror="true">
+      <arg value="--basedir=${mysql.basedir}" />
+      <arg value="--datadir=${mysql.datadir}" />
+    </exec>
+
+  </target>
+
+
+  <target name="create-db" unless="${mysql.db-created}">
+    <copy file="${tool.home}/initialize.sql" todir="${tool.home}/target">
+      <filterset>
+        <filter token="db.name" value="${db.name}" />
+        <filter token="db.username" value="${db.username}" />
+        <filter token="db.password" value="${db.password}" />
+      </filterset>
+    </copy>
+
+    <exec executable="${mysql.basedir}/bin/mysql" failonerror="true">
+      <arg value="--socket=${mysql.socket}" />
+      <arg value="-h" />
+      <arg value="${db.host}" />
+      <arg value="-P" />
+      <arg value="${db.port.local}" />
+      <arg value="-u" />
+      <arg value="root" />
+      <arg value="mysql" />
+      <arg value="-t" />
+      <arg value="-e" />
+      <arg value="source ${tool.home}/target/initialize.sql" />
+    </exec>
+  </target>
+
+
+  <target name="start">
+    <parallel>
+      <daemons>
+        <antcall target="run" />
+      </daemons>
+    </parallel>
+
+    <echo message="Wait for starting MySQL server" />
+    <waitfor maxwait="10" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
+      <available file="${mysql.socket}" />
+    </waitfor>
+
+  </target>
+
+
+  <target name="run">
+    <condition property="mysql.started">
+      <available file="${mysql.socket}" />
+    </condition>
+
+    <echo message="Starting MySQL server ..." unless:true="${mysql.started}" />
+
+    <copy file="${tool.home}/my.cnf"
+          todir="${mysql.datadir}"
+          overwrite="true"
+          unless:true="${mysql.started}">
+      <filterset>
+        <filter token="db.port.local" value="${db.port.local}" />
+        <filter token="mysql.socket" value="${mysql.socket}" />
+      </filterset>
+    </copy>
+
+    <dirname file="${mysql.socket}" property="mysql.socketdir"/>
+    <mkdir dir="${mysql.socketdir}"/>
+
+    <exec executable="${mysql.basedir}/bin/mysqld_safe"
+          dir="${mysql.basedir}"
+          failonerror="true"
+          unless:true="${mysql.started}">
+      <arg value="--defaults-extra-file=${mysql.datadir}/my.cnf" />
+      <arg value="--basedir=${mysql.basedir}" />
+      <arg value="--datadir=${mysql.datadir}" />
+    </exec>
+
+    <echo message="MySQL server is started" />
+
+  </target>
+
+
+  <target name="stop">
+    <echo message="Stopping MySQL server ..." />
+
+    <exec executable="${mysql.basedir}/bin/mysqladmin" dir="${mysql.basedir}">
+      <arg value="--socket=${mysql.socket}" />
+      <arg value="-u" />
+      <arg value="root" />
+      <arg value="shutdown" />
+    </exec>
+  </target>
+
+
+  <target name="drop-datadir">
+    <echo message="Deleting MySQL data directory ${mysql.datadir}" />
+    <antcall target="stop" />
+
+    <delete dir="${mysql.datadir}" />
+  </target>
+</project>
\ No newline at end of file
diff --git a/javaee7-web-min/tools/mysql/build-win.xml b/javaee7-web-min/tools/mysql/build-win.xml
new file mode 100644
index 0000000..a43ebda
--- /dev/null
+++ b/javaee7-web-min/tools/mysql/build-win.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:if="ant:if" xmlns:unless="ant:unless" name="mysql-build-win">
+
+  <property name="mysql.binary" value="mysql-5.7.12-winx64" />
+  <property name="mysql.binary.file" value="${mysql.binary}.zip" />
+
+
+  <target name="unarchive" unless="${mysql.unarchived}">
+    <unzip src="${download.home}/${mysql.binary.file}" dest="${mysql.basedir}" />
+    <move file="${mysql.basedir}/${mysql.binary}" tofile="${mysql.basedir}" />
+  </target>
+
+
+  <target name="create-datadir" unless="${mysql.datadir.created}">
+    <mkdir dir="${mysql.datadir}" />
+
+    <exec executable="${mysql.basedir}/bin/mysqld" failonerror="true">
+      <arg value="--initialize-insecure" />
+      <arg value="--basedir=${mysql.basedir}" />
+      <arg value="--datadir=${mysql.datadir}" />
+    </exec>
+
+  </target>
+
+
+  <target name="install-openssl">
+    <!-- TODO impl -->
+  </target>
+
+
+  <target name="create-db" unless="${mysql.db-created}">
+    <copy file="${tool.home}/initialize.sql" todir="${tool.home}/target">
+      <filterset>
+        <filter token="db.name" value="${db.name}" />
+        <filter token="db.username" value="${db.username}" />
+        <filter token="db.password" value="${db.password}" />
+      </filterset>
+    </copy>
+
+    <exec executable="${mysql.basedir}/bin/mysql" failonerror="true">
+      <arg value="-h" />
+      <arg value="${db.host}" />
+      <arg value="-P" />
+      <arg value="${db.port.local}" />
+      <arg value="-u" />
+      <arg value="root" />
+      <arg value="mysql" />
+      <arg value="-t" />
+      <arg value="-e" />
+      <arg value="source ${tool.home}/target/initialize.sql" />
+    </exec>
+  </target>
+
+
+  <target name="start">
+    <parallel>
+      <daemons>
+        <antcall target="run" />
+      </daemons>
+
+      <sequential>
+        <echo message="Wait for starting MySQL server" />
+        <waitfor maxwait="10" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
+          <socket server="${db.host}" port="${db.port.local}" />
+        </waitfor>
+      </sequential>
+    </parallel>
+
+  </target>
+
+
+  <target name="run">
+    <condition property="mysql.started">
+      <socket server="${db.host}" port="${db.port.local}" />
+    </condition>
+
+    <echo message="Starting MySQL server ..." unless:true="${mysql.started}" />
+
+    <echo message="basedir:${mysql.basedir}" />
+    <echo message="datadir:${mysql.datadir}" />
+
+    <copy file="${tool.home}/my.cnf"
+          todir="${mysql.datadir}"
+          overwrite="true"
+          unless:true="${mysql.started}">
+      <filterset>
+        <filter token="db.port.local" value="${db.port.local}" />
+        <filter token="mysql.socket" value="${mysql.socket}" />
+      </filterset>
+    </copy>
+
+    <exec executable="${mysql.basedir}/bin/mysqld" dir="${mysql.basedir}" failonerror="true" unless:true="${mysql.started}">
+      <arg value="--defaults-extra-file=${mysql.datadir}/my.cnf" />
+      <arg value="--basedir=${mysql.basedir}" />
+      <arg value="--datadir=${mysql.datadir}" />
+    </exec>
+
+    <echo message="MySQL server is started" />
+  </target>
+
+
+  <target name="stop">
+    <echo message="Stopping MySQL server ..." />
+
+    <exec executable="${mysql.basedir}/bin/mysqladmin" dir="${mysql.basedir}">
+      <arg value="-u" />
+      <arg value="root" />
+      <arg value="shutdown" />
+    </exec>
+  </target>
+
+
+</project>
\ No newline at end of file
diff --git a/javaee7-web-min/tools/mysql/build.xml b/javaee7-web-min/tools/mysql/build.xml
new file mode 100644
index 0000000..1f98151
--- /dev/null
+++ b/javaee7-web-min/tools/mysql/build.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:if="ant:if" xmlns:unless="ant:unless" name="mysql-build" default="install">
+
+  <dirname property="tool.home" file="${ant.file}" />
+
+
+  <condition property="os" value="win" else="osx">
+    <os family="windows"/>
+  </condition>
+  <import file="${tool.home}/build-${os}.xml" />
+
+
+  <property name="repository" value="${user.home}/.sitoolkit/repository/mysql" />
+  <property name="download.home" value="${repository}/download" />
+  <property name="mysql.basedir" value="${repository}/runtime/${mysql.binary}" />
+  <condition property="mysql.data" value="data">
+    <not>
+      <isset property="mysql.data" />
+    </not>
+  </condition>
+  <property name="mysql.datadir" value="${tool.home}/${mysql.data}" />
+  <property name="mysql.socket" value="${user.home}/.sitoolkit/project/${project.artifactId}/mysql/${mysql.data}/mysql.sock" />
+  <available property="mysql.downloaded" file="${download.home}/${mysql.binary.file}" />
+  <available property="mysql.unarchived" file="${mysql.basedir}" type="dir" />
+  <available property="mysql.datadir.created" file="${mysql.datadir}" type="dir" />
+  <available property="mysql.db-created" file="${mysql.datadir}/${db.name}" type="dir" />
+
+
+  <target name="install">
+    <antcall target="download" />
+    <echo message="MySQL binary is downloaded in ${download.home}" if:true="${mysql.downloaded}" />
+    <antcall target="unarchive" />
+    <echo message="MySQL binary is unarchived in ${mysql.basedir}" if:true="${mysql.unarchived}" />
+    <antcall target="create-datadir" />
+    <echo message="MySQL data directory is created in ${mysql.datadir}"
+          if:true="${mysql.datadir.created}" />
+    <antcall target="start" />
+    <antcall target="create-db" />
+    <echo message="${db.name} is created in ${mysql.datadir}" if:true="${mysql.db-created}" />
+  </target>
+
+
+  <target name="download" unless="${mysql.downloaded}">
+    <mkdir dir="${download.home}" />
+    <get src="http://dev.mysql.com/get/Downloads/MySQL-5.7/${mysql.binary.file}"
+         dest="${download.home}" />
+  </target>
+
+
+  <target name="drop-datadir">
+    <echo message="Deleting MySQL data directory ${mysql.datadir}" />
+    <antcall target="stop" />
+
+    <delete dir="${mysql.datadir}" />
+  </target>
+</project>
\ No newline at end of file
diff --git a/javaee7-web-min/tools/mysql/initialize.sql b/javaee7-web-min/tools/mysql/initialize.sql
new file mode 100644
index 0000000..fb7662e
--- /dev/null
+++ b/javaee7-web-min/tools/mysql/initialize.sql
@@ -0,0 +1,7 @@
+CREATE DATABASE IF NOT EXISTS `@db.name@` CHARACTER SET UTF8;
+SHOW DATABASES;
+GRANT ALL ON `@db.name@`.* TO `@db.username@` IDENTIFIED BY '@db.password@';
+GRANT FILE ON *.* TO `@db.username@`;
+USE MYSQL;
+SELECT HOST, USER, FILE_PRIV FROM USER;
+SHOW GRANTS FOR `@db.username@`;
diff --git a/javaee7-web-min/tools/mysql/migration/V1__create_content_table.sql b/javaee7-web-min/tools/mysql/migration/V1__create_content_table.sql
new file mode 100644
index 0000000..fc4f5e2
--- /dev/null
+++ b/javaee7-web-min/tools/mysql/migration/V1__create_content_table.sql
@@ -0,0 +1,7 @@
+CREATE TABLE content (
+    id CHAR(3) NOT NULL,
+    value VARCHAR(64),
+    PRIMARY KEY (id)
+);
+
+INSERT INTO content (id, value) VALUES('001', 'Content');
\ No newline at end of file
diff --git a/javaee7-web-min/tools/mysql/my.cnf b/javaee7-web-min/tools/mysql/my.cnf
new file mode 100644
index 0000000..d43cbae
--- /dev/null
+++ b/javaee7-web-min/tools/mysql/my.cnf
@@ -0,0 +1,7 @@
+[client]
+port=@db.port.local@
+socket=@mysql.socket@
+ 
+[mysqld]
+port=@db.port.local@
+socket=@mysql.socket@
diff --git a/javaee7-web-min/tools/was-liberty/jvm.options b/javaee7-web-min/tools/was-liberty/jvm.options
index 784b3f4..74d6e08 100644
--- a/javaee7-web-min/tools/was-liberty/jvm.options
+++ b/javaee7-web-min/tools/was-liberty/jvm.options
@@ -1,4 +1,3 @@
--Dfile.encoding=UTF-8
 -Dwas.debug.mode=true
 -Dcom.ibm.websphere.ras.inject.at.transform=true
 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=7777
diff --git a/javaee7-web-min/tools/wildfly/build.xml b/javaee7-web-min/tools/wildfly/build.xml
index 869ca52..2fea899 100644
--- a/javaee7-web-min/tools/wildfly/build.xml
+++ b/javaee7-web-min/tools/wildfly/build.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="javaee7-web-tips-wildfly" basedir="../../" default="add-user">
-  
-  <property name="jboss.home" value="${basedir}/target/wildfly-run/wildfly-10.0.0.Final"/>
-  
+<project name="javaee7-web-min-wildfly" basedir="../../" default="add-user" xmlns:if="ant:if">
+
+  <property name="jboss.home" value="${basedir}/target/wildfly-run/wildfly-${wildfly.version}"/>
+
   <condition property="add-user" value="${jboss.home}/bin/add-user.bat" else="${jboss.home}/bin/add-user.sh">
     <os family="windows"/>
   </condition>
-  
+
+  <condition property="exec.chmod">
+    <not>
+      <os family="windows"/>
+    </not>
+  </condition>
+
+
   <target name="add-user">
 
-    <exec executable="chmod">
+    <exec executable="chmod" if:true="${exec.chmod}">
       <arg value="777" />
       <arg value="${add-user}" />
     </exec>
diff --git a/javaee7-web-tips/.gitignore b/javaee7-web-tips/.gitignore
index 6ec4261..db7fca5 100644
--- a/javaee7-web-tips/.gitignore
+++ b/javaee7-web-tips/.gitignore
@@ -1,2 +1,6 @@
-target
-.DS_Store
\ No newline at end of file
+/target/
+/tools/derby/data/
+/tools/hibernate-tools/target
+/tools/mysql/data/
+/tools/mysql/target
+.DS_Store
diff --git a/javaee7-web-tips/.settings/javaee7-web-tips_00_build-all.launch b/javaee7-web-tips/.settings/javaee7-web-tips_00_build-all.launch
index 9f092d6..6a7057b 100644
--- a/javaee7-web-tips/.settings/javaee7-web-tips_00_build-all.launch
+++ b/javaee7-web-tips/.settings/javaee7-web-tips_00_build-all.launch
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean verify"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="db-migrate,derby,wildfly,it"/>
-<listAttribute key="M2_PROPERTIES"/>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<intAttribute key="M2_THREADS" value="1"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<stringAttribute key="M2_USER_SETTINGS" value=""/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="JBOSS_HOME" value="${workspace_loc:/javaee7-web-tips}/target/wildfly-run/wildfly-10.0.0.Final"/>
-</mapAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/javaee7-web-tips/}"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean verify"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value="mysql,db-migrate,was-liberty,it"/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="JBOSS_HOME" value="${workspace_loc:/javaee7-web-tips}/target/wildfly-run/wildfly-10.0.0.Final"/>
+</mapAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/javaee7-web-tips/}"/>
+</launchConfiguration>
diff --git a/javaee7-web-tips/.settings/javaee7-web-tips_10_mysql-run.launch b/javaee7-web-tips/.settings/javaee7-web-tips_10_mysql-run.launch
new file mode 100644
index 0000000..7fc7703
--- /dev/null
+++ b/javaee7-web-tips/.settings/javaee7-web-tips_10_mysql-run.launch
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="antrun:run"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value="mysql"/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="mysql=run"/>
+</listAttribute>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/javaee7-web-tips}"/>
+</launchConfiguration>
diff --git a/javaee7-web-tips/.settings/javaee7-web-tips_11_mysql-stop.launch b/javaee7-web-tips/.settings/javaee7-web-tips_11_mysql-stop.launch
new file mode 100644
index 0000000..4d58dc5
--- /dev/null
+++ b/javaee7-web-tips/.settings/javaee7-web-tips_11_mysql-stop.launch
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="antrun:run"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value="mysql"/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="mysql=stop"/>
+</listAttribute>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/javaee7-web-tips}"/>
+</launchConfiguration>
diff --git a/javaee7-web-tips/.settings/javaee7-web-tips_20_wildfly-run.launch b/javaee7-web-tips/.settings/javaee7-web-tips_20_wildfly-run.launch
index 70fde80..a06932a 100644
--- a/javaee7-web-tips/.settings/javaee7-web-tips_20_wildfly-run.launch
+++ b/javaee7-web-tips/.settings/javaee7-web-tips_20_wildfly-run.launch
@@ -12,9 +12,6 @@
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="JBOSS_HOME" value="${workspace_loc:/javaee7-web-tips}/target/wildfly-run/wildfly-10.0.0.Final"/>
-</mapAttribute>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
diff --git a/javaee7-web-tips/.settings/javaee7-web-tips_21_wildfly-stop.launch b/javaee7-web-tips/.settings/javaee7-web-tips_21_wildfly-stop.launch
index 049ade5..0f9d08f 100644
--- a/javaee7-web-tips/.settings/javaee7-web-tips_21_wildfly-stop.launch
+++ b/javaee7-web-tips/.settings/javaee7-web-tips_21_wildfly-stop.launch
@@ -12,9 +12,6 @@
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="JBOSS_HOME" value="${workspace_loc:/javaee7-web-tips}/target/wildfly-run/wildfly-10.0.0.Final"/>
-</mapAttribute>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
diff --git a/javaee7-web-tips/.settings/org.eclipse.jpt.core.prefs b/javaee7-web-tips/.settings/org.eclipse.jpt.core.prefs
index 6f2ab05..3d7690e 100644
--- a/javaee7-web-tips/.settings/org.eclipse.jpt.core.prefs
+++ b/javaee7-web-tips/.settings/org.eclipse.jpt.core.prefs
@@ -1,3 +1,2 @@
 eclipse.preferences.version=1
 org.eclipse.jpt.core.platform=generic2_1
-org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=true
diff --git a/javaee7-web-tips/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/javaee7-web-tips/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
index 392a098..0d46547 100644
--- a/javaee7-web-tips/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
+++ b/javaee7-web-tips/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -1,17 +1,7 @@
-<root>
-  <facet id="jst.jsf">
-    <node name="libprov">
-      <attribute name="provider-id" value="jsf-user-library-provider"/>
-    </node>
-  </facet>
-  <facet id="jpt.jpa">
-    <node name="libprov">
-      <attribute name="provider-id" value="jpa-no-op-library-provider"/>
-    </node>
-  </facet>
-  <facet id="jst.jaxrs">
-    <node name="libprov">
-      <attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
-    </node>
-  </facet>
-</root>
+<root>
+  <facet id="jst.jsf">
+    <node name="libprov">
+      <attribute name="provider-id" value="jsf-user-library-provider"/>
+    </node>
+  </facet>
+</root>
diff --git a/javaee7-web-tips/.settings/org.eclipse.wst.common.project.facet.core.xml b/javaee7-web-tips/.settings/org.eclipse.wst.common.project.facet.core.xml
index 8891f7a..d7f2acf 100644
--- a/javaee7-web-tips/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/javaee7-web-tips/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.8"/>
-  <installed facet="jst.web" version="3.1"/>
-  <installed facet="jst.jsf" version="2.2"/>
-  <installed facet="jpt.jpa" version="2.1"/>
-  <installed facet="jst.jaxrs" version="2.0"/>
-</faceted-project>
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="java" version="1.8"/>
+  <installed facet="jst.web" version="3.1"/>
+  <installed facet="jst.jsf" version="2.2"/>
+</faceted-project>
diff --git a/javaee7-web-tips/distribution/pom.xml b/javaee7-web-tips/distribution/pom.xml
index fc03b57..34a9dde 100644
--- a/javaee7-web-tips/distribution/pom.xml
+++ b/javaee7-web-tips/distribution/pom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd"
->
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <!-- The Basics -->
@@ -28,6 +27,29 @@
       </plugins>
     </pluginManagement>
     <plugins>
+      <!-- 
+        .gitignore isn't included in new archetype because of this issue. 
+        https://issues.apache.org/jira/browse/MRESOURCES-190
+        So it needs to copy explicitly.
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <copy file="${project.basedir}/../../../.gitignore" todir="${project.build.outputDirectory}/archetype-resources"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
diff --git a/javaee7-web-tips/nbactions.xml b/javaee7-web-tips/nbactions.xml
index 08f01af..8272f56 100644
--- a/javaee7-web-tips/nbactions.xml
+++ b/javaee7-web-tips/nbactions.xml
@@ -6,10 +6,11 @@
         <recursive>false</recursive>
         <goals>
             <goal>verify</goal>
+            <goal>-e</goal>
         </goals>
         <activatedProfiles>
+            <activatedProfile>mysql</activatedProfile>
             <activatedProfile>db-migrate</activatedProfile>
-            <activatedProfile>derby</activatedProfile>
             <activatedProfile>was-liberty</activatedProfile>
             <activatedProfile>it</activatedProfile>
         </activatedProfiles>
@@ -18,6 +19,9 @@
             <actionName>CUSTOM-01_db-migrate</actionName>
             <displayName>01_db-migrate</displayName>
             <recursive>false</recursive>
+            <goals>
+                <goal>-e</goal>
+            </goals>
             <activatedProfiles>
                 <activatedProfile>db-migrate</activatedProfile>
             </activatedProfiles>
@@ -29,6 +33,22 @@
             <goals>
                 <goal>derby:run</goal>
             </goals>
+            <activatedProfiles>
+                <activatedProfile>derby</activatedProfile>
+            </activatedProfiles>
+        </action>
+    <action>
+            <actionName>CUSTOM-10_mysql-run</actionName>
+            <displayName>10_mysql-run</displayName>
+            <goals>
+                <goal>-e</goal>
+            </goals>
+            <properties>
+                <mysql>run</mysql>
+            </properties>
+            <activatedProfiles>
+                <activatedProfile>mysql</activatedProfile>
+            </activatedProfiles>
         </action>
     <action>
             <actionName>CUSTOM-11_derby-stop</actionName>
@@ -37,6 +57,19 @@
             <goals>
                 <goal>derby:stop</goal>
             </goals>
+            <activatedProfiles>
+                <activatedProfile>deeby</activatedProfile>
+            </activatedProfiles>
+        </action>
+    <action>
+            <actionName>CUSTOM-11_mysql-stop</actionName>
+            <displayName>11_mysql-stop</displayName>
+            <properties>
+                <mysql>stop</mysql>
+            </properties>
+            <activatedProfiles>
+                <activatedProfile>mysql</activatedProfile>
+            </activatedProfiles>
         </action>
     <action>
             <actionName>CUSTOM-20_was-liberty-run</actionName>
@@ -46,6 +79,13 @@
                 <activatedProfile>was-liberty</activatedProfile>
             </activatedProfiles>
         </action>
+    <action>
+            <actionName>CUSTOM-20_wildfly-run</actionName>
+            <displayName>20_wildfly-run</displayName>
+            <activatedProfiles>
+                <activatedProfile>wildfly</activatedProfile>
+            </activatedProfiles>
+        </action>
     <action>
             <actionName>CUSTOM-21_was-liberty-stop</actionName>
             <displayName>21_was-liberty-stop</displayName>
@@ -57,6 +97,16 @@
                 <activatedProfile>was-liberty</activatedProfile>
             </activatedProfiles>
         </action>
+    <action>
+            <actionName>CUSTOM-21_wildfly-stop</actionName>
+            <displayName>21_wildfly-stop</displayName>
+            <goals>
+                <goal>wildfly:shutdown</goal>
+            </goals>
+            <activatedProfiles>
+                <activatedProfile>wildfly</activatedProfile>
+            </activatedProfiles>
+        </action>Ï
     <action>
             <actionName>CUSTOM-30_it</actionName>
             <displayName>30_it</displayName>
@@ -67,5 +117,15 @@
             <activatedProfiles>
                 <activatedProfile>it</activatedProfile>
             </activatedProfiles>
-        </action>Ï
+        </action>
+    <action>
+            <actionName>CUSTOM-40_site</actionName>
+            <displayName>40_site</displayName>
+            <goals>
+                <goal>site</goal>
+            </goals>
+            <activatedProfiles>
+                <activatedProfile>db-migrate</activatedProfile>
+            </activatedProfiles>
+        </action>
 </actions>
diff --git a/javaee7-web-tips/pom.xml b/javaee7-web-tips/pom.xml
index dbd0b52..0b2e07b 100644
--- a/javaee7-web-tips/pom.xml
+++ b/javaee7-web-tips/pom.xml
@@ -23,6 +23,12 @@
       <artifactId>logback-classic</artifactId>
       <version>1.1.3</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.jpa</artifactId>
+      <version>2.6.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>${db.client.groupId}</groupId>
       <artifactId>${db.client.artifactId}</artifactId>
@@ -33,31 +39,24 @@
   <parent>
     <groupId>org.sitoolkit.ad.archetype</groupId>
     <artifactId>javaee7-web</artifactId>
-    <version>0.12</version>
+    <version>0.13</version>
   </parent>
   <properties>
-    <db.client.groupId>org.apache.derby</db.client.groupId>
-    <db.client.artifactId>derbyclient</db.client.artifactId>
-    <db.client.version>10.10.1.1</db.client.version>
-    <db.client.lib>${settings.localRepository}/org/apache/derby/derbyclient/${db.client.version}</db.client.lib>
-    <db.jdbc.driver>org.apache.derby.jdbc.ClientDriver</db.jdbc.driver>
-    <db.jdbc.dsclass>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</db.jdbc.dsclass>
-    <db.name>${project.artifactId}-db</db.name>
-    <db.host>localhost</db.host>
-    <db.port>1527</db.port>
-    <db.jdbc.url>jdbc:derby://${db.host}:${db.port}/${db.name};create=true</db.jdbc.url>
-    <db.username>app</db.username>
-    <db.password>app</db.password>
-    <db.flyway.comment></db.flyway.comment>
-    <db.was-liberty.ds-properties><![CDATA[<properties.derby.client createDatabase="create" databaseName="${db.name}" serverName="${db.host}" portNumber="${db.port}" user="${db.username}" password="${db.password}" />]]></db.was-liberty.ds-properties>
-    <db.was-liberty.fileset><![CDATA[<fileset dir="${db.client.lib}" />]]></db.was-liberty.fileset>
+    <flyway.location>filesystem:${toolsdir}/flyway</flyway.location>
+    <payara.version>4.1.153</payara.version>
+    <was-liberty.version>8.5.5.9</was-liberty.version>
+    <was-liberty.plugin.version>1.1</was-liberty.plugin.version>
+    <wildfly.version>10.0.0.Final</wildfly.version>
+    <wildfly.plugin.version>1.1.0.Alpha7</wildfly.plugin.version>
     <selenium.version>2.53.0</selenium.version>
+    <appium.version>3.4.1</appium.version>
+    <sitwt.version>0.12.2</sitwt.version>
     <cf.appname>${project.artifactId}</cf.appname>
     <cf.target>your target</cf.target>
     <cf.org>your org</cf.org>
     <cf.space>your space</cf.space>
     <cf.instances>1</cf.instances>
-    <cf.memory>512</cf.memory>    
+    <cf.memory>512</cf.memory>
   </properties>
 
   <!-- Build Settings -->
@@ -66,10 +65,72 @@
 
   <profiles>
     <profile>
-      <id>db2</id>
+      <id>derby</id>
+      <properties>
+        <db.client.groupId>org.apache.derby</db.client.groupId>
+        <db.client.artifactId>derbyclient</db.client.artifactId>
+        <db.client.version>10.10.1.1</db.client.version>
+        <db.client.lib>${settings.localRepository}/org/apache/derby/derbyclient/${db.client.version}</db.client.lib>
+        <db.jdbc.driver>org.apache.derby.jdbc.ClientDriver</db.jdbc.driver>
+        <db.jdbc.dsclass>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</db.jdbc.dsclass>
+        <db.name>${project.artifactId}-db</db.name>
+        <db.host>localhost</db.host>
+        <db.port>1527</db.port>
+        <db.jdbc.url>jdbc:derby://${db.host}:${db.port}/${db.name};create=true</db.jdbc.url>
+        <db.username>app</db.username>
+        <db.password>app</db.password>
+        <db.flyway.comment></db.flyway.comment>
+        <db.was-liberty.ds-properties><![CDATA[<properties.derby.client createDatabase="create" databaseName="${db.name}" serverName="${db.host}" portNumber="${db.port}" user="${db.username}" password="${db.password}" />]]></db.was-liberty.ds-properties>
+        <db.was-liberty.fileset><![CDATA[<fileset dir="${db.client.lib}" />]]></db.was-liberty.fileset>
+        <flyway.location>filesystem:${toolsdir}/derby</flyway.location>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>mysql</id>
       <activation>
-        <activeByDefault>false</activeByDefault>
+        <activeByDefault>true</activeByDefault>
       </activation>
+      <properties>
+        <db.client.groupId>mysql</db.client.groupId>
+        <db.client.artifactId>mysql-connector-java</db.client.artifactId>
+        <db.client.version>5.1.38</db.client.version>
+        <db.client.lib>${settings.localRepository}/mysql/mysql-connector-java/${db.client.version}</db.client.lib>
+        <db.jdbc.driver>com.mysql.jdbc.Driver</db.jdbc.driver>
+        <db.jdbc.dsclass>com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource</db.jdbc.dsclass>
+<!-- Hibernate ToolsはMySQLのハイフン入りDB名に対応していないので注意してください。 -->
+<!-- https://hibernate.atlassian.net/browse/HBX-1175 -->
+<!--         <db.name>${project.artifactId}-db</db.name> -->
+        <db.name>mydb</db.name>
+        <db.host>localhost</db.host>
+        <db.port>3306</db.port>
+        <db.jdbc.url>jdbc:mysql://${db.host}:${db.port}/${db.name}</db.jdbc.url>
+        <db.username>app</db.username>
+        <db.password>app</db.password>
+        <db.was-liberty.ds-properties>&lt;properties databaseName="${db.name}"
+          serverName="${db.host}" portNumber="${db.port}" user="${db.username}"
+          password="${db.password}"/&gt;</db.was-liberty.ds-properties>
+        <db.was-liberty.fileset>&lt;fileset dir="${db.client.lib}"
+          includes="mysql-connector-java-${db.client.version}.jar"/&gt;</db.was-liberty.fileset>
+        <flyway.location>filesystem:${toolsdir}/mysql</flyway.location>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>mysql-bluemix</id>
+      <properties>
+        <mysql.remote>true</mysql.remote>
+        <db.name>dbname</db.name>
+        <db.host>host</db.host>
+        <db.username>username</db.username>
+        <db.password>password</db.password>
+        <cf.service.label>cleardb</cf.service.label>
+        <cf.service.plan>spark</cf.service.plan>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>db2</id>
       <properties>
         <db.client.groupId>com.ibm.db2</db.client.groupId>
         <db.client.artifactId>db2jcc</db.client.artifactId>
@@ -99,9 +160,6 @@
 
     <profile>
       <id>oracle</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
       <properties>
         <db.client.groupId>com.oracle</db.client.groupId>
         <db.client.artifactId>ojdbc6</db.client.artifactId>
diff --git "a/javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/domain/code/\346\200\247\345\210\245Cd.java" b/javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/domain/code/GenderCd.java
similarity index 80%
rename from "javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/domain/code/\346\200\247\345\210\245Cd.java"
rename to javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/domain/code/GenderCd.java
index 09178c6..e6abb7c 100644
--- "a/javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/domain/code/\346\200\247\345\210\245Cd.java"
+++ b/javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/domain/code/GenderCd.java
@@ -5,10 +5,10 @@
 /**
  * 
  **/
-public enum 性別Cd implements Code {
+public enum GenderCd implements Code {
     男性("1"), 女性("2"),;
 
-    private 性別Cd(String value) {
+    private GenderCd(String value) {
         this.value = value;
     }
 
diff --git a/javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/domain/user/UserEntity.java b/javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/domain/user/UserEntity.java
index e2cf230..adbca93 100644
--- a/javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/domain/user/UserEntity.java
+++ b/javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/domain/user/UserEntity.java
@@ -7,7 +7,7 @@
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
-import org.sitoolkit.ad.archetype.tips.domain.code.性別Cd;
+import org.sitoolkit.ad.archetype.tips.domain.code.GenderCd;
 import org.sitoolkit.ad.archetype.tips.infrastructure.code.CodeUtils;
 import org.sitoolkit.ad.archetype.tips.infrastructure.data.jpa.BaseEntityListener;
 
@@ -34,11 +34,11 @@ public String getPassword() {
         return super.getPassword();
     }
 
-    public 性別Cd getGenderCd() {
-        return CodeUtils.decode(getGender(), 性別Cd.class);
+    public GenderCd getGenderCd() {
+        return CodeUtils.decode(getGender(), GenderCd.class);
     }
 
-    public void setGenderCd(性別Cd gender) {
+    public void setGenderCd(GenderCd gender) {
         setGender(gender.getValue());
     }
 
diff --git a/javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/presentation/UserInputController.java b/javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/presentation/UserInputController.java
index 3973641..76f7cb8 100644
--- a/javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/presentation/UserInputController.java
+++ b/javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/presentation/UserInputController.java
@@ -7,7 +7,7 @@
 import javax.inject.Named;
 
 import org.sitoolkit.ad.archetype.tips.application.user.UserService;
-import org.sitoolkit.ad.archetype.tips.domain.code.性別Cd;
+import org.sitoolkit.ad.archetype.tips.domain.code.GenderCd;
 import org.sitoolkit.ad.archetype.tips.domain.user.UserEntity;
 import org.sitoolkit.ad.archetype.tips.infrastructure.entitycrud.EntityInputController;
 
@@ -29,8 +29,8 @@ public class UserInputController extends EntityInputController<UserEntity, Strin
     @Inject
     transient UserService service;
 
-    public 性別Cd[] get性別() {
-        return 性別Cd.values();
+    public GenderCd[] get性別() {
+        return GenderCd.values();
     }
 
     @Override
diff --git a/javaee7-web-tips/src/site/site.xml b/javaee7-web-tips/src/site/site.xml
new file mode 100644
index 0000000..47d2d40
--- /dev/null
+++ b/javaee7-web-tips/src/site/site.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd">
+  <skin>
+    <groupId>org.apache.maven.skins</groupId>
+    <artifactId>maven-fluido-skin</artifactId>
+    <version>1.5</version>
+  </skin>
+</project>
\ No newline at end of file
diff --git a/javaee7-web-tips/testscript/IntegrationTest.xlsx b/javaee7-web-tips/testscript/IntegrationTest.xlsx
index d91dd6d..1f14b11 100644
Binary files a/javaee7-web-tips/testscript/IntegrationTest.xlsx and b/javaee7-web-tips/testscript/IntegrationTest.xlsx differ
diff --git a/javaee7-web-tips/tools/derby/migration/V1__create_user_and_group.sql b/javaee7-web-tips/tools/derby/migration/V1__create_user_and_group.sql
new file mode 100644
index 0000000..f431c7a
--- /dev/null
+++ b/javaee7-web-tips/tools/derby/migration/V1__create_user_and_group.sql
@@ -0,0 +1,43 @@
+CREATE TABLE user_entity (
+    user_id VARCHAR(10) NOT NULL,
+    password VARCHAR (128) NOT NULL,
+    last_name VARCHAR (32) ,
+    first_name VARCHAR (32) ,
+    gender CHAR (1) ,
+    deleted_flg CHAR(1) DEFAULT '0' NOT NULL,
+    created TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    created_by VARCHAR(10) NOT NULL,
+    updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_by VARCHAR(10),
+    PRIMARY KEY (user_id)
+);
+
+CREATE TABLE group_entity (
+    group_code CHAR(8) NOT NULL,
+    group_name VARCHAR (64) ,
+    deleted_flg CHAR(1) DEFAULT '0' NOT NULL,
+    created TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    created_by VARCHAR(10) NOT NULL,
+    updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_by VARCHAR(10),
+    PRIMARY KEY (group_code)
+);
+
+CREATE TABLE user_group_relation (
+    user_id VARCHAR(10) NOT NULL ,
+    group_code CHAR (8) NOT NULL,
+    deleted_flg CHAR(1) DEFAULT '0' NOT NULL,
+    created TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    created_by VARCHAR(10) NOT NULL,
+    updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL ,
+    updated_by VARCHAR(10),
+    FOREIGN KEY (user_id) REFERENCES user_entity (user_id) ,
+    FOREIGN KEY (group_code) REFERENCES group_entity (group_code) ,
+    PRIMARY KEY (user_id, group_code)
+);
+
+
+CALL SYSCS_UTIL.SYSCS_IMPORT_DATA (null, 'USER_ENTITY', null, null, '${data}/user_entity.csv', ',', '"', 'Shift_JIS', 0);
+CALL SYSCS_UTIL.SYSCS_IMPORT_DATA (null, 'GROUP_ENTITY', null, null, '${data}/group_entity.csv', ',', '"', 'Shift_JIS', 0);
+CALL SYSCS_UTIL.SYSCS_IMPORT_DATA (null, 'USER_GROUP_RELATION', null, null, '${data}/user_group_relation.csv', ',', '"', 'Shift_JIS', 0);
+
diff --git a/javaee7-web-tips/tools/flyway/migration/V1__create_user_and_group.sql b/javaee7-web-tips/tools/flyway/migration/V1__create_user_and_group.sql
index 2386c2d..d9212d5 100644
--- a/javaee7-web-tips/tools/flyway/migration/V1__create_user_and_group.sql
+++ b/javaee7-web-tips/tools/flyway/migration/V1__create_user_and_group.sql
@@ -1,39 +1,39 @@
-CREATE TABLE user_entity (
-    user_id VARCHAR(10) NOT NULL,
-    password VARCHAR (128) NOT NULL,
-    last_name VARCHAR (32) ,
-    first_name VARCHAR (32) ,
-    gender CHAR (1) ,
-    deleted_flg CHAR(1) DEFAULT '0' NOT NULL,
-    created TIMESTAMP NOT NULL,
-    created_by VARCHAR(10) NOT NULL,
-    updated TIMESTAMP NOT NULL,
-    updated_by VARCHAR(10),
-    PRIMARY KEY (user_id)
+CREATE TABLE USER_ENTITY (
+    USER_ID VARCHAR(10) NOT NULL,
+    PASSWORD VARCHAR (128) NOT NULL,
+    LAST_NAME VARCHAR (32) ,
+    FIRST_NAME VARCHAR (32) ,
+    GENDER CHAR (1) ,
+    DELETED_FLG CHAR(1) DEFAULT '0' NOT NULL,
+    CREATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    CREATED_BY VARCHAR(10) NOT NULL,
+    UPDATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    UPDATED_BY VARCHAR(10),
+    PRIMARY KEY (USER_ID)
 );
 
-CREATE TABLE group_entity (
-    group_code CHAR(8) NOT NULL,
-    group_name VARCHAR (64) ,
-    deleted_flg CHAR(1) DEFAULT '0' NOT NULL,
-    created TIMESTAMP NOT NULL,
-    created_by VARCHAR(10) NOT NULL,
-    updated TIMESTAMP NOT NULL,
-    updated_by VARCHAR(10),
-    PRIMARY KEY (group_code)
+CREATE TABLE GROUP_ENTITY (
+    GROUP_CODE CHAR(8) NOT NULL,
+    GROUP_NAME VARCHAR (64) ,
+    DELETED_FLG CHAR(1) DEFAULT '0' NOT NULL,
+    CREATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    CREATED_BY VARCHAR(10) NOT NULL,
+    UPDATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    UPDATED_BY VARCHAR(10),
+    PRIMARY KEY (GROUP_CODE)
 );
 
-CREATE TABLE user_group_relation (
-    user_id VARCHAR(10) NOT NULL ,
-    group_code CHAR (8) NOT NULL,
-    deleted_flg CHAR(1) DEFAULT '0' NOT NULL,
-    created TIMESTAMP NOT NULL,
-    created_by VARCHAR(10) NOT NULL,
-    updated TIMESTAMP NOT NULL ,
-    updated_by VARCHAR(10),
-    FOREIGN KEY (user_id) REFERENCES user_entity (user_id) ,
-    FOREIGN KEY (group_code) REFERENCES group_entity (group_code) ,
-    PRIMARY KEY (user_id, group_code)
+CREATE TABLE USER_GROUP_RELATION (
+    USER_ID VARCHAR(10) NOT NULL ,
+    GROUP_CODE CHAR (8) NOT NULL,
+    DELETED_FLG CHAR(1) DEFAULT '0' NOT NULL,
+    CREATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    CREATED_BY VARCHAR(10) NOT NULL,
+    UPDATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL ,
+    UPDATED_BY VARCHAR(10),
+    FOREIGN KEY (USER_ID) REFERENCES USER_ENTITY (USER_ID) ,
+    FOREIGN KEY (GROUP_CODE) REFERENCES GROUP_ENTITY (GROUP_CODE) ,
+    PRIMARY KEY (USER_ID, GROUP_CODE)
 );
 
 
diff --git a/javaee7-web-tips/tools/hibernate-tools/hibernate.reveng.xml b/javaee7-web-tips/tools/hibernate-tools/hibernate.reveng.xml
index 297149a..2291886 100644
--- a/javaee7-web-tips/tools/hibernate-tools/hibernate.reveng.xml
+++ b/javaee7-web-tips/tools/hibernate-tools/hibernate.reveng.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-reverse-engineering 
+<!DOCTYPE hibernate-reverse-engineering
   SYSTEM "http://hibernate.sourceforge.net/hibernate-reverse-engineering-3.0.dtd" >
 
 <!-- See also -->
@@ -12,6 +12,7 @@
   </type-mapping>
 
   <table-filter match-name="schema_version" exclude="true" />
+  <table-filter match-name="user_entity" package="org.sitoolkit.ad.archetype.tips.domain.user"></table-filter>
   <table-filter match-name="USER_ENTITY" package="org.sitoolkit.ad.archetype.tips.domain.user"></table-filter>
 
 </hibernate-reverse-engineering>
diff --git a/javaee7-web-tips/tools/mysql/build-osx.xml b/javaee7-web-tips/tools/mysql/build-osx.xml
new file mode 100644
index 0000000..5bcadbb
--- /dev/null
+++ b/javaee7-web-tips/tools/mysql/build-osx.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:if="ant:if" xmlns:unless="ant:unless" name="mysql-osx">
+
+  <property name="mysql.binary" value="mysql-5.7.12-osx10.11-x86_64" />
+  <property name="mysql.binary.file" value="${mysql.binary}.tar.gz" />
+
+
+  <target name="unarchive" unless="${mysql.unarchived}">
+    <untar src="${download.home}/${mysql.binary}.tar.gz"
+           dest="${mysql.basedir}"
+           compression="gzip" />
+    <move file="${mysql.basedir}/${mysql.binary}" tofile="${mysql.basedir}" />
+  </target>
+
+
+  <target name="create-datadir" unless="${mysql.datadir.created}">
+    <chmod perm="u=rwx" file="${mysql.basedir}/bin/**" type="both" failonerror="true" />
+
+    <mkdir dir="${mysql.datadir}" />
+
+    <exec executable="${mysql.basedir}/bin/mysqld" failonerror="true">
+      <arg value="--initialize-insecure" />
+      <arg value="--basedir=${mysql.basedir}" />
+      <arg value="--datadir=${mysql.datadir}" />
+    </exec>
+
+    <exec executable="${mysql.basedir}/bin/mysql_ssl_rsa_setup" failonerror="true">
+      <arg value="--basedir=${mysql.basedir}" />
+      <arg value="--datadir=${mysql.datadir}" />
+    </exec>
+
+  </target>
+
+
+  <target name="create-db" unless="${mysql.db-created}">
+    <copy file="${tool.home}/initialize.sql" todir="${tool.home}/target">
+      <filterset>
+        <filter token="db.name" value="${db.name}" />
+        <filter token="db.username" value="${db.username}" />
+        <filter token="db.password" value="${db.password}" />
+      </filterset>
+    </copy>
+
+    <exec executable="${mysql.basedir}/bin/mysql" failonerror="true">
+      <arg value="--socket=${mysql.socket}" />
+      <arg value="-h" />
+      <arg value="${db.host}" />
+      <arg value="-P" />
+      <arg value="${db.port.local}" />
+      <arg value="-u" />
+      <arg value="root" />
+      <arg value="mysql" />
+      <arg value="-t" />
+      <arg value="-e" />
+      <arg value="source ${tool.home}/target/initialize.sql" />
+    </exec>
+  </target>
+
+
+  <target name="start">
+    <parallel>
+      <daemons>
+        <antcall target="run" />
+      </daemons>
+    </parallel>
+
+    <echo message="Wait for starting MySQL server" />
+    <waitfor maxwait="10" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
+      <available file="${mysql.socket}" />
+    </waitfor>
+
+  </target>
+
+
+  <target name="run">
+    <condition property="mysql.started">
+      <available file="${mysql.socket}" />
+    </condition>
+
+    <echo message="Starting MySQL server ..." unless:true="${mysql.started}" />
+
+    <copy file="${tool.home}/my.cnf"
+          todir="${mysql.datadir}"
+          overwrite="true"
+          unless:true="${mysql.started}">
+      <filterset>
+        <filter token="db.port.local" value="${db.port.local}" />
+        <filter token="mysql.socket" value="${mysql.socket}" />
+      </filterset>
+    </copy>
+
+    <dirname file="${mysql.socket}" property="mysql.socketdir"/>
+    <mkdir dir="${mysql.socketdir}"/>
+
+    <exec executable="${mysql.basedir}/bin/mysqld_safe"
+          dir="${mysql.basedir}"
+          failonerror="true"
+          unless:true="${mysql.started}">
+      <arg value="--defaults-extra-file=${mysql.datadir}/my.cnf" />
+      <arg value="--basedir=${mysql.basedir}" />
+      <arg value="--datadir=${mysql.datadir}" />
+    </exec>
+
+    <echo message="MySQL server is started" />
+
+  </target>
+
+
+  <target name="stop">
+    <echo message="Stopping MySQL server ..." />
+
+    <exec executable="${mysql.basedir}/bin/mysqladmin" dir="${mysql.basedir}">
+      <arg value="--socket=${mysql.socket}" />
+      <arg value="-u" />
+      <arg value="root" />
+      <arg value="shutdown" />
+    </exec>
+  </target>
+
+
+  <target name="drop-datadir">
+    <echo message="Deleting MySQL data directory ${mysql.datadir}" />
+    <antcall target="stop" />
+
+    <delete dir="${mysql.datadir}" />
+  </target>
+</project>
\ No newline at end of file
diff --git a/javaee7-web-tips/tools/mysql/build-win.xml b/javaee7-web-tips/tools/mysql/build-win.xml
new file mode 100644
index 0000000..a43ebda
--- /dev/null
+++ b/javaee7-web-tips/tools/mysql/build-win.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:if="ant:if" xmlns:unless="ant:unless" name="mysql-build-win">
+
+  <property name="mysql.binary" value="mysql-5.7.12-winx64" />
+  <property name="mysql.binary.file" value="${mysql.binary}.zip" />
+
+
+  <target name="unarchive" unless="${mysql.unarchived}">
+    <unzip src="${download.home}/${mysql.binary.file}" dest="${mysql.basedir}" />
+    <move file="${mysql.basedir}/${mysql.binary}" tofile="${mysql.basedir}" />
+  </target>
+
+
+  <target name="create-datadir" unless="${mysql.datadir.created}">
+    <mkdir dir="${mysql.datadir}" />
+
+    <exec executable="${mysql.basedir}/bin/mysqld" failonerror="true">
+      <arg value="--initialize-insecure" />
+      <arg value="--basedir=${mysql.basedir}" />
+      <arg value="--datadir=${mysql.datadir}" />
+    </exec>
+
+  </target>
+
+
+  <target name="install-openssl">
+    <!-- TODO impl -->
+  </target>
+
+
+  <target name="create-db" unless="${mysql.db-created}">
+    <copy file="${tool.home}/initialize.sql" todir="${tool.home}/target">
+      <filterset>
+        <filter token="db.name" value="${db.name}" />
+        <filter token="db.username" value="${db.username}" />
+        <filter token="db.password" value="${db.password}" />
+      </filterset>
+    </copy>
+
+    <exec executable="${mysql.basedir}/bin/mysql" failonerror="true">
+      <arg value="-h" />
+      <arg value="${db.host}" />
+      <arg value="-P" />
+      <arg value="${db.port.local}" />
+      <arg value="-u" />
+      <arg value="root" />
+      <arg value="mysql" />
+      <arg value="-t" />
+      <arg value="-e" />
+      <arg value="source ${tool.home}/target/initialize.sql" />
+    </exec>
+  </target>
+
+
+  <target name="start">
+    <parallel>
+      <daemons>
+        <antcall target="run" />
+      </daemons>
+
+      <sequential>
+        <echo message="Wait for starting MySQL server" />
+        <waitfor maxwait="10" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
+          <socket server="${db.host}" port="${db.port.local}" />
+        </waitfor>
+      </sequential>
+    </parallel>
+
+  </target>
+
+
+  <target name="run">
+    <condition property="mysql.started">
+      <socket server="${db.host}" port="${db.port.local}" />
+    </condition>
+
+    <echo message="Starting MySQL server ..." unless:true="${mysql.started}" />
+
+    <echo message="basedir:${mysql.basedir}" />
+    <echo message="datadir:${mysql.datadir}" />
+
+    <copy file="${tool.home}/my.cnf"
+          todir="${mysql.datadir}"
+          overwrite="true"
+          unless:true="${mysql.started}">
+      <filterset>
+        <filter token="db.port.local" value="${db.port.local}" />
+        <filter token="mysql.socket" value="${mysql.socket}" />
+      </filterset>
+    </copy>
+
+    <exec executable="${mysql.basedir}/bin/mysqld" dir="${mysql.basedir}" failonerror="true" unless:true="${mysql.started}">
+      <arg value="--defaults-extra-file=${mysql.datadir}/my.cnf" />
+      <arg value="--basedir=${mysql.basedir}" />
+      <arg value="--datadir=${mysql.datadir}" />
+    </exec>
+
+    <echo message="MySQL server is started" />
+  </target>
+
+
+  <target name="stop">
+    <echo message="Stopping MySQL server ..." />
+
+    <exec executable="${mysql.basedir}/bin/mysqladmin" dir="${mysql.basedir}">
+      <arg value="-u" />
+      <arg value="root" />
+      <arg value="shutdown" />
+    </exec>
+  </target>
+
+
+</project>
\ No newline at end of file
diff --git a/javaee7-web-tips/tools/mysql/build.xml b/javaee7-web-tips/tools/mysql/build.xml
new file mode 100644
index 0000000..1f98151
--- /dev/null
+++ b/javaee7-web-tips/tools/mysql/build.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:if="ant:if" xmlns:unless="ant:unless" name="mysql-build" default="install">
+
+  <dirname property="tool.home" file="${ant.file}" />
+
+
+  <condition property="os" value="win" else="osx">
+    <os family="windows"/>
+  </condition>
+  <import file="${tool.home}/build-${os}.xml" />
+
+
+  <property name="repository" value="${user.home}/.sitoolkit/repository/mysql" />
+  <property name="download.home" value="${repository}/download" />
+  <property name="mysql.basedir" value="${repository}/runtime/${mysql.binary}" />
+  <condition property="mysql.data" value="data">
+    <not>
+      <isset property="mysql.data" />
+    </not>
+  </condition>
+  <property name="mysql.datadir" value="${tool.home}/${mysql.data}" />
+  <property name="mysql.socket" value="${user.home}/.sitoolkit/project/${project.artifactId}/mysql/${mysql.data}/mysql.sock" />
+  <available property="mysql.downloaded" file="${download.home}/${mysql.binary.file}" />
+  <available property="mysql.unarchived" file="${mysql.basedir}" type="dir" />
+  <available property="mysql.datadir.created" file="${mysql.datadir}" type="dir" />
+  <available property="mysql.db-created" file="${mysql.datadir}/${db.name}" type="dir" />
+
+
+  <target name="install">
+    <antcall target="download" />
+    <echo message="MySQL binary is downloaded in ${download.home}" if:true="${mysql.downloaded}" />
+    <antcall target="unarchive" />
+    <echo message="MySQL binary is unarchived in ${mysql.basedir}" if:true="${mysql.unarchived}" />
+    <antcall target="create-datadir" />
+    <echo message="MySQL data directory is created in ${mysql.datadir}"
+          if:true="${mysql.datadir.created}" />
+    <antcall target="start" />
+    <antcall target="create-db" />
+    <echo message="${db.name} is created in ${mysql.datadir}" if:true="${mysql.db-created}" />
+  </target>
+
+
+  <target name="download" unless="${mysql.downloaded}">
+    <mkdir dir="${download.home}" />
+    <get src="http://dev.mysql.com/get/Downloads/MySQL-5.7/${mysql.binary.file}"
+         dest="${download.home}" />
+  </target>
+
+
+  <target name="drop-datadir">
+    <echo message="Deleting MySQL data directory ${mysql.datadir}" />
+    <antcall target="stop" />
+
+    <delete dir="${mysql.datadir}" />
+  </target>
+</project>
\ No newline at end of file
diff --git a/javaee7-web-tips/tools/mysql/initialize.sql b/javaee7-web-tips/tools/mysql/initialize.sql
new file mode 100644
index 0000000..fb7662e
--- /dev/null
+++ b/javaee7-web-tips/tools/mysql/initialize.sql
@@ -0,0 +1,7 @@
+CREATE DATABASE IF NOT EXISTS `@db.name@` CHARACTER SET UTF8;
+SHOW DATABASES;
+GRANT ALL ON `@db.name@`.* TO `@db.username@` IDENTIFIED BY '@db.password@';
+GRANT FILE ON *.* TO `@db.username@`;
+USE MYSQL;
+SELECT HOST, USER, FILE_PRIV FROM USER;
+SHOW GRANTS FOR `@db.username@`;
diff --git a/javaee7-web-tips/tools/mysql/migration/V1__create_user_and_group.sql b/javaee7-web-tips/tools/mysql/migration/V1__create_user_and_group.sql
new file mode 100644
index 0000000..f7c60f0
--- /dev/null
+++ b/javaee7-web-tips/tools/mysql/migration/V1__create_user_and_group.sql
@@ -0,0 +1,48 @@
+CREATE TABLE user_entity (
+    user_id VARCHAR(10) NOT NULL,
+    password VARCHAR (128) NOT NULL,
+    last_name VARCHAR (32) ,
+    first_name VARCHAR (32) ,
+    gender CHAR (1) ,
+    deleted_flg CHAR(1) DEFAULT '0' NOT NULL,
+    -- multiple "auto update timestamp column" is only supported with MySQL 5.7 or higher
+--    created TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    created TIMESTAMP DEFAULT '1970-01-01 09:00:01' NOT NULL,
+    created_by VARCHAR(10) NOT NULL,
+--    updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL,
+    updated TIMESTAMP DEFAULT '1970-01-01 09:00:01' NOT NULL,
+    updated_by VARCHAR(10),
+    PRIMARY KEY (user_id)
+);
+
+CREATE TABLE group_entity (
+    group_code CHAR(8) NOT NULL,
+    group_name VARCHAR (64) ,
+    deleted_flg CHAR(1) DEFAULT '0' NOT NULL,
+--    created TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    created TIMESTAMP DEFAULT '1970-01-01 09:00:01' NOT NULL,
+    created_by VARCHAR(10) NOT NULL,
+--    updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL,
+    updated TIMESTAMP DEFAULT '1970-01-01 09:00:01' NOT NULL,
+    updated_by VARCHAR(10),
+    PRIMARY KEY (group_code)
+);
+
+CREATE TABLE user_group_relation (
+    user_id VARCHAR(10) NOT NULL ,
+    group_code CHAR (8) NOT NULL,
+    deleted_flg CHAR(1) DEFAULT '0' NOT NULL,
+--    created TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    created TIMESTAMP DEFAULT '1970-01-01 09:00:01' NOT NULL,
+    created_by VARCHAR(10) NOT NULL,
+--    updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL,
+    updated TIMESTAMP DEFAULT '1970-01-01 09:00:01' NOT NULL,
+    updated_by VARCHAR(10),
+    FOREIGN KEY (user_id) REFERENCES user_entity (user_id) ,
+    FOREIGN KEY (group_code) REFERENCES group_entity (group_code) ,
+    PRIMARY KEY (user_id, group_code)
+);
+
+LOAD DATA LOCAL INFILE 'tools/flyway/data/user_entity.csv' INTO TABLE user_entity CHARACTER SET sjis FIELDS TERMINATED BY ',' ENCLOSED BY '"' LINES TERMINATED BY '\r\n';
+LOAD DATA LOCAL INFILE 'tools/flyway/data/group_entity.csv' INTO TABLE group_entity CHARACTER SET sjis FIELDS TERMINATED BY ',' ENCLOSED BY '"' LINES TERMINATED BY '\r\n';
+LOAD DATA LOCAL INFILE 'tools/flyway/data/user_group_relation.csv' INTO TABLE user_group_relation CHARACTER SET sjis FIELDS TERMINATED BY ',' ENCLOSED BY '"' LINES TERMINATED BY '\r\n';
diff --git a/javaee7-web-tips/tools/mysql/my.cnf b/javaee7-web-tips/tools/mysql/my.cnf
new file mode 100644
index 0000000..d43cbae
--- /dev/null
+++ b/javaee7-web-tips/tools/mysql/my.cnf
@@ -0,0 +1,7 @@
+[client]
+port=@db.port.local@
+socket=@mysql.socket@
+ 
+[mysqld]
+port=@db.port.local@
+socket=@mysql.socket@
diff --git a/javaee7-web-tips/tools/was-liberty/jvm.options b/javaee7-web-tips/tools/was-liberty/jvm.options
index 784b3f4..74d6e08 100644
--- a/javaee7-web-tips/tools/was-liberty/jvm.options
+++ b/javaee7-web-tips/tools/was-liberty/jvm.options
@@ -1,4 +1,3 @@
--Dfile.encoding=UTF-8
 -Dwas.debug.mode=true
 -Dcom.ibm.websphere.ras.inject.at.transform=true
 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=7777
diff --git a/javaee7-web-tips/tools/wildfly/build.xml b/javaee7-web-tips/tools/wildfly/build.xml
index 700d763..8adfc38 100644
--- a/javaee7-web-tips/tools/wildfly/build.xml
+++ b/javaee7-web-tips/tools/wildfly/build.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="javaee7-web-tips-wildfly" basedir="../../" default="add-user">
-  
-  <property name="jboss.home" value="${basedir}/target/wildfly-run/wildfly-10.0.0.Final"/>
-  
+<project name="javaee7-web-tips-wildfly" basedir="../../" default="add-user" xmlns:if="ant:if">
+
+  <property name="jboss.home" value="${basedir}/target/wildfly-run/wildfly-${wildfly.version}"/>
+
   <condition property="add-user" value="${jboss.home}/bin/add-user.bat" else="${jboss.home}/bin/add-user.sh">
     <os family="windows"/>
   </condition>
-  
+
+  <condition property="exec.chmod">
+    <not>
+      <os family="windows"/>
+    </not>
+  </condition>
+
+
   <target name="add-user">
 
-    <exec executable="chmod">
+    <exec executable="chmod" if:true="${exec.chmod}">
       <arg value="777" />
       <arg value="${add-user}" />
     </exec>
diff --git a/pom.xml b/pom.xml
index c8bca17..3dc71fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.sitoolkit.ad.archetype</groupId>
   <artifactId>javaee7-web</artifactId>
-  <version>0.12</version>
+  <version>0.13</version>
   <packaging>pom</packaging>
 
   <!-- The Basics -->
@@ -87,12 +87,6 @@
       <version>${deltaspike.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.persistence</groupId>
-      <artifactId>org.eclipse.persistence.jpa</artifactId>
-      <version>2.6.2</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -104,7 +98,6 @@
     <toolsdir>${project.basedir}/tools</toolsdir>
     <hibernate-tools.basedir>${toolsdir}/hibernate-tools</hibernate-tools.basedir>
     <hibernate-tools.destdir>${project.build.directory}/generated-sources/hibernate-tools</hibernate-tools.destdir>
-    <payara.version>4.1.153</payara.version>
     <deltaspike.version>1.5.4</deltaspike.version>
     <jpa.provider>org.eclipse.persistence.jpa.PersistenceProvider</jpa.provider>
     <skipUTs>false</skipUTs>
@@ -137,15 +130,6 @@
     </testResources>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.carlspring.maven</groupId>
-          <artifactId>derby-maven-plugin</artifactId>
-          <version>1.10</version>
-          <configuration>
-            <derbyHome>${toolsdir}/derby/target</derbyHome>
-            <port>${db.port}</port>
-          </configuration>
-        </plugin>
         <plugin>
           <groupId>org.flywaydb</groupId>
           <artifactId>flyway-maven-plugin</artifactId>
@@ -155,7 +139,7 @@
             <user>${db.username}</user>
             <password>${db.password}</password>
             <locations>
-              <location>filesystem:${toolsdir}/flyway</location>
+              <location>${flyway.location}</location>
             </locations>
             <placeholders>
               <data>${toolsdir}/flyway/data</data>
@@ -351,7 +335,7 @@
               <artifactId>derby-maven-plugin</artifactId>
               <version>1.10</version>
               <configuration>
-                <derbyHome>${toolsdir}/derby/target</derbyHome>
+                <derbyHome>${toolsdir}/derby/data</derbyHome>
                 <port>${db.port}</port>
               </configuration>
             </plugin>
@@ -363,28 +347,28 @@
             <artifactId>derby-maven-plugin</artifactId>
             <executions>
               <execution>
-                <id>start-on-initialize</id>
+                <id>start-in-initialize</id>
                 <phase>initialize</phase>
                 <goals>
                   <goal>start</goal>
                 </goals>
               </execution>
               <execution>
-                <id>stop-on-post-integration-test</id>
+                <id>stop-in-post-integration-test</id>
                 <phase>post-integration-test</phase>
                 <goals>
                   <goal>stop</goal>
                 </goals>
               </execution>
               <execution>
-                <id>start-on-presite</id>
+                <id>start-in-pre-site</id>
                 <phase>pre-site</phase>
                 <goals>
                   <goal>start</goal>
                 </goals>
               </execution>
               <execution>
-                <id>stop-on-post-site</id>
+                <id>stop-in-post-site</id>
                 <phase>post-site-test</phase>
                 <goals>
                   <goal>stop</goal>
@@ -396,6 +380,76 @@
       </build>
     </profile>
 
+    <profile>
+      <id>mysql</id>
+      <activation>
+        <property>
+          <name>mysql</name>
+        </property>
+      </activation>
+      <properties>
+        <mysql.antfile>${toolsdir}/mysql/build.xml</mysql.antfile>
+        <mysql>install</mysql>
+      </properties>
+      <build>
+        <defaultGoal>antrun:run</defaultGoal>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <configuration>
+              <skip>${mysql.remote}</skip>
+              <target>
+                <property name="db.port.local" value="${db.port}" />
+                <echo message="set property : db.port.local=${db.port.local}" />
+                <ant antfile="${mysql.antfile}" target="${mysql}" />
+              </target>
+            </configuration>
+            <executions>
+              <execution>
+                <id>mysql-run-in-initialize</id>
+                <phase>initialize</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>mysql-stop-in-post-integration-test</id>
+                <phase>post-integration-test</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <ant antfile="${mysql.antfile}" target="stop" />
+                  </target>
+                </configuration>
+              </execution>
+              <execution>
+                <id>mysql-run-in-pre-site</id>
+                <phase>pre-site</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>mysql-stop-in-post-site</id>
+                <phase>post-site</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <ant antfile="${mysql.antfile}" target="stop" />
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <id>db-migrate</id>
       <build>
@@ -406,6 +460,7 @@
             <artifactId>flyway-maven-plugin</artifactId>
             <executions>
               <execution>
+                <id>flyway-migrate-in-generate-sources</id>
                 <phase>generate-sources</phase>
                 <goals>
                   <goal>migrate</goal>
@@ -420,7 +475,7 @@
               <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-tools</artifactId>
-                <version>4.3.2.Final</version>
+                <version>4.3.3.Final</version>
                 <exclusions>
                   <exclusion>
                     <groupId>ant</groupId>
@@ -436,15 +491,18 @@
             </dependencies>
             <executions>
               <execution>
-                <id>run-hibernate-tools</id>
+                <id>hibernate-tools-run-in-generate-sources</id>
                 <phase>generate-sources</phase>
                 <goals>
                   <goal>run</goal>
                 </goals>
                 <configuration>
                   <target>
+                    <!-- このdummyプロパティを入れずにmvn compile -P mysql,db-migrationを実行するとantのbuildがエラーとなる。 -->
+                    <!-- (Hibernate Toolsがクラスパスに含まれずコンパイルエラー) -->
+                    <property name="dummy" value="dummy" />
                     <property name="maven.classpath" refid="maven.plugin.classpath" />
-                    <ant antfile="${hibernate-tools.basedir}/build.xml" />
+                    <ant antfile="${hibernate-tools.basedir}/build.xml" target="hbm2java" />
                   </target>
                 </configuration>
               </execution>
@@ -587,12 +645,12 @@
           <plugin>
             <groupId>net.wasdev.wlp.maven.plugins</groupId>
             <artifactId>liberty-maven-plugin</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>${was-liberty.plugin.version}</version>
             <configuration>
               <assemblyArtifact>
                 <groupId>com.ibm.websphere.appserver.runtime</groupId>
                 <artifactId>wlp-javaee7</artifactId>
-                <version>8.5.5.9</version>
+                <version>${was-liberty.version}</version>
                 <type>zip</type>
               </assemblyArtifact>
               <configFile>${project.build.directory}/server.xml</configFile>
@@ -681,7 +739,7 @@
           <plugin>
             <groupId>org.wildfly.plugins</groupId>
             <artifactId>wildfly-maven-plugin</artifactId>
-            <version>1.0.2.Final</version>
+            <version>${wildfly.plugin.version}</version>
             <configuration>
               <propertiesFile>${project.build.directory}/wildfly.properties</propertiesFile>
               <beforeDeployment>
@@ -690,6 +748,10 @@
                   <script>${project.build.directory}/setup.cli</script>
                 </scripts>
               </beforeDeployment>
+              <version>${wildfly.version}</version>
+              <env>
+                <JBOSS_HOME>${project.build.directory}/wildfly-run/wildfly-${wildfly.version}</JBOSS_HOME>
+              </env>
             </configuration>
             <executions>
               <execution>
@@ -739,12 +801,6 @@
           <artifactId>sit-wt-runtime</artifactId>
           <version>${sitwt.version}</version>
           <scope>test</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>org.seleniumhq.selenium</groupId>
-              <artifactId>selenium-java</artifactId>
-            </exclusion>
-          </exclusions>
         </dependency>
         <dependency>
           <groupId>org.seleniumhq.selenium</groupId>
@@ -752,13 +808,19 @@
           <version>${selenium.version}</version>
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>io.appium</groupId>
+          <artifactId>java-client</artifactId>
+          <version>${appium.version}</version>
+          <scope>test</scope>
+        </dependency>
       </dependencies>
       <properties>
         <maven.test.skip>false</maven.test.skip>
         <skipUTs>true</skipUTs>
-        <sitwt.version>0.11.1</sitwt.version>
       </properties>
       <build>
+        <defaultGoal>verify</defaultGoal>
         <plugins>
           <plugin>
             <groupId>org.sitoolkit.wt</groupId>
@@ -800,7 +862,7 @@
         </plugins>
       </build>
     </profile>
-    
+
     <profile>
       <id>cf</id>
       <build>