diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@ + - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@ + - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs +++ b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@ + - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs +++ b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/SpringMVC_sample/.settings/org.eclipse.wst.common.component b/SpringMVC_sample/.settings/org.eclipse.wst.common.component index 9c266ae..fca7728 100644 --- a/SpringMVC_sample/.settings/org.eclipse.wst.common.component +++ b/SpringMVC_sample/.settings/org.eclipse.wst.common.component @@ -1,26 +1,44 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@ + - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs +++ b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/SpringMVC_sample/.settings/org.eclipse.wst.common.component b/SpringMVC_sample/.settings/org.eclipse.wst.common.component index 9c266ae..fca7728 100644 --- a/SpringMVC_sample/.settings/org.eclipse.wst.common.component +++ b/SpringMVC_sample/.settings/org.eclipse.wst.common.component @@ -1,26 +1,44 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpringMVC_sample/pom.xml b/SpringMVC_sample/pom.xml index 842581a..ae60d57 100644 --- a/SpringMVC_sample/pom.xml +++ b/SpringMVC_sample/pom.xml @@ -9,9 +9,9 @@ 1.0.0-BUILD-SNAPSHOT 1.8 - 5.0.7.RELEASE - 1.8.1 - 1.7.2 + 5.2.22.RELEASE + 1.9.7 + 1.7.36 @@ -118,16 +118,16 @@ - - org.springframework - spring-jdbc - 3.2.2.RELEASE - - - com.microsoft.sqlserver - sqljdbc - 4.2 - + + org.springframework + spring-jdbc + 4.2.9.RELEASE + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.1.jre8 + @@ -150,8 +150,8 @@ maven-compiler-plugin 2.5.1 - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@ + - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs +++ b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/SpringMVC_sample/.settings/org.eclipse.wst.common.component b/SpringMVC_sample/.settings/org.eclipse.wst.common.component index 9c266ae..fca7728 100644 --- a/SpringMVC_sample/.settings/org.eclipse.wst.common.component +++ b/SpringMVC_sample/.settings/org.eclipse.wst.common.component @@ -1,26 +1,44 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpringMVC_sample/pom.xml b/SpringMVC_sample/pom.xml index 842581a..ae60d57 100644 --- a/SpringMVC_sample/pom.xml +++ b/SpringMVC_sample/pom.xml @@ -9,9 +9,9 @@ 1.0.0-BUILD-SNAPSHOT 1.8 - 5.0.7.RELEASE - 1.8.1 - 1.7.2 + 5.2.22.RELEASE + 1.9.7 + 1.7.36 @@ -118,16 +118,16 @@ - - org.springframework - spring-jdbc - 3.2.2.RELEASE - - - com.microsoft.sqlserver - sqljdbc - 4.2 - + + org.springframework + spring-jdbc + 4.2.9.RELEASE + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.1.jre8 + @@ -150,8 +150,8 @@ maven-compiler-plugin 2.5.1 - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp index b320666..5bf1c6e 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp @@ -15,13 +15,13 @@

メニュー

- + - + - +

diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@
+ - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs +++ b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/SpringMVC_sample/.settings/org.eclipse.wst.common.component b/SpringMVC_sample/.settings/org.eclipse.wst.common.component index 9c266ae..fca7728 100644 --- a/SpringMVC_sample/.settings/org.eclipse.wst.common.component +++ b/SpringMVC_sample/.settings/org.eclipse.wst.common.component @@ -1,26 +1,44 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpringMVC_sample/pom.xml b/SpringMVC_sample/pom.xml index 842581a..ae60d57 100644 --- a/SpringMVC_sample/pom.xml +++ b/SpringMVC_sample/pom.xml @@ -9,9 +9,9 @@ 1.0.0-BUILD-SNAPSHOT 1.8 - 5.0.7.RELEASE - 1.8.1 - 1.7.2 + 5.2.22.RELEASE + 1.9.7 + 1.7.36 @@ -118,16 +118,16 @@ - - org.springframework - spring-jdbc - 3.2.2.RELEASE - - - com.microsoft.sqlserver - sqljdbc - 4.2 - + + org.springframework + spring-jdbc + 4.2.9.RELEASE + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.1.jre8 + @@ -150,8 +150,8 @@ maven-compiler-plugin 2.5.1 - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp index b320666..5bf1c6e 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp @@ -15,13 +15,13 @@

