From 44b8e10d2dec672f0cb824c3bd17d62a917a5832 Mon Sep 17 00:00:00 2001 From: Yuichi Kuwhara Date: Mon, 18 Apr 2016 22:00:52 +0900 Subject: [PATCH 01/16] v0.12 -> v0.13-SNAPSHOT --- build.xml | 16 +++++++++------- javaee7-web-min/pom.xml | 2 +- javaee7-web-tips/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/build.xml b/build.xml index bd68c61..abd1ae6 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ - + - + - + - + - + + - + + - + \ No newline at end of file diff --git a/javaee7-web-min/pom.xml b/javaee7-web-min/pom.xml index 4a6213a..75b83fd 100755 --- a/javaee7-web-min/pom.xml +++ b/javaee7-web-min/pom.xml @@ -9,7 +9,7 @@ org.sitoolkit.ad.archetype javaee7-web - 0.12 + 0.13-SNAPSHOT org.apache.derby diff --git a/javaee7-web-tips/pom.xml b/javaee7-web-tips/pom.xml index dbd0b52..54575b5 100644 --- a/javaee7-web-tips/pom.xml +++ b/javaee7-web-tips/pom.xml @@ -33,7 +33,7 @@ org.sitoolkit.ad.archetype javaee7-web - 0.12 + 0.13-SNAPSHOT org.apache.derby diff --git a/pom.xml b/pom.xml index c8bca17..ec0579a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.sitoolkit.ad.archetype javaee7-web - 0.12 + 0.13-SNAPSHOT pom From 76f1d83735589d18382566921db3e9458c726af2 Mon Sep 17 00:00:00 2001 From: "yuichi.kuwahara" Date: Sun, 24 Apr 2016 17:47:13 +0900 Subject: [PATCH 02/16] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=80=81=E4=B8=8D?= =?UTF-8?q?=E5=AE=89=E5=AE=9A=E3=81=AAEclpse=20Facet=E3=82=92=E9=99=A4?= =?UTF-8?q?=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.settings/org.eclipse.jpt.core.prefs | 1 - ...se.wst.common.project.facet.core.prefs.xml | 5 ---- ....eclipse.wst.common.project.facet.core.xml | 1 - .../.settings/org.eclipse.jpt.core.prefs | 1 - ...se.wst.common.project.facet.core.prefs.xml | 24 ++++++------------- ....eclipse.wst.common.project.facet.core.xml | 18 +++++++------- 6 files changed, 15 insertions(+), 35 deletions(-) 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 @@ - - - - - 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 @@ - 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 @@ - - - - - - - - - - - - - - - - - + + + + + + + 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 @@ - - - - - - - - - - + + + + + + + + From c315b1d51dd229838c2052a1f08f77d76e10af9e Mon Sep 17 00:00:00 2001 From: "yuichi.kuwahara" Date: Sun, 24 Apr 2016 18:03:53 +0900 Subject: [PATCH 03/16] =?UTF-8?q?Windows=E3=81=A7=E5=AE=9F=E8=A1=8C?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=E3=82=8B=E3=82=88=E3=81=86=E3=81=ABtask?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20#12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- javaee7-web-min/tools/wildfly/build.xml | 17 ++++++++++++----- javaee7-web-tips/tools/wildfly/build.xml | 17 ++++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/javaee7-web-min/tools/wildfly/build.xml b/javaee7-web-min/tools/wildfly/build.xml index 869ca52..a9371cc 100644 --- a/javaee7-web-min/tools/wildfly/build.xml +++ b/javaee7-web-min/tools/wildfly/build.xml @@ -1,15 +1,22 @@ - - + + - + - + + + + + + + + - + diff --git a/javaee7-web-tips/tools/wildfly/build.xml b/javaee7-web-tips/tools/wildfly/build.xml index 700d763..579a1e3 100644 --- a/javaee7-web-tips/tools/wildfly/build.xml +++ b/javaee7-web-tips/tools/wildfly/build.xml @@ -1,15 +1,22 @@ - - + + - + - + + + + + + + + - + From 9b41c4a99fe9351dafa74c938357585abc3454d9 Mon Sep 17 00:00:00 2001 From: Yuichi Kuwhara Date: Sun, 24 Apr 2016 18:38:56 +0900 Subject: [PATCH 04/16] =?UTF-8?q?Wildfly=E3=81=AE=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E6=8C=87=E5=AE=9A=E7=AE=87=E6=89=80?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.settings/javaee7-web-min_20_wildfly-run.launch | 3 --- ...y-stop.launch => javaee7-web-min_21_wildfly-stop.launch} | 3 --- javaee7-web-min/pom.xml | 2 ++ javaee7-web-min/tools/wildfly/build.xml | 2 +- .../.settings/javaee7-web-tips_20_wildfly-run.launch | 3 --- .../.settings/javaee7-web-tips_21_wildfly-stop.launch | 3 --- javaee7-web-tips/pom.xml | 2 ++ javaee7-web-tips/tools/wildfly/build.xml | 2 +- pom.xml | 6 +++++- 9 files changed, 11 insertions(+), 15 deletions(-) rename javaee7-web-min/.settings/{javaee7-web-tips_21_wildfly-stop.launch => javaee7-web-min_21_wildfly-stop.launch} (85%) 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 @@ - - - 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 @@ - - - diff --git a/javaee7-web-min/pom.xml b/javaee7-web-min/pom.xml index 75b83fd..988fb47 100755 --- a/javaee7-web-min/pom.xml +++ b/javaee7-web-min/pom.xml @@ -12,6 +12,8 @@ 0.13-SNAPSHOT + 10.0.0.Final + 1.1.0.Alpha7 org.apache.derby derbyclient 10.10.1.1 diff --git a/javaee7-web-min/tools/wildfly/build.xml b/javaee7-web-min/tools/wildfly/build.xml index a9371cc..2fea899 100644 --- a/javaee7-web-min/tools/wildfly/build.xml +++ b/javaee7-web-min/tools/wildfly/build.xml @@ -1,7 +1,7 @@ - + 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 @@ - - - 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 @@ - - - diff --git a/javaee7-web-tips/pom.xml b/javaee7-web-tips/pom.xml index 54575b5..1d1c8e7 100644 --- a/javaee7-web-tips/pom.xml +++ b/javaee7-web-tips/pom.xml @@ -36,6 +36,8 @@ 0.13-SNAPSHOT + 10.0.0.Final + 1.1.0.Alpha7 org.apache.derby derbyclient 10.10.1.1 diff --git a/javaee7-web-tips/tools/wildfly/build.xml b/javaee7-web-tips/tools/wildfly/build.xml index 579a1e3..8adfc38 100644 --- a/javaee7-web-tips/tools/wildfly/build.xml +++ b/javaee7-web-tips/tools/wildfly/build.xml @@ -1,7 +1,7 @@ - + diff --git a/pom.xml b/pom.xml index ec0579a..d7762f9 100644 --- a/pom.xml +++ b/pom.xml @@ -681,7 +681,7 @@ org.wildfly.plugins wildfly-maven-plugin - 1.0.2.Final + ${wildfly.plugin.version} ${project.build.directory}/wildfly.properties @@ -690,6 +690,10 @@ + ${wildfly.version} + + ${project.build.directory}/wildfly-run/wildfly-${wildfly.version} + From 208e35240ba71b9655e9ac2a076af3e6fafc79d4 Mon Sep 17 00:00:00 2001 From: Yuichi Kuwhara Date: Sun, 24 Apr 2016 18:40:51 +0900 Subject: [PATCH 05/16] =?UTF-8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB?= =?UTF-8?q?=E3=83=88=E3=81=AEAP=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=92was-liberty=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- javaee7-web-tips/.settings/javaee7-web-tips_00_build-all.launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..b10c137 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 @@ -4,7 +4,7 @@ - + From 8b93d73eaa66d0d76b57c905a166ea39397b445c Mon Sep 17 00:00:00 2001 From: Yuichi Kuwhara Date: Tue, 26 Apr 2016 05:16:29 +0900 Subject: [PATCH 06/16] =?UTF-8?q?payara,=20was-liberty=E3=81=AE=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E5=AD=90pom?= =?UTF-8?q?=E3=81=AB=E7=A7=BB=E5=8B=95=20=E5=8D=98=E4=BD=93=E3=83=86?= =?UTF-8?q?=E3=82=B9=E3=83=88=E7=94=A8=E3=81=AEJPA=E3=83=97=E3=83=AD?= =?UTF-8?q?=E3=83=90=E3=82=A4=E3=83=80=E3=81=AEdependency=E3=82=92?= =?UTF-8?q?=E5=AD=90pom=E3=81=AB=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- javaee7-web-min/pom.xml | 2 ++ javaee7-web-tips/pom.xml | 9 +++++++++ pom.xml | 11 ++--------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/javaee7-web-min/pom.xml b/javaee7-web-min/pom.xml index 988fb47..7f82f60 100755 --- a/javaee7-web-min/pom.xml +++ b/javaee7-web-min/pom.xml @@ -12,6 +12,8 @@ 0.13-SNAPSHOT + 8.5.5.9 + 1.2-SNAPSHOT 10.0.0.Final 1.1.0.Alpha7 org.apache.derby diff --git a/javaee7-web-tips/pom.xml b/javaee7-web-tips/pom.xml index 1d1c8e7..dd81857 100644 --- a/javaee7-web-tips/pom.xml +++ b/javaee7-web-tips/pom.xml @@ -23,6 +23,12 @@ logback-classic 1.1.3 + + org.eclipse.persistence + org.eclipse.persistence.jpa + 2.6.2 + test + ${db.client.groupId} ${db.client.artifactId} @@ -36,6 +42,9 @@ 0.13-SNAPSHOT + 4.1.153 + 8.5.5.9 + 1.2-SNAPSHOT 10.0.0.Final 1.1.0.Alpha7 org.apache.derby diff --git a/pom.xml b/pom.xml index d7762f9..9c86978 100644 --- a/pom.xml +++ b/pom.xml @@ -87,12 +87,6 @@ ${deltaspike.version} test - - org.eclipse.persistence - org.eclipse.persistence.jpa - 2.6.2 - test - UTF-8 @@ -104,7 +98,6 @@ ${project.basedir}/tools ${toolsdir}/hibernate-tools ${project.build.directory}/generated-sources/hibernate-tools - 4.1.153 1.5.4 org.eclipse.persistence.jpa.PersistenceProvider false @@ -587,12 +580,12 @@ net.wasdev.wlp.maven.plugins liberty-maven-plugin - 1.2-SNAPSHOT + ${was-liberty.plugin.version} com.ibm.websphere.appserver.runtime wlp-javaee7 - 8.5.5.9 + ${was-liberty.version} zip ${project.build.directory}/server.xml From 9e97978515bdada83f5186b5f3fdae946f08b3ae Mon Sep 17 00:00:00 2001 From: Yuichi Kuwhara Date: Mon, 2 May 2016 19:03:28 +0900 Subject: [PATCH 07/16] =?UTF-8?q?MySQL=E5=AF=BE=E5=BF=9C=20#13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.xml | 212 ++++++++++-------- .../javaee7-web-min_00_build-all.launch | 44 ++-- .../javaee7-web-min_10_mysql-run.launch | 23 ++ .../javaee7-web-min_11_mysql-stop.launch | 23 ++ .../org.eclipse.core.resources.prefs | 1 - javaee7-web-min/nbactions.xml | 64 +++++- javaee7-web-min/pom.xml | 75 +++++-- .../migration/V1__create_content_table.sql | 7 + .../tools/flyway/V1__create_content_table.sql | 2 +- .../hibernate-tools/hibernate.reveng.xml | 5 +- javaee7-web-min/tools/mysql/.gitignore | 1 + javaee7-web-min/tools/mysql/build-osx.xml | 127 +++++++++++ javaee7-web-min/tools/mysql/build-win.xml | 113 ++++++++++ javaee7-web-min/tools/mysql/build.xml | 56 +++++ javaee7-web-min/tools/mysql/initialize.sql | 7 + .../migration/V1__create_content_table.sql | 7 + javaee7-web-min/tools/mysql/my.cnf | 7 + .../javaee7-web-tips_00_build-all.launch | 46 ++-- .../javaee7-web-tips_10_mysql-run.launch | 23 ++ .../javaee7-web-tips_11_mysql-stop.launch | 23 ++ javaee7-web-tips/nbactions.xml | 64 +++++- javaee7-web-tips/pom.xml | 74 ++++-- .../migration/V1__create_user_and_group.sql | 43 ++++ .../migration/V1__create_user_and_group.sql | 64 +++--- .../hibernate-tools/hibernate.reveng.xml | 3 +- javaee7-web-tips/tools/mysql/.gitignore | 1 + javaee7-web-tips/tools/mysql/build-osx.xml | 127 +++++++++++ javaee7-web-tips/tools/mysql/build-win.xml | 113 ++++++++++ javaee7-web-tips/tools/mysql/build.xml | 56 +++++ javaee7-web-tips/tools/mysql/initialize.sql | 7 + .../migration/V1__create_user_and_group.sql | 41 ++++ javaee7-web-tips/tools/mysql/my.cnf | 7 + pom.xml | 91 +++++++- 33 files changed, 1334 insertions(+), 223 deletions(-) create mode 100644 javaee7-web-min/.settings/javaee7-web-min_10_mysql-run.launch create mode 100644 javaee7-web-min/.settings/javaee7-web-min_11_mysql-stop.launch create mode 100644 javaee7-web-min/tools/derby/migration/V1__create_content_table.sql create mode 100644 javaee7-web-min/tools/mysql/.gitignore create mode 100644 javaee7-web-min/tools/mysql/build-osx.xml create mode 100644 javaee7-web-min/tools/mysql/build-win.xml create mode 100644 javaee7-web-min/tools/mysql/build.xml create mode 100644 javaee7-web-min/tools/mysql/initialize.sql create mode 100644 javaee7-web-min/tools/mysql/migration/V1__create_content_table.sql create mode 100644 javaee7-web-min/tools/mysql/my.cnf create mode 100644 javaee7-web-tips/.settings/javaee7-web-tips_10_mysql-run.launch create mode 100644 javaee7-web-tips/.settings/javaee7-web-tips_11_mysql-stop.launch create mode 100644 javaee7-web-tips/tools/derby/migration/V1__create_user_and_group.sql create mode 100644 javaee7-web-tips/tools/mysql/.gitignore create mode 100644 javaee7-web-tips/tools/mysql/build-osx.xml create mode 100644 javaee7-web-tips/tools/mysql/build-win.xml create mode 100644 javaee7-web-tips/tools/mysql/build.xml create mode 100644 javaee7-web-tips/tools/mysql/initialize.sql create mode 100644 javaee7-web-tips/tools/mysql/migration/V1__create_user_and_group.sql create mode 100644 javaee7-web-tips/tools/mysql/my.cnf diff --git a/build.xml b/build.xml index abd1ae6..ac2c709 100644 --- a/build.xml +++ b/build.xml @@ -5,26 +5,50 @@ basedir="." default="install"> + + + + - - - + + - - - + value="${artifactId}/target/generated-sources/archetype/src/main/resources/archetype-resources" /> + + + + + + + + + - - - @@ -43,59 +67,53 @@ - + - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + - + - + + @@ -104,10 +122,13 @@ + - + + + @@ -115,18 +136,16 @@ - - - - + + + + - - + + - - - + @@ -142,82 +161,95 @@ - - - - + + + + + + + + + + - - + + + + + + + + - - - - - - + + + + + + - + + - + - + - - - - - - + + + + + + - + + - + - + - - - - + + + + - - + + + - + - + - - + + @@ -227,21 +259,21 @@ - + - - + + - - + + - + - + \ No newline at end of file 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 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + 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/=UTF-8 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 @@ false verify + -e + mysql db-migrate - derby was-liberty it @@ -18,6 +19,9 @@ CUSTOM-01_db-migrate 01_db-migrate false + + -e + db-migrate @@ -29,6 +33,22 @@ derby:run + + derby + + + + CUSTOM-10_mysql-run + 10_mysql-run + + -e + + + run + + + mysql + CUSTOM-11_derby-stop @@ -37,6 +57,19 @@ derby:stop + + deeby + + + + CUSTOM-11_mysql-stop + 11_mysql-stop + + stop + + + mysql + CUSTOM-20_was-liberty-run @@ -46,6 +79,13 @@ was-liberty + + CUSTOM-20_wildfly-run + 20_wildfly-run + + wildfly + + CUSTOM-21_was-liberty-stop 21_was-liberty-stop @@ -57,6 +97,16 @@ was-liberty + + CUSTOM-21_wildfly-stop + 21_wildfly-stop + + wildfly:shutdown + + + wildfly + + Ï CUSTOM-30_it 30_it @@ -67,5 +117,15 @@ it - Ï + + + CUSTOM-40_site + 40_site + + site + + + db-migrate + + diff --git a/javaee7-web-min/pom.xml b/javaee7-web-min/pom.xml index 7f82f60..5948b2e 100755 --- a/javaee7-web-min/pom.xml +++ b/javaee7-web-min/pom.xml @@ -12,35 +12,76 @@ 0.13-SNAPSHOT + filesystem:${toolsdir}/flyway + 4.1.153 8.5.5.9 - 1.2-SNAPSHOT + 1.1 10.0.0.Final 1.1.0.Alpha7 - org.apache.derby - derbyclient - 10.10.1.1 - ${settings.localRepository}/org/apache/derby/derbyclient/${db.client.version} - org.apache.derby.jdbc.ClientDriver - org.apache.derby.jdbc.ClientConnectionPoolDataSource40 - ${project.artifactId}-db - localhost - 1527 - jdbc:derby://${db.host}:${db.port}/${db.name};create=true - app - app - aaa - ]]> - ]]> 2.53.0 ${project.artifactId} your target your org your space 1 - 512 + 512 + + derby + + false + + + org.apache.derby + derbyclient + 10.10.1.1 + ${settings.localRepository}/org/apache/derby/derbyclient/${db.client.version} + org.apache.derby.jdbc.ClientDriver + org.apache.derby.jdbc.ClientConnectionPoolDataSource40 + ${project.artifactId}-db + localhost + 1527 + jdbc:derby://${db.host}:${db.port}/${db.name};create=true + app + app + ]]> + ]]> + filesystem:${toolsdir}/derby + + + + + mysql + + true + + + mysql + mysql-connector-java + 5.1.38 + ${settings.localRepository}/mysql/mysql-connector-java/${db.client.version} + com.mysql.jdbc.Driver + com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource + + + + mydb + localhost + 3306 + jdbc:mysql://${db.host}:${db.port}/${db.name} + app + app + <properties databaseName="${db.name}" + serverName="${db.host}" portNumber="${db.port}" user="${db.username}" + password="${db.password}"/> + <fileset dir="${db.client.lib}" + includes="mysql-connector-java-${db.client.version}.jar"/> + filesystem:${toolsdir}/mysql + + + db2 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 @@ - @@ -7,6 +7,7 @@ - + + diff --git a/javaee7-web-min/tools/mysql/.gitignore b/javaee7-web-min/tools/mysql/.gitignore new file mode 100644 index 0000000..82f0c3a --- /dev/null +++ b/javaee7-web-min/tools/mysql/.gitignore @@ -0,0 +1 @@ +/data/ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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-tips/.settings/javaee7-web-tips_00_build-all.launch b/javaee7-web-tips/.settings/javaee7-web-tips_00_build-all.launch index b10c137..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 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + 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 @@ false verify + -e + mysql db-migrate - derby was-liberty it @@ -18,6 +19,9 @@ CUSTOM-01_db-migrate 01_db-migrate false + + -e + db-migrate @@ -29,6 +33,22 @@ derby:run + + derby + + + + CUSTOM-10_mysql-run + 10_mysql-run + + -e + + + run + + + mysql + CUSTOM-11_derby-stop @@ -37,6 +57,19 @@ derby:stop + + deeby + + + + CUSTOM-11_mysql-stop + 11_mysql-stop + + stop + + + mysql + CUSTOM-20_was-liberty-run @@ -46,6 +79,13 @@ was-liberty + + CUSTOM-20_wildfly-run + 20_wildfly-run + + wildfly + + CUSTOM-21_was-liberty-stop 21_was-liberty-stop @@ -57,6 +97,16 @@ was-liberty + + CUSTOM-21_wildfly-stop + 21_wildfly-stop + + wildfly:shutdown + + + wildfly + + Ï CUSTOM-30_it 30_it @@ -67,5 +117,15 @@ it - Ï + + + CUSTOM-40_site + 40_site + + site + + + db-migrate + + diff --git a/javaee7-web-tips/pom.xml b/javaee7-web-tips/pom.xml index dd81857..fd17387 100644 --- a/javaee7-web-tips/pom.xml +++ b/javaee7-web-tips/pom.xml @@ -42,33 +42,19 @@ 0.13-SNAPSHOT + filesystem:${toolsdir}/flyway 4.1.153 8.5.5.9 1.2-SNAPSHOT 10.0.0.Final 1.1.0.Alpha7 - org.apache.derby - derbyclient - 10.10.1.1 - ${settings.localRepository}/org/apache/derby/derbyclient/${db.client.version} - org.apache.derby.jdbc.ClientDriver - org.apache.derby.jdbc.ClientConnectionPoolDataSource40 - ${project.artifactId}-db - localhost - 1527 - jdbc:derby://${db.host}:${db.port}/${db.name};create=true - app - app - - ]]> - ]]> 2.53.0 ${project.artifactId} your target your org your space 1 - 512 + 512 @@ -77,10 +63,59 @@ - db2 + derby + + org.apache.derby + derbyclient + 10.10.1.1 + ${settings.localRepository}/org/apache/derby/derbyclient/${db.client.version} + org.apache.derby.jdbc.ClientDriver + org.apache.derby.jdbc.ClientConnectionPoolDataSource40 + ${project.artifactId}-db + localhost + 1527 + jdbc:derby://${db.host}:${db.port}/${db.name};create=true + app + app + + ]]> + ]]> + filesystem:${toolsdir}/derby + + + + + mysql - false + true + + mysql + mysql-connector-java + 5.1.38 + ${settings.localRepository}/mysql/mysql-connector-java/${db.client.version} + com.mysql.jdbc.Driver + com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource + + + + mydb + localhost + 3306 + jdbc:mysql://${db.host}:${db.port}/${db.name} + app + app + <properties databaseName="${db.name}" + serverName="${db.host}" portNumber="${db.port}" user="${db.username}" + password="${db.password}"/> + <fileset dir="${db.client.lib}" + includes="mysql-connector-java-${db.client.version}.jar"/> + filesystem:${toolsdir}/mysql + + + + + db2 com.ibm.db2 db2jcc @@ -110,9 +145,6 @@ oracle - - false - com.oracle ojdbc6 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 @@ - @@ -12,6 +12,7 @@ + diff --git a/javaee7-web-tips/tools/mysql/.gitignore b/javaee7-web-tips/tools/mysql/.gitignore new file mode 100644 index 0000000..82f0c3a --- /dev/null +++ b/javaee7-web-tips/tools/mysql/.gitignore @@ -0,0 +1 @@ +/data/ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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..e9852bf --- /dev/null +++ b/javaee7-web-tips/tools/mysql/migration/V1__create_user_and_group.sql @@ -0,0 +1,41 @@ +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 ON UPDATE 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 ON UPDATE 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 ON UPDATE 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) +); + +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/pom.xml b/pom.xml index 9c86978..74ab946 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ ${db.username} ${db.password} - filesystem:${toolsdir}/flyway + ${flyway.location} ${toolsdir}/flyway/data @@ -356,28 +356,28 @@ derby-maven-plugin - start-on-initialize + start-in-initialize initialize start - stop-on-post-integration-test + stop-in-post-integration-test post-integration-test stop - start-on-presite + start-in-pre-site pre-site start - stop-on-post-site + stop-in-post-site post-site-test stop @@ -389,6 +389,75 @@ + + mysql + + + mysql + + + + ${toolsdir}/mysql/build.xml + install + + + antrun:run + + + org.apache.maven.plugins + maven-antrun-plugin + + + + + + + + + + mysql-run-in-initialize + initialize + + run + + + + mysql-stop-in-post-integration-test + post-integration-test + + run + + + + + + + + + mysql-run-in-pre-site + pre-site + + run + + + + mysql-stop-in-post-site + post-site + + run + + + + + + + + + + + + + db-migrate @@ -399,6 +468,7 @@ flyway-maven-plugin + flyway-migrate-in-generate-sources generate-sources migrate @@ -413,7 +483,7 @@ org.hibernate hibernate-tools - 4.3.2.Final + 4.3.3.Final ant @@ -429,15 +499,18 @@ - run-hibernate-tools + hibernate-tools-run-in-generate-sources generate-sources run + + + - + @@ -797,7 +870,7 @@ - + cf From a4c52e86b8e4129a46a5d6fa1c361879e14e9dbc Mon Sep 17 00:00:00 2001 From: Yuichi Kuwhara Date: Mon, 2 May 2016 19:11:56 +0900 Subject: [PATCH 08/16] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=B9?= =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=97=E3=83=88=E3=81=AE=E8=AA=A4=E8=A8=98?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../testscript/IntegrationTest.xlsx | Bin 7613 -> 7619 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/javaee7-web-tips/testscript/IntegrationTest.xlsx b/javaee7-web-tips/testscript/IntegrationTest.xlsx index d91dd6da45a8bb6346fc85190f67ea0ddf9ab95b..1f14b114071eb35287c9dee2a0139cdf933dbd9f 100644 GIT binary patch delta 4053 zcmY*ccRU+f`;QqS_NWo7YDI|>QL6T)idxOBTD59jE=5&iG_+P}YHNvAtre@(DpE5= zjFxL%qe#r!n;*UJ@80)4|D5MJ=XpNodA{d4=kt7p|;^PwSWkSe;v<5r- z$5y`1p{|xSCx^yP9lf)RWD~4Qd4k|Y`qREdO!9{WbVM+Kp0Lr6)sk2uY@JrxDY({# z+?Gkk9nvb=?Dx(=0Me0FVjT|v005c-0Js2! z{vT8@wv;dw!(_GDU}dBWFt3}<6+T7R7~qDb9<2`zai4scy0X82w!a}zeh=c0S!oUa zmI0dQ(V*uZFmzr5HI=85ZyG+C*4->rFvW@lRog2T;4G?{tjcPpBPg@AlQt|yL0(!o z4ky^hoKO9i9USZ2-z*5Hly#)U3f`xB%W7`V7;c0TxW0yd&mT|9f9+^7_Qr!YoP(Q} zXdlrToHB<(gbkf8p@q{Ek?1^hF-ZwRjJJl81HOc$Dsx4i0sRbdknmhDhGm@gno&c48Nl z*m9;L(UgV`6#&2m0x=^1O04pSOV$1gv|R#57nr6YT+}F->uMRb58Ly)IT;x>H}BjOS8YZr-9P z>S(=#_-@6?;8G-C4PVE?4y&%NEC*ZEW4 z^XP#-H9^!SX5-~0lu}6CY&Ir-{hdgTZ)|^8g~t@0R?#-(aKhvEcqW8KvAEWt&6mflb^_pnKAlT`gF0?`=e@Dvw>( zd`Mlq-m;MK$^JVx(afgZwlAsKt4$$ieYgKw-|8O<94G}_2;PSE70!2DaxGS0LkTY@ zo2``hcfv-uJRBapy0=l=f->eU*L&IO&3SXG!)ysQ)Ch~s%6q_mv+oBhL=)ytW7pog z6oA_rAE+IebLQxC)-$->*XjO5LT$f6P%l7;X-%WQ>GS5X;QF!Y+N7OAZG%!i zc7ibZZnaaQguUdrCXjBZgwZe140W$v@JB_~%fP!Yqvf2d`ycs|qp>R#9x6zeG4xlT zrMZDciLoi^CevNPq3Vt!#e)TS#?H3K`W^qS8zsl^8}X{T1O0a;2*u8)^Lj};$5RB8 zPnDc=N#c3TPX{u1sxrbI$IUj4ysdT}yj)W159%wuQnIZ!RV0oycaJCf4^ftgTXDtG z&~NSOD!W(CGIumdtC*5(Li1nL#mT7cC(9>LOxIbY?J4Tj)1D9m0Uw;9;-ZsN8#t4` zlcnB^A=b5Y^=*1;`lrkCisE-Qds%reO~@WOb2+IeLoL&tlI*A}8I-;E@YYhKvCee5TApd=>^5-%^5g6+uk&60dM7UPiuui#@` z3XdjyGqO8q;aF2^9VFPs>{?^fuHdn(4;|#WO0%aAta7T$L)Sag79}PiQ(Z;Y`rd3l z!vz{J#eJM*<7_OggK|995*~|5P1Ev`a!JFxN!`b`c}gu5;l^Tgu(G_MhSEA24i~MN z;h6XEibt>1=JOE)XP#2QQ?gP%qb9l|n}*Zha%&X@n?rY-s=Z5bMCp$;nPQl&X>(!W zyJa8)vy4y0I_lp8P@L(>tX6vWlUeWUEjVirC+YCG^LBPAJ+gfWt|^?4;~wQ1!1MUo zl(l$^*ZlE5F>&_OhbuMmlv%9PaS|St2;H!2nhsz|f(KT%!-6l5*)whm&po(Yme6EE zi!nk!ixaa}R?sbvbNBp_h&2Tk`#(%(vLYv2TK+(;-@n$;g6iPD87I70@1b7)hjI#* zI?n8YFn-dAs&qF0i7Ty*vuQCH*F%z>;F;`|2O|1c90Yi--eYfg!xRXj=U+2MS{AlJ zE0@#ht?LvoP!kva5iw-DbdBZr7OT5AOD;#xBS}<}x#zJUoz04`qAmRa)h*Ci zq;t3>7g7|})$+R+){^lS0UBaoydq$g#E|3>$sA!aYeuP+d#ki^0IC60=PRjn_yE&? z(eI@!es7dNO1t4Gkp%X9JA_vmTrJz`WM@P_%UCqsf}~L>+b3%k_k@4&vq#SO*9zYV zpxqH3cW@QyDw<2-tL=FXc1;B_+F*$-6S>3H9=y_a_sde9U-^xyobMn8J3zaPM@X3a@#He_<6sYo?9+V46xaQg z-5=;*=VpmlisCZ1uDeoXbZC$owSa<@Fq3jD`km<{{nHX9)M@J;gc*T8V)5HlGqhA` z*E)$2l7MKF&kFK$`9@k)jNhZ(Oi#&j)LhDMT8iPaUKVZ;WiN{`Cat{Yd=haBvhw6>xa^5+F>#SmP#mp9Wk3L>1R{-WdvI zcy|QiiWmxA&iB%)V*U<%O7!WJ(fa7XJ&ZtiOck}**vUIQsjU* z@oaBKY}-jaujOU5S0rqL6bUDF z&HH`f6lz8{KmI#H*2e z4m|#5F@&T$Hn<;ERD|gkIg50%;(PNUXeN_Hq)5-SttqYAi*r+n$UP07tX%LEg>w;H z)*!3~!jhhxl%j`|b-H*l4@;|PjZDlzs_=s8Pze;xiF?mH$dDq%KZgUv*!P+9DB_?t z@?$_42Sk`=olJ-@6mip9C^3w}tN=@u3vi>jNI#f*+aUpqHU-c#q;zLfvpKq< zgoFZo zVET3|v;UhyDUQG-B2T>`6<%=aVQ$@swr>^vlvi%uq;`(zhjAm5$vt^ElBLO87VD-V zgus#7xX*9GY#OLsWx5($R?qcZP#YC6*L`P1;s>i{tH@8@Z*!*{*Wg%|P&yi0(Irqm z^L1?~TvnSB8`fnkgk{kMjWVKEXCLt zsGx{xvq@g)si8n`r$q9i(T+DpEmkPRRo2Br_rym9sb_|Ka^*u)SE0aeUQ_MfT*LGq zzRSLYLHaGq&oS^2j+RXPu2b`BT@VXCdXsi`(<@Z!H0X6f(~B)cNp9z4L;UB4q)ur6 z%=N_RCC-<>jq3UGhG-}Y@T1ty5Xz_E@cPiESp1C;?R3p9OQ+a!BZw~8PvJfxRi`8N$;`6zX{`EXQK*~#L%9qOo`gh-f*Q+>WZb+{KzjOCMZ;psnX=*6V+^cVJu5o&ja)MQS97i~6r zup>u-0RYg@{+qG=+hq^3uTWj^*s9h`DwG#OC9nVAZFe9ag6>?`zhHZqn*S&l6b7@! zr^xtg=l`2`j3Pwg7a8_}@KGXw7&9OQQv?AET^RlM(cI^x@!w%ehw-4}#jHWVzkE+1 zd=vx>4?pDIh1=Hu; ziu!aX2vf-bOebR9%+W(;28@0N_jIyGAI3{E7(ja_%{@px%3bzZp3bqJ#@iXZ_L~zq zv`%6-7+`Lh3Wu~!0VZW|AtZgl2S=#fGKAk_LiM;FM`u8pA?V38--u=X40n)bkzsnK zGpXfLLzX~gkohOQN7(sa{?2JVXUHIS^)VPmb7uiK4qr~GL&jK!h6sd97w?4B(C@Du_aeX~FN<~|4nilzdA&Y&>- zONC$qmIe$~s@(L*%sG6C!Um5A121oklA_u1t3SUN`jy#K&CQ+6bp<#21dSN^fR-@s z2(2n!A-tA&W{LPtvqd3`=w>)iPwuEjwDHVf`c!6{>7WX(VKjn?@d3Mbr%Pe5;|O5*{=UET(I?7^y6k(Eu$m5T^?{`ouBe)ZrC{*mqyUex#0GCoE4Q2tnv)l zm3`|@wQ4>)lXqZLmH%Pbr})*cj!>#IZeNNXU<6N@9sY;gzu2l9se{2l(R*p5^}35R z?oPaI$!`vO1S7I8E1KnW{NEc4f` z`2A>qO~nW4VC#e)7rsOQYHCkDA)idpOI~&<#oUJnfw@Dhyx~(&m%!)On_zGY8u;Ex zH)qjcTAxy-L_qdA%r;GyowyNy#uAscU1tA$5jUTj&A#>1r}+J=Sw)G-d($p3$=gq= zW)y5Unwx&2Kg8M0*enW{KaV=JBOcJ45&1Td?5#x&0&y~eK>yoc)tYn{{%J59dS&2J ze#7Rfo<4WFo9O}$LFPB_W4?5Q%_$WRLdQ2H{;KXaFmxh(Y)n(!h7Iotd6}3|mCA0Q zgr!;Pc|r~pas+skjy8!#O7}PBuEf1{aq!Pi(mnQPlZ^a+^l9&?VddA)z>Me9{wvXg zqv|}s7GX1G2~Z75oK5MO_%)m+fd_IQCylw)2O}R{NqEz;nNDzB@>~!p6P*q$dBF3< zB;95$nEX4>Na<^iv$2A0CEo?1>nRNxY%j5`Z7qphhe<6)38+8RcT7M1cH~=2-`sbz zZ8y4ZNn`)5OI_RG(^}>Q;pX3Wm!=MDLk~iUz|-c0dyaVrfj*%sVk}5?8`>%$rrccT zb&Cp53x1#?D($9EhdTJ=s#_z!8ttUhPT+ank`}$~W{F;2q19z?!~kC4{!Q^c1anqJ z;BHk@-9sa#~N~J-9|h5Cy40akoIt?3T!5j zg47*c^#2-NMg8c7{B%oCO3`3>nO*R+{E%sfg`!VN^$GbY7NX+jWXNA8msby-5R=|j zanGfR6tIL2J}#N*)9_vs-B%6}Kdkh>CSJc^zvYpWBCgEZ+n;KqzFnORWE!2H`xd9~ z7m65A>p5|5V!hvRWp%k~d#u%GMZoY&U`sb@{-jmmME$1vLerH2Mcj+k>er!vT>A<` z)q2=__w`s#HaXg6{lzKtr$x6`KBO`d9l<1XoyXob^sG3dQ~!$xEOKc;y6n65C{Ivtw?j4gLp$)!UnQt}!W{7# zbrH@uinY#*sO2O^qdY~mtTx%nl*xFpEc+VH3bg%O&TF@E9vzKn7&LkcYt6}6P4c?a zp_PME?Rn;7sycXbM?7d+M%;58t7E=}n)#StJ0{Q^^0TStUSTCgGWkueFu~i4l$vTP z#dI@m_g$H`#-bnRBOr?nt81IdW~=M$q&1Qj#O(&}>V`ES zLOBx*p1=#tJLQ;tx^EXpVpQJf)0OS?mLhx#0|sCYc!xxQzccmqI-IilxZg>X%7LRW zb!ELU9P6FlY(`x!Ta2N_Ir(Okw}D5dd?g0UQr7MEj_W`peHnF;gtZt!7}#?@0ZCT&=3_1J znbBAV*{guHg)2sLxT=?b9MKSqnMch}%tYoT1ZKR?a5XEtTcb~5pwO1x#eHK+pS_m* ziebq=R%~z`DWpQ3yR;*d;@hzLdmp8Fk+i5ha-9wv#*AB_l=}#l@#3&bQy$$h{dq`7 zPJe}nzf|r8d5I@=`}&h8VVsQ6a!Gw7)!JpwGJsv4S6tJ?+1w9zxv7*w*vC9nQ9iuV zwFfAX4;~!RbhlD036^CP+=!*laCu@)QcX!3B*{_kqcbeWoHSG`hkP739lrGCcVo(s zz;sh%hZ(wr{Rkczxs%h(yM>^e%uOj?QOkp z4>0#C!%QJKyHYvdkEZU-$jhsEdR16u5_im^VXJDCrdmljU7)Po7kmha?g`d9<~Nut z9RUplr$$~}z{e@W@P9{!tN7MGaGWg`(JX+D#(JQi&&z6EP{G@c2jsutuTmJ4~WQdS2K2jt_?~n;}Anq zHUlv?F2Zze;BePUq*mmX3GrejWd&?o817Vnnxi-sfPG=`-Ip8|Mr=Ln<`7&LMDx!V zGXk{bJbeYm%zdgjftgm(O?>w?2u>}Jwgm**!83lde=m)XQ^R$rJq0Y+t?E9TSF&2K zTj_f6ZCkzTuk5!rE6s#9>$ZwOB z@yOk;{BlOtF}U{USL{fwzM9a`Fa8uo!mTfb{#C`^Ez`DGVWCDAG18bMF+fm=5o$XbmZ9Nj zsbiV7?8*?e*vQ27RrfW$06bv>iHq_tB&*`tqG=_mB*1BI+-??sIzEm?2t);RzgTYhm3SmnwSo$ZYhd7@V>zCscc7_b3vPzwEhv&Em;v zX1L0QYHIS#d)eDU!=9#vFESPQ(6qW4tqpmQP!6XJ(kO+|Xg7QsC|Frg zR`RlB3f`d;qPdM2nQ(z-@fLDCaMf=;L^B=?X8>f*46wwCh8PFj8W8^$v0EGY)-Q~M z_ae;?u-M)$y^Aq19QiEI^MZS=!$EBkPe%Ft1L(szO4G$ACFPCAv|?ZKezb>h`8^)*Gbs3_n|!?HtL^vmt1f0G1a=ekQ!XT0)(qJi3> z0@!^;NaC#Qd8agS`4ozD6=RaNh*r1;>bA!041AXE)?Dm;_uOK8&4T93RzV#z0grZC zS$v_ zawqKcC2q~o)mNcEY6sXbePGG2-<&T2+&Q-BNi%GLN#DGIcvucP4jC1(&hAGuMECd- zCp`O7I9kIIk&31-h;)yWhyq)T`!Z$7P~>y(k)Fw|2TyghDl|whNo%4@l?TzT%T4-7-=AgcL1I!rgD7iW5Pq>djE(g<5`* zB$spL5lT0!MW`A-d9H6cbah0+kQs`sM9)>#&8~v-@l_?ycG>%%o2?Ef-Gg5FK)S-O zV=4kaw@Jkhk24Kzx<1=ev@ihqgzs7#m zuIYIyo#vQ=8b1h1Gn?2ze7~b96>#GxMnhG}J5D0sCRI7tjy9hE$>I}5OWLwbU-#Ta zPTq;z(G^58ktNm<09HT7H)gs{W3Cr1p-S#4q zD8mE--O&0+tNmAVjGtelK2xyOT^Fu{|31*deg7G`LwFSEPd$2PLXXh!ALC5D5cYW# zp=X|d2X}%Rue`w7jmgIT{h?D)CawYCXFK4Dr{ Ip0kAi1Mj0gga7~l From 462c2f910b9e37f7796d9eb8f06ef8836d5501db Mon Sep 17 00:00:00 2001 From: Yuichi Kuwhara Date: Thu, 5 May 2016 09:44:26 +0900 Subject: [PATCH 09/16] =?UTF-8?q?.gitignore=E3=82=92=E3=82=A2=E3=83=BC?= =?UTF-8?q?=E3=82=AD=E3=82=BF=E3=82=A4=E3=83=97=E3=81=AB=E5=90=AB=E3=82=81?= =?UTF-8?q?=E3=82=8B=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- javaee7-web-min/.gitignore | 6 +++++- javaee7-web-min/distribution/pom.xml | 23 ++++++++++++++++++++++ javaee7-web-min/tools/mysql/.gitignore | 1 - javaee7-web-tips/.gitignore | 8 ++++++-- javaee7-web-tips/distribution/pom.xml | 26 +++++++++++++++++++++++-- javaee7-web-tips/tools/mysql/.gitignore | 1 - pom.xml | 11 +---------- 7 files changed, 59 insertions(+), 17 deletions(-) delete mode 100644 javaee7-web-min/tools/mysql/.gitignore delete mode 100644 javaee7-web-tips/tools/mysql/.gitignore 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/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 @@ + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + process-resources + + run + + + + + + + + + org.apache.maven.plugins maven-source-plugin diff --git a/javaee7-web-min/tools/mysql/.gitignore b/javaee7-web-min/tools/mysql/.gitignore deleted file mode 100644 index 82f0c3a..0000000 --- a/javaee7-web-min/tools/mysql/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/data/ 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/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 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -28,6 +27,29 @@ + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + process-resources + + run + + + + + + + + + org.apache.maven.plugins maven-source-plugin diff --git a/javaee7-web-tips/tools/mysql/.gitignore b/javaee7-web-tips/tools/mysql/.gitignore deleted file mode 100644 index 82f0c3a..0000000 --- a/javaee7-web-tips/tools/mysql/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/data/ diff --git a/pom.xml b/pom.xml index 74ab946..82640a1 100644 --- a/pom.xml +++ b/pom.xml @@ -130,15 +130,6 @@ - - org.carlspring.maven - derby-maven-plugin - 1.10 - - ${toolsdir}/derby/target - ${db.port} - - org.flywaydb flyway-maven-plugin @@ -344,7 +335,7 @@ derby-maven-plugin 1.10 - ${toolsdir}/derby/target + ${toolsdir}/derby/data ${db.port} From 598bb34b63bcbd47f9f871a31be3dca13ed19365 Mon Sep 17 00:00:00 2001 From: Yuichi Kuwhara Date: Thu, 5 May 2016 09:46:41 +0900 Subject: [PATCH 10/16] =?UTF-8?q?Maven=E3=82=B5=E3=82=A4=E3=83=88=E3=83=AC?= =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=88=E3=81=AE=E3=83=86=E3=83=BC=E3=83=9E?= =?UTF-8?q?=E9=81=A9=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- javaee7-web-min/src/site/site.xml | 9 +++++++++ javaee7-web-tips/src/site/site.xml | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 javaee7-web-min/src/site/site.xml create mode 100644 javaee7-web-tips/src/site/site.xml 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 @@ + + + + org.apache.maven.skins + maven-fluido-skin + 1.5 + + \ No newline at end of file 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 @@ + + + + org.apache.maven.skins + maven-fluido-skin + 1.5 + + \ No newline at end of file From f705fc6beb2c7a17fea45298782dc4aa65bd5bed Mon Sep 17 00:00:00 2001 From: Yuichi Kuwhara Date: Sat, 14 May 2016 09:38:07 +0900 Subject: [PATCH 11/16] sit-wt v0.11.1 -> v0.12.2 --- javaee7-web-min/pom.xml | 2 ++ javaee7-web-tips/pom.xml | 2 ++ pom.xml | 14 +++++++------- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/javaee7-web-min/pom.xml b/javaee7-web-min/pom.xml index 5948b2e..72b699f 100755 --- a/javaee7-web-min/pom.xml +++ b/javaee7-web-min/pom.xml @@ -19,6 +19,8 @@ 10.0.0.Final 1.1.0.Alpha7 2.53.0 + 3.4.1 + 0.12.2 ${project.artifactId} your target your org diff --git a/javaee7-web-tips/pom.xml b/javaee7-web-tips/pom.xml index fd17387..cf22dfe 100644 --- a/javaee7-web-tips/pom.xml +++ b/javaee7-web-tips/pom.xml @@ -49,6 +49,8 @@ 10.0.0.Final 1.1.0.Alpha7 2.53.0 + 3.4.1 + 0.12.2 ${project.artifactId} your target your org diff --git a/pom.xml b/pom.xml index 82640a1..56179a8 100644 --- a/pom.xml +++ b/pom.xml @@ -800,12 +800,6 @@ sit-wt-runtime ${sitwt.version} test - - - org.seleniumhq.selenium - selenium-java - - org.seleniumhq.selenium @@ -813,13 +807,19 @@ ${selenium.version} test + + io.appium + java-client + ${appium.version} + test + false true - 0.11.1 + verify org.sitoolkit.wt From 2f0f7ac7d21512e9911ea6d21a69ffb7cdf13106 Mon Sep 17 00:00:00 2001 From: Yuichi Kuwhara Date: Sat, 14 May 2016 12:05:03 +0900 Subject: [PATCH 12/16] =?UTF-8?q?mysql=20bluemix=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- javaee7-web-min/pom.xml | 13 +++++++++++++ javaee7-web-tips/pom.xml | 13 +++++++++++++ .../archetype/tips/domain/code/GenderCd.java | 4 ++-- .../tips/domain/user/UserEntity.java | 8 ++++---- .../presentation/UserInputController.java | 6 +++--- .../migration/V1__create_user_and_group.sql | 19 +++++++++++++------ pom.xml | 1 + 7 files changed, 49 insertions(+), 15 deletions(-) rename "javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/domain/code/\346\200\247\345\210\245Cd.java" => javaee7-web-tips/src/main/java/org/sitoolkit/ad/archetype/tips/domain/code/GenderCd.java (80%) diff --git a/javaee7-web-min/pom.xml b/javaee7-web-min/pom.xml index 72b699f..644f6fe 100755 --- a/javaee7-web-min/pom.xml +++ b/javaee7-web-min/pom.xml @@ -84,6 +84,19 @@ + + mysql-bluemix + + true + + + + + cleardb + spark + + + db2 diff --git a/javaee7-web-tips/pom.xml b/javaee7-web-tips/pom.xml index cf22dfe..737177d 100644 --- a/javaee7-web-tips/pom.xml +++ b/javaee7-web-tips/pom.xml @@ -116,6 +116,19 @@ + + mysql-bluemix + + true + + + + + cleardb + spark + + + db2 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 EntityInputControllerorg.apache.maven.plugins maven-antrun-plugin + ${mysql.remote} From 8cc7ca329354e240edb60be61137fd844b217f9f Mon Sep 17 00:00:00 2001 From: Yuichi Kuwhara Date: Sat, 14 May 2016 12:08:34 +0900 Subject: [PATCH 13/16] was-liberty-plugin v1.2-SNAPSHOT -> v1.1 --- javaee7-web-tips/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javaee7-web-tips/pom.xml b/javaee7-web-tips/pom.xml index 737177d..4e3f32e 100644 --- a/javaee7-web-tips/pom.xml +++ b/javaee7-web-tips/pom.xml @@ -45,7 +45,7 @@ filesystem:${toolsdir}/flyway 4.1.153 8.5.5.9 - 1.2-SNAPSHOT + 1.1 10.0.0.Final 1.1.0.Alpha7 2.53.0 From e1b7d1c4c8f03d11d1dc1d88a7cbb4471509cb92 Mon Sep 17 00:00:00 2001 From: Yuichi Kuwhara Date: Sat, 14 May 2016 12:29:48 +0900 Subject: [PATCH 14/16] v0.13-SNAPSHOT -> v0.13 --- build.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index ac2c709..fb05e81 100644 --- a/build.xml +++ b/build.xml @@ -27,7 +27,7 @@ --> - + diff --git a/pom.xml b/pom.xml index 7c0f04b..3dc71fb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.sitoolkit.ad.archetype javaee7-web - 0.13-SNAPSHOT + 0.13 pom From 433bda0e30422d6bb3db46aa21b97451f15bf4c0 Mon Sep 17 00:00:00 2001 From: "yuichi.kuwahara" Date: Sun, 15 May 2016 09:44:12 +0900 Subject: [PATCH 15/16] =?UTF-8?q?was-liberty=E3=81=AE=E3=83=AD=E3=82=B0?= =?UTF-8?q?=E3=81=8C=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=83=97=E3=83=AD?= =?UTF-8?q?=E3=83=B3=E3=83=97=E3=83=88=E3=81=A7=E6=96=87=E5=AD=97=E5=8C=96?= =?UTF-8?q?=E3=81=91=E3=81=99=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- javaee7-web-min/tools/was-liberty/jvm.options | 1 - javaee7-web-tips/tools/was-liberty/jvm.options | 1 - 2 files changed, 2 deletions(-) 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-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 From 6be534e78eac930cf152d202c0997420e213a9e0 Mon Sep 17 00:00:00 2001 From: "yuichi.kuwahara" Date: Sun, 15 May 2016 09:49:26 +0900 Subject: [PATCH 16/16] =?UTF-8?q?mysql-bluemix=E3=83=97=E3=83=AD=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE=E3=83=97=E3=83=AD=E3=83=91?= =?UTF-8?q?=E3=83=86=E3=82=A3=E3=81=8C=E3=82=A2=E3=83=BC=E3=82=AD=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=81=A7=E7=84=A1=E3=81=8F=E3=81=AA=E3=82=8B?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- javaee7-web-min/pom.xml | 10 +++++----- javaee7-web-tips/pom.xml | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/javaee7-web-min/pom.xml b/javaee7-web-min/pom.xml index 644f6fe..394f671 100755 --- a/javaee7-web-min/pom.xml +++ b/javaee7-web-min/pom.xml @@ -9,7 +9,7 @@ org.sitoolkit.ad.archetype javaee7-web - 0.13-SNAPSHOT + 0.13 filesystem:${toolsdir}/flyway @@ -88,10 +88,10 @@ mysql-bluemix true - - - - + dbname + host + username + password cleardb spark diff --git a/javaee7-web-tips/pom.xml b/javaee7-web-tips/pom.xml index 4e3f32e..0b2e07b 100644 --- a/javaee7-web-tips/pom.xml +++ b/javaee7-web-tips/pom.xml @@ -39,7 +39,7 @@ org.sitoolkit.ad.archetype javaee7-web - 0.13-SNAPSHOT + 0.13 filesystem:${toolsdir}/flyway @@ -85,7 +85,7 @@ filesystem:${toolsdir}/derby - + mysql @@ -120,10 +120,10 @@ mysql-bluemix true - - - - + dbname + host + username + password cleardb spark