メニュー

- + - + - +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp index b28d0ac..5401c8a 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp @@ -21,7 +21,7 @@

会員登録


- + @@ -58,7 +58,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@
+ - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs +++ b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/SpringMVC_sample/.settings/org.eclipse.wst.common.component b/SpringMVC_sample/.settings/org.eclipse.wst.common.component index 9c266ae..fca7728 100644 --- a/SpringMVC_sample/.settings/org.eclipse.wst.common.component +++ b/SpringMVC_sample/.settings/org.eclipse.wst.common.component @@ -1,26 +1,44 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpringMVC_sample/pom.xml b/SpringMVC_sample/pom.xml index 842581a..ae60d57 100644 --- a/SpringMVC_sample/pom.xml +++ b/SpringMVC_sample/pom.xml @@ -9,9 +9,9 @@ 1.0.0-BUILD-SNAPSHOT 1.8 - 5.0.7.RELEASE - 1.8.1 - 1.7.2 + 5.2.22.RELEASE + 1.9.7 + 1.7.36 @@ -118,16 +118,16 @@ - - org.springframework - spring-jdbc - 3.2.2.RELEASE - - - com.microsoft.sqlserver - sqljdbc - 4.2 - + + org.springframework + spring-jdbc + 4.2.9.RELEASE + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.1.jre8 + @@ -150,8 +150,8 @@ maven-compiler-plugin 2.5.1 - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp index b320666..5bf1c6e 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp @@ -15,13 +15,13 @@

メニュー

- + - + - +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp index b28d0ac..5401c8a 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp @@ -21,7 +21,7 @@

会員登録


- + @@ -58,7 +58,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp index 0063821..be8db29 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp @@ -26,8 +26,8 @@ ユーザID:の登録が完了しました - - + +

diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@
+ - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs +++ b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/SpringMVC_sample/.settings/org.eclipse.wst.common.component b/SpringMVC_sample/.settings/org.eclipse.wst.common.component index 9c266ae..fca7728 100644 --- a/SpringMVC_sample/.settings/org.eclipse.wst.common.component +++ b/SpringMVC_sample/.settings/org.eclipse.wst.common.component @@ -1,26 +1,44 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpringMVC_sample/pom.xml b/SpringMVC_sample/pom.xml index 842581a..ae60d57 100644 --- a/SpringMVC_sample/pom.xml +++ b/SpringMVC_sample/pom.xml @@ -9,9 +9,9 @@ 1.0.0-BUILD-SNAPSHOT 1.8 - 5.0.7.RELEASE - 1.8.1 - 1.7.2 + 5.2.22.RELEASE + 1.9.7 + 1.7.36 @@ -118,16 +118,16 @@ - - org.springframework - spring-jdbc - 3.2.2.RELEASE - - - com.microsoft.sqlserver - sqljdbc - 4.2 - + + org.springframework + spring-jdbc + 4.2.9.RELEASE + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.1.jre8 + @@ -150,8 +150,8 @@ maven-compiler-plugin 2.5.1 - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp index b320666..5bf1c6e 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp @@ -15,13 +15,13 @@

メニュー

- + - + - +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp index b28d0ac..5401c8a 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp @@ -21,7 +21,7 @@

会員登録


- + @@ -58,7 +58,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp index 0063821..be8db29 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp @@ -26,8 +26,8 @@ ユーザID:の登録が完了しました - - + +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp index cac4568..51265f3 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp @@ -21,7 +21,7 @@

会員登録(登録内容確認)


- + @@ -54,7 +54,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@
+ - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs +++ b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/SpringMVC_sample/.settings/org.eclipse.wst.common.component b/SpringMVC_sample/.settings/org.eclipse.wst.common.component index 9c266ae..fca7728 100644 --- a/SpringMVC_sample/.settings/org.eclipse.wst.common.component +++ b/SpringMVC_sample/.settings/org.eclipse.wst.common.component @@ -1,26 +1,44 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpringMVC_sample/pom.xml b/SpringMVC_sample/pom.xml index 842581a..ae60d57 100644 --- a/SpringMVC_sample/pom.xml +++ b/SpringMVC_sample/pom.xml @@ -9,9 +9,9 @@ 1.0.0-BUILD-SNAPSHOT 1.8 - 5.0.7.RELEASE - 1.8.1 - 1.7.2 + 5.2.22.RELEASE + 1.9.7 + 1.7.36 @@ -118,16 +118,16 @@ - - org.springframework - spring-jdbc - 3.2.2.RELEASE - - - com.microsoft.sqlserver - sqljdbc - 4.2 - + + org.springframework + spring-jdbc + 4.2.9.RELEASE + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.1.jre8 + @@ -150,8 +150,8 @@ maven-compiler-plugin 2.5.1 - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp index b320666..5bf1c6e 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp @@ -15,13 +15,13 @@

メニュー

- + - + - +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp index b28d0ac..5401c8a 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp @@ -21,7 +21,7 @@

会員登録


- + @@ -58,7 +58,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp index 0063821..be8db29 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp @@ -26,8 +26,8 @@ ユーザID:の登録が完了しました - - + +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp index cac4568..51265f3 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp @@ -21,7 +21,7 @@

会員登録(登録内容確認)


- + @@ -54,7 +54,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp index b04c5d0..9e0cf90 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp @@ -47,8 +47,8 @@ - - + +

diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@
+ - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs +++ b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/SpringMVC_sample/.settings/org.eclipse.wst.common.component b/SpringMVC_sample/.settings/org.eclipse.wst.common.component index 9c266ae..fca7728 100644 --- a/SpringMVC_sample/.settings/org.eclipse.wst.common.component +++ b/SpringMVC_sample/.settings/org.eclipse.wst.common.component @@ -1,26 +1,44 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpringMVC_sample/pom.xml b/SpringMVC_sample/pom.xml index 842581a..ae60d57 100644 --- a/SpringMVC_sample/pom.xml +++ b/SpringMVC_sample/pom.xml @@ -9,9 +9,9 @@ 1.0.0-BUILD-SNAPSHOT 1.8 - 5.0.7.RELEASE - 1.8.1 - 1.7.2 + 5.2.22.RELEASE + 1.9.7 + 1.7.36 @@ -118,16 +118,16 @@ - - org.springframework - spring-jdbc - 3.2.2.RELEASE - - - com.microsoft.sqlserver - sqljdbc - 4.2 - + + org.springframework + spring-jdbc + 4.2.9.RELEASE + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.1.jre8 + @@ -150,8 +150,8 @@ maven-compiler-plugin 2.5.1 - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp index b320666..5bf1c6e 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp @@ -15,13 +15,13 @@

メニュー

- + - + - +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp index b28d0ac..5401c8a 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp @@ -21,7 +21,7 @@

会員登録


- + @@ -58,7 +58,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp index 0063821..be8db29 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp @@ -26,8 +26,8 @@ ユーザID:の登録が完了しました - - + +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp index cac4568..51265f3 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp @@ -21,7 +21,7 @@

会員登録(登録内容確認)


- + @@ -54,7 +54,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp index b04c5d0..9e0cf90 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp @@ -47,8 +47,8 @@ - - + +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp index 2770174..2442488 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp @@ -13,7 +13,7 @@

車両検索

- + diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@ + - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs +++ b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/SpringMVC_sample/.settings/org.eclipse.wst.common.component b/SpringMVC_sample/.settings/org.eclipse.wst.common.component index 9c266ae..fca7728 100644 --- a/SpringMVC_sample/.settings/org.eclipse.wst.common.component +++ b/SpringMVC_sample/.settings/org.eclipse.wst.common.component @@ -1,26 +1,44 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpringMVC_sample/pom.xml b/SpringMVC_sample/pom.xml index 842581a..ae60d57 100644 --- a/SpringMVC_sample/pom.xml +++ b/SpringMVC_sample/pom.xml @@ -9,9 +9,9 @@ 1.0.0-BUILD-SNAPSHOT 1.8 - 5.0.7.RELEASE - 1.8.1 - 1.7.2 + 5.2.22.RELEASE + 1.9.7 + 1.7.36 @@ -118,16 +118,16 @@ - - org.springframework - spring-jdbc - 3.2.2.RELEASE - - - com.microsoft.sqlserver - sqljdbc - 4.2 - + + org.springframework + spring-jdbc + 4.2.9.RELEASE + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.1.jre8 + @@ -150,8 +150,8 @@ maven-compiler-plugin 2.5.1 - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp index b320666..5bf1c6e 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp @@ -15,13 +15,13 @@

メニュー

車両管理番号:
- + - + - +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp index b28d0ac..5401c8a 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp @@ -21,7 +21,7 @@

会員登録


- + @@ -58,7 +58,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp index 0063821..be8db29 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp @@ -26,8 +26,8 @@ ユーザID:の登録が完了しました - - + +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp index cac4568..51265f3 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp @@ -21,7 +21,7 @@

会員登録(登録内容確認)


- + @@ -54,7 +54,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp index b04c5d0..9e0cf90 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp @@ -47,8 +47,8 @@ - - + +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp index 2770174..2442488 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp @@ -13,7 +13,7 @@

車両検索

- + diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp index 80846b6..1ab40e5 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp @@ -13,7 +13,7 @@

車両検索

- +
車両管理番号:
@@ -68,7 +68,7 @@

車両管理番号:
- +

diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@
+ - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs +++ b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/SpringMVC_sample/.settings/org.eclipse.wst.common.component b/SpringMVC_sample/.settings/org.eclipse.wst.common.component index 9c266ae..fca7728 100644 --- a/SpringMVC_sample/.settings/org.eclipse.wst.common.component +++ b/SpringMVC_sample/.settings/org.eclipse.wst.common.component @@ -1,26 +1,44 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpringMVC_sample/pom.xml b/SpringMVC_sample/pom.xml index 842581a..ae60d57 100644 --- a/SpringMVC_sample/pom.xml +++ b/SpringMVC_sample/pom.xml @@ -9,9 +9,9 @@ 1.0.0-BUILD-SNAPSHOT 1.8 - 5.0.7.RELEASE - 1.8.1 - 1.7.2 + 5.2.22.RELEASE + 1.9.7 + 1.7.36 @@ -118,16 +118,16 @@ - - org.springframework - spring-jdbc - 3.2.2.RELEASE - - - com.microsoft.sqlserver - sqljdbc - 4.2 - + + org.springframework + spring-jdbc + 4.2.9.RELEASE + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.1.jre8 + @@ -150,8 +150,8 @@ maven-compiler-plugin 2.5.1 - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp index b320666..5bf1c6e 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp @@ -15,13 +15,13 @@

メニュー

- + - + - +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp index b28d0ac..5401c8a 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp @@ -21,7 +21,7 @@

会員登録


- + @@ -58,7 +58,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp index 0063821..be8db29 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp @@ -26,8 +26,8 @@ ユーザID:の登録が完了しました - - + +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp index cac4568..51265f3 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp @@ -21,7 +21,7 @@

会員登録(登録内容確認)


- + @@ -54,7 +54,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp index b04c5d0..9e0cf90 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp @@ -47,8 +47,8 @@ - - + +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp index 2770174..2442488 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp @@ -13,7 +13,7 @@

車両検索

- + diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp index 80846b6..1ab40e5 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp @@ -13,7 +13,7 @@

車両検索

- +
車両管理番号:
@@ -68,7 +68,7 @@

車両管理番号:
- +

diff --git a/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF b/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF index 31869c0..3bbcea4 100644 --- a/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF +++ b/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Built-By: himeno.kazuki -Build-Jdk: 11.0.2 +Built-By: jid +Build-Jdk: 11.0.9 Created-By: Maven Integration for Eclipse diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@
+ - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs +++ b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/SpringMVC_sample/.settings/org.eclipse.wst.common.component b/SpringMVC_sample/.settings/org.eclipse.wst.common.component index 9c266ae..fca7728 100644 --- a/SpringMVC_sample/.settings/org.eclipse.wst.common.component +++ b/SpringMVC_sample/.settings/org.eclipse.wst.common.component @@ -1,26 +1,44 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpringMVC_sample/pom.xml b/SpringMVC_sample/pom.xml index 842581a..ae60d57 100644 --- a/SpringMVC_sample/pom.xml +++ b/SpringMVC_sample/pom.xml @@ -9,9 +9,9 @@ 1.0.0-BUILD-SNAPSHOT 1.8 - 5.0.7.RELEASE - 1.8.1 - 1.7.2 + 5.2.22.RELEASE + 1.9.7 + 1.7.36 @@ -118,16 +118,16 @@ - - org.springframework - spring-jdbc - 3.2.2.RELEASE - - - com.microsoft.sqlserver - sqljdbc - 4.2 - + + org.springframework + spring-jdbc + 4.2.9.RELEASE + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.1.jre8 + @@ -150,8 +150,8 @@ maven-compiler-plugin 2.5.1 - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp index b320666..5bf1c6e 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp @@ -15,13 +15,13 @@

メニュー

- + - + - +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp index b28d0ac..5401c8a 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp @@ -21,7 +21,7 @@

会員登録


- + @@ -58,7 +58,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp index 0063821..be8db29 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp @@ -26,8 +26,8 @@ ユーザID:の登録が完了しました - - + +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp index cac4568..51265f3 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp @@ -21,7 +21,7 @@

会員登録(登録内容確認)


- + @@ -54,7 +54,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp index b04c5d0..9e0cf90 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp @@ -47,8 +47,8 @@ - - + +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp index 2770174..2442488 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp @@ -13,7 +13,7 @@

車両検索

- + diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp index 80846b6..1ab40e5 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp @@ -13,7 +13,7 @@

車両検索

- +
車両管理番号:
@@ -68,7 +68,7 @@

車両管理番号:
- +

diff --git a/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF b/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF index 31869c0..3bbcea4 100644 --- a/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF +++ b/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Built-By: himeno.kazuki -Build-Jdk: 11.0.2 +Built-By: jid +Build-Jdk: 11.0.9 Created-By: Maven Integration for Eclipse diff --git a/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/maven/spring.mvc/sample/pom.properties b/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/maven/spring.mvc/sample/pom.properties index 6271da8..f035a79 100644 --- a/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/maven/spring.mvc/sample/pom.properties +++ b/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/maven/spring.mvc/sample/pom.properties @@ -1,6 +1,6 @@ #Generated by Maven Integration for Eclipse -#Fri Jun 28 15:01:35 JST 2019 -m2e.projectLocation=C\:\\gitbucket\\java_learning\\SpringMVC_sample +#Thu Jun 30 11:43:59 JST 2022 +m2e.projectLocation=C\:\\gitbucket\\\u6559\u80B2\\java_learning\\SpringMVC_sample m2e.projectName=SpringMVC_sample groupId=spring.mvc artifactId=sample diff --git a/SpringMVC_sample/.classpath b/SpringMVC_sample/.classpath index 1c94941..014048f 100644 --- a/SpringMVC_sample/.classpath +++ b/SpringMVC_sample/.classpath @@ -13,15 +13,15 @@
+ - - + @@ -30,10 +30,9 @@ - - + diff --git a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs +++ b/SpringMVC_sample/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/SpringMVC_sample/.settings/org.eclipse.wst.common.component b/SpringMVC_sample/.settings/org.eclipse.wst.common.component index 9c266ae..fca7728 100644 --- a/SpringMVC_sample/.settings/org.eclipse.wst.common.component +++ b/SpringMVC_sample/.settings/org.eclipse.wst.common.component @@ -1,26 +1,44 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpringMVC_sample/pom.xml b/SpringMVC_sample/pom.xml index 842581a..ae60d57 100644 --- a/SpringMVC_sample/pom.xml +++ b/SpringMVC_sample/pom.xml @@ -9,9 +9,9 @@ 1.0.0-BUILD-SNAPSHOT 1.8 - 5.0.7.RELEASE - 1.8.1 - 1.7.2 + 5.2.22.RELEASE + 1.9.7 + 1.7.36 @@ -118,16 +118,16 @@ - - org.springframework - spring-jdbc - 3.2.2.RELEASE - - - com.microsoft.sqlserver - sqljdbc - 4.2 - + + org.springframework + spring-jdbc + 4.2.9.RELEASE + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.1.jre8 + @@ -150,8 +150,8 @@ maven-compiler-plugin 2.5.1 - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp index b320666..5bf1c6e 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/menu.jsp @@ -15,13 +15,13 @@

メニュー

- + - + - +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp index b28d0ac..5401c8a 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1.jsp @@ -21,7 +21,7 @@

会員登録


- + @@ -58,7 +58,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp index 0063821..be8db29 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Completion.jsp @@ -26,8 +26,8 @@ ユーザID:の登録が完了しました - - + +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp index cac4568..51265f3 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/regSample1Confirm.jsp @@ -21,7 +21,7 @@

会員登録(登録内容確認)


- + @@ -54,7 +54,7 @@ - +
ユーザID:
diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp index b04c5d0..9e0cf90 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarInfo.jsp @@ -47,8 +47,8 @@ - - + +

diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp index 2770174..2442488 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearch.jsp @@ -13,7 +13,7 @@

車両検索

- + diff --git a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp index 80846b6..1ab40e5 100644 --- a/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp +++ b/SpringMVC_sample/src/main/webapp/WEB-INF/views/rentCarSearchList.jsp @@ -13,7 +13,7 @@

車両検索

- +
車両管理番号:
@@ -68,7 +68,7 @@

車両管理番号:
- +

diff --git a/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF b/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF index 31869c0..3bbcea4 100644 --- a/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF +++ b/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Built-By: himeno.kazuki -Build-Jdk: 11.0.2 +Built-By: jid +Build-Jdk: 11.0.9 Created-By: Maven Integration for Eclipse diff --git a/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/maven/spring.mvc/sample/pom.properties b/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/maven/spring.mvc/sample/pom.properties index 6271da8..f035a79 100644 --- a/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/maven/spring.mvc/sample/pom.properties +++ b/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/maven/spring.mvc/sample/pom.properties @@ -1,6 +1,6 @@ #Generated by Maven Integration for Eclipse -#Fri Jun 28 15:01:35 JST 2019 -m2e.projectLocation=C\:\\gitbucket\\java_learning\\SpringMVC_sample +#Thu Jun 30 11:43:59 JST 2022 +m2e.projectLocation=C\:\\gitbucket\\\u6559\u80B2\\java_learning\\SpringMVC_sample m2e.projectName=SpringMVC_sample groupId=spring.mvc artifactId=sample diff --git a/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/maven/spring.mvc/sample/pom.xml b/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/maven/spring.mvc/sample/pom.xml index 842581a..ae60d57 100644 --- a/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/maven/spring.mvc/sample/pom.xml +++ b/SpringMVC_sample/target/m2e-wtp/web-resources/META-INF/maven/spring.mvc/sample/pom.xml @@ -9,9 +9,9 @@ 1.0.0-BUILD-SNAPSHOT 1.8 - 5.0.7.RELEASE - 1.8.1 - 1.7.2 + 5.2.22.RELEASE + 1.9.7 + 1.7.36 @@ -118,16 +118,16 @@ - - org.springframework - spring-jdbc - 3.2.2.RELEASE - - - com.microsoft.sqlserver - sqljdbc - 4.2 - + + org.springframework + spring-jdbc + 4.2.9.RELEASE + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.1.jre8 + @@ -150,8 +150,8 @@ maven-compiler-plugin 2.5.1 - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true