Javascriptを使用しないサイトを簡易HTMLとして、jspファイルをフォルダごと移動。併せてJavaソースなども修正。

diff --git a/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/LoginServlet.java b/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/LoginServlet.java
similarity index 91%
rename from andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/LoginServlet.java
rename to andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/LoginServlet.java
index 8c779de..aa2acb1 100644 (file)
--- a/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/LoginServlet.java
+++ b/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/LoginServlet.java
@@ -1,5 +1,5 @@
 \r
-package jp.gr.java_conf.u6k.andro_memo.web.servlet;\r
+package jp.gr.java_conf.u6k.andro_memo.web.servlet.html.v1;\r
 \r
 import java.io.IOException;\r
 \r
@@ -53,7 +53,7 @@ public class LoginServlet extends HttpServlet {
                 req.setAttribute("email", email);\r
                 req.setAttribute("password", password);\r
 \r
-                this.getServletContext().getRequestDispatcher("/login.jsp").forward(req, resp);\r
+                this.getServletContext().getRequestDispatcher("/html/login.jsp").forward(req, resp);\r
 \r
                 return;\r
             }\r
@@ -82,7 +82,7 @@ public class LoginServlet extends HttpServlet {
                 req.setAttribute("email", email);\r
                 req.setAttribute("password", password);\r
 \r
-                this.getServletContext().getRequestDispatcher("/login.jsp").forward(req, resp);\r
+                this.getServletContext().getRequestDispatcher("/html/login.jsp").forward(req, resp);\r
 \r
                 return;\r
             }\r
@@ -91,7 +91,7 @@ public class LoginServlet extends HttpServlet {
             session.setAttribute("login.loginTicketKey", loginTicketKey);\r
 \r
             // /user/mypage.servletに遷移します。\r
-            resp.sendRedirect(this.getServletContext().getContextPath() + "/user/myPage.servlet");\r
+            resp.sendRedirect(this.getServletContext().getContextPath() + "/html/user/myPage.servlet");\r
         } finally {\r
             pm.close();\r
         }\r

diff --git a/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/RegistServlet.java b/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/RegistServlet.java
similarity index 91%
rename from andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/RegistServlet.java
rename to andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/RegistServlet.java
index 08e4699..48ee095 100644 (file)
--- a/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/RegistServlet.java
+++ b/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/RegistServlet.java
@@ -1,5 +1,5 @@
 \r
-package jp.gr.java_conf.u6k.andro_memo.web.servlet;\r
+package jp.gr.java_conf.u6k.andro_memo.web.servlet.html.v1;\r
 \r
 import java.io.IOException;\r
 \r
@@ -40,7 +40,7 @@ public class RegistServlet extends HttpServlet {
 \r
             req.setAttribute("email", user.getEmail());\r
 \r
-            this.getServletContext().getRequestDispatcher("/regist3.jsp").forward(req, resp);\r
+            this.getServletContext().getRequestDispatcher("/html/regist3.jsp").forward(req, resp);\r
         } finally {\r
             pm.close();\r
         }\r
@@ -94,7 +94,7 @@ public class RegistServlet extends HttpServlet {
                 req.setAttribute("password1", password1);\r
                 req.setAttribute("password2", password2);\r
 \r
-                this.getServletContext().getRequestDispatcher("/regist3.jsp").forward(req, resp);\r
+                this.getServletContext().getRequestDispatcher("/html/regist3.jsp").forward(req, resp);\r
 \r
                 return;\r
             }\r
@@ -121,7 +121,7 @@ public class RegistServlet extends HttpServlet {
             session.setAttribute("login.loginTicketKey", loginTicketKey);\r
 \r
             // regist4.jspに遷移します。\r
-            this.getServletContext().getRequestDispatcher("/regist4.jsp").forward(req, resp);\r
+            this.getServletContext().getRequestDispatcher("/html/regist4.jsp").forward(req, resp);\r
         } finally {\r
             pm.close();\r
         }\r

diff --git a/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/RegistTempServlet.java b/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/RegistTempServlet.java
similarity index 88%
rename from andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/RegistTempServlet.java
rename to andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/RegistTempServlet.java
index 4b6e491..97eee06 100644 (file)
--- a/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/RegistTempServlet.java
+++ b/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/RegistTempServlet.java
@@ -1,5 +1,5 @@
 \r
-package jp.gr.java_conf.u6k.andro_memo.web.servlet;\r
+package jp.gr.java_conf.u6k.andro_memo.web.servlet.html.v1;\r
 \r
 import java.io.IOException;\r
 \r
@@ -42,7 +42,7 @@ public class RegistTempServlet extends HttpServlet {
                 req.setAttribute("message", message);\r
                 req.setAttribute("email", email);\r
 \r
-                this.getServletContext().getRequestDispatcher("/regist1.jsp").forward(req, resp);\r
+                this.getServletContext().getRequestDispatcher("/html/regist1.jsp").forward(req, resp);\r
 \r
                 return;\r
             }\r
@@ -63,7 +63,7 @@ public class RegistTempServlet extends HttpServlet {
             }\r
 \r
             // regist2.jspへ遷移します。\r
-            this.getServletContext().getRequestDispatcher("/regist2.jsp").forward(req, resp);\r
+            this.getServletContext().getRequestDispatcher("/html/regist2.jsp").forward(req, resp);\r
         } finally {\r
             pm.close();\r
         }\r

diff --git a/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/user/EditMemoServlet.java b/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/user/EditMemoServlet.java
similarity index 92%
rename from andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/user/EditMemoServlet.java
rename to andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/user/EditMemoServlet.java
index 091840b..6652d74 100644 (file)
--- a/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/user/EditMemoServlet.java
+++ b/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/user/EditMemoServlet.java
@@ -1,5 +1,5 @@
 \r
-package jp.gr.java_conf.u6k.andro_memo.web.servlet.user;\r
+package jp.gr.java_conf.u6k.andro_memo.web.servlet.html.v1.user;\r
 \r
 import java.io.IOException;\r
 \r
@@ -55,7 +55,7 @@ public class EditMemoServlet extends HttpServlet {
                 req.setAttribute("updateDatetime", memo.getUpdateDatetime());\r
             }\r
 \r
-            req.getRequestDispatcher("/user/editMemo.jsp").forward(req, resp);\r
+            req.getRequestDispatcher("/html/user/editMemo.jsp").forward(req, resp);\r
         } finally {\r
             pm.close();\r
         }\r
@@ -107,7 +107,7 @@ public class EditMemoServlet extends HttpServlet {
                 }\r
             }\r
 \r
-            resp.sendRedirect(this.getServletContext().getContextPath() + "/user/myPage.servlet");\r
+            resp.sendRedirect(this.getServletContext().getContextPath() + "/html/user/myPage.servlet");\r
         } finally {\r
             pm.close();\r
         }\r

diff --git a/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/user/LogoutServlet.java b/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/user/LogoutServlet.java
similarity index 84%
rename from andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/user/LogoutServlet.java
rename to andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/user/LogoutServlet.java
index eebfe8f..2ceab55 100644 (file)
--- a/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/user/LogoutServlet.java
+++ b/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/user/LogoutServlet.java
@@ -1,5 +1,5 @@
 \r
-package jp.gr.java_conf.u6k.andro_memo.web.servlet.user;\r
+package jp.gr.java_conf.u6k.andro_memo.web.servlet.html.v1.user;\r
 \r
 import java.io.IOException;\r
 \r
@@ -27,7 +27,7 @@ public class LogoutServlet extends HttpServlet {
             UserModel userModel = new UserModel(pm);\r
             userModel.logout(loginTicketKey);\r
 \r
-            req.getRequestDispatcher("/index.jsp").forward(req, resp);\r
+            req.getRequestDispatcher("/html/index.jsp").forward(req, resp);\r
         } finally {\r
             pm.close();\r
         }\r

diff --git a/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/user/MyPageServlet.java b/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/user/MyPageServlet.java
similarity index 90%
rename from andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/user/MyPageServlet.java
rename to andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/user/MyPageServlet.java
index e017846..d9d810e 100644 (file)
--- a/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/user/MyPageServlet.java
+++ b/andro-memo-web/src/jp/gr/java_conf/u6k/andro_memo/web/servlet/html/v1/user/MyPageServlet.java
@@ -1,5 +1,5 @@
 \r
-package jp.gr.java_conf.u6k.andro_memo.web.servlet.user;\r
+package jp.gr.java_conf.u6k.andro_memo.web.servlet.html.v1.user;\r
 \r
 import java.io.IOException;\r
 import java.util.ArrayList;\r
@@ -52,7 +52,7 @@ public class MyPageServlet extends HttpServlet {
             req.setAttribute("email", user.getEmail());\r
             req.setAttribute("memoList", memoList);\r
 \r
-            req.getRequestDispatcher("/user/mypage.jsp").forward(req, resp);\r
+            req.getRequestDispatcher("/html/user/mypage.jsp").forward(req, resp);\r
         } finally {\r
             pm.close();\r
         }\r

diff --git a/andro-memo-web/war/WEB-INF/web.xml b/andro-memo-web/war/WEB-INF/web.xml
index 7e6969f..0362c77 100644 (file)
--- a/andro-memo-web/war/WEB-INF/web.xml
+++ b/andro-memo-web/war/WEB-INF/web.xml
@@ -7,57 +7,57 @@
     version="2.5">
 
     <servlet>
-        <servlet-name>RegistTempServlet</servlet-name>
-        <servlet-class>jp.gr.java_conf.u6k.andro_memo.web.servlet.RegistTempServlet</servlet-class>
+        <servlet-name>html.v1.RegistTempServlet</servlet-name>
+        <servlet-class>jp.gr.java_conf.u6k.andro_memo.web.servlet.html.v1.RegistTempServlet</servlet-class>
     </servlet>
     <servlet-mapping>
-        <servlet-name>RegistTempServlet</servlet-name>
-        <url-pattern>/registTemp.servlet</url-pattern>
+        <servlet-name>html.v1.RegistTempServlet</servlet-name>
+        <url-pattern>/html/registTemp.servlet</url-pattern>
     </servlet-mapping>
 
     <servlet>
-        <servlet-name>RegistServlet</servlet-name>
-        <servlet-class>jp.gr.java_conf.u6k.andro_memo.web.servlet.RegistServlet</servlet-class>
+        <servlet-name>html.v1.RegistServlet</servlet-name>
+        <servlet-class>jp.gr.java_conf.u6k.andro_memo.web.servlet.html.v1.RegistServlet</servlet-class>
     </servlet>
     <servlet-mapping>
-        <servlet-name>RegistServlet</servlet-name>
-        <url-pattern>/regist.servlet</url-pattern>
+        <servlet-name>html.v1.RegistServlet</servlet-name>
+        <url-pattern>/html/regist.servlet</url-pattern>
     </servlet-mapping>
 
     <servlet>
-        <servlet-name>LoginServlet</servlet-name>
-        <servlet-class>jp.gr.java_conf.u6k.andro_memo.web.servlet.LoginServlet</servlet-class>
+        <servlet-name>html.v1.LoginServlet</servlet-name>
+        <servlet-class>jp.gr.java_conf.u6k.andro_memo.web.servlet.html.v1.LoginServlet</servlet-class>
     </servlet>
     <servlet-mapping>
-        <servlet-name>LoginServlet</servlet-name>
-        <url-pattern>/login.servlet</url-pattern>
+        <servlet-name>html.v1.LoginServlet</servlet-name>
+        <url-pattern>/html/login.servlet</url-pattern>
     </servlet-mapping>
 
     <servlet>
-        <servlet-name>user.MyPageServlet</servlet-name>
-        <servlet-class>jp.gr.java_conf.u6k.andro_memo.web.servlet.user.MyPageServlet</servlet-class>
+        <servlet-name>html.v1.user.MyPageServlet</servlet-name>
+        <servlet-class>jp.gr.java_conf.u6k.andro_memo.web.servlet.html.v1.user.MyPageServlet</servlet-class>
     </servlet>
     <servlet-mapping>
-        <servlet-name>user.MyPageServlet</servlet-name>
-        <url-pattern>/user/myPage.servlet</url-pattern>
+        <servlet-name>html.v1.user.MyPageServlet</servlet-name>
+        <url-pattern>/html/user/myPage.servlet</url-pattern>
     </servlet-mapping>
 
     <servlet>
-        <servlet-name>user.LogoutServlet</servlet-name>
-        <servlet-class>jp.gr.java_conf.u6k.andro_memo.web.servlet.user.LogoutServlet</servlet-class>
+        <servlet-name>html.v1.user.LogoutServlet</servlet-name>
+        <servlet-class>jp.gr.java_conf.u6k.andro_memo.web.servlet.html.v1.user.LogoutServlet</servlet-class>
     </servlet>
     <servlet-mapping>
-        <servlet-name>user.LogoutServlet</servlet-name>
-        <url-pattern>/user/logout.servlet</url-pattern>
+        <servlet-name>html.v1.user.LogoutServlet</servlet-name>
+        <url-pattern>/html/user/logout.servlet</url-pattern>
     </servlet-mapping>
 
     <servlet>
-        <servlet-name>user.EditMemoServlet</servlet-name>
-        <servlet-class>jp.gr.java_conf.u6k.andro_memo.web.servlet.user.EditMemoServlet</servlet-class>
+        <servlet-name>html.v1.user.EditMemoServlet</servlet-name>
+        <servlet-class>jp.gr.java_conf.u6k.andro_memo.web.servlet.html.v1.user.EditMemoServlet</servlet-class>
     </servlet>
     <servlet-mapping>
-        <servlet-name>user.EditMemoServlet</servlet-name>
-        <url-pattern>/user/editMemo.servlet</url-pattern>
+        <servlet-name>html.v1.user.EditMemoServlet</servlet-name>
+        <url-pattern>/html/user/editMemo.servlet</url-pattern>
     </servlet-mapping>
 
     <servlet>
@@ -81,7 +81,7 @@
     </servlet-mapping>
 
     <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
+        <welcome-file>index.html</welcome-file>
     </welcome-file-list>
 
 </web-app>

diff --git a/andro-memo-web/war/index.jsp b/andro-memo-web/war/html/index.jsp
similarity index 79%
rename from andro-memo-web/war/index.jsp
rename to andro-memo-web/war/html/index.jsp
index 19cc667..d1e2bd1 100644 (file)
--- a/andro-memo-web/war/index.jsp
+++ b/andro-memo-web/war/html/index.jsp
@@ -13,10 +13,9 @@
     </head>\r
     <body>\r
         <h1>AndroMemo</h1>\r
-        <p>${contextPath}</p>\r
         <ul>\r
-            <li><a href="${contextPath}/login.jsp">ログイン</a></li>\r
-            <li><a href="${contextPath}/regist1.jsp">会員登録</a></li>\r
+            <li><a href="${contextPath}/html/login.jsp">ログイン</a></li>\r
+            <li><a href="${contextPath}/html/regist1.jsp">会員登録</a></li>\r
             <li><a href="${contextPath}/res/app/andro-memo-android.apk">Androidアプリをダウンロード</a></li>\r
         </ul>    \r
     </body>\r

diff --git a/andro-memo-web/war/login.jsp b/andro-memo-web/war/html/login.jsp
similarity index 88%
rename from andro-memo-web/war/login.jsp
rename to andro-memo-web/war/html/login.jsp
index 0093965..6c8be9b 100644 (file)
--- a/andro-memo-web/war/login.jsp
+++ b/andro-memo-web/war/html/login.jsp
@@ -14,11 +14,11 @@
     <body>\r
         <h1>AndroMemo</h1>\r
         <p>\r
-            <a href="${contextPath}/index.jsp">ホーム</a>\r
+            <a href="${contextPath}/html/index.jsp">ホーム</a>\r
         </p>\r
         <hr>\r
         <h2>ログイン</h2>\r
-        <form action="${contextPath}/login.servlet" method="POST">\r
+        <form action="${contextPath}/html/login.servlet" method="POST">\r
             <table border="0">\r
                 <c:if test="${!empty message}">\r
                 <tr>\r

diff --git a/andro-memo-web/war/regist1.jsp b/andro-memo-web/war/html/regist1.jsp
similarity index 87%
rename from andro-memo-web/war/regist1.jsp
rename to andro-memo-web/war/html/regist1.jsp
index ba135ec..c8be8ed 100644 (file)
--- a/andro-memo-web/war/regist1.jsp
+++ b/andro-memo-web/war/html/regist1.jsp
@@ -14,12 +14,12 @@
     <body>\r
         <h1>AndroMemo</h1>\r
         <p>\r
-            <a href="${contextPath}/index.jsp">ホーム</a>\r
+            <a href="${contextPath}/html/index.jsp">ホーム</a>\r
         </p>\r
         <hr>\r
         <h2>会員登録</h2>\r
         <p>メールアドレスを入力してください。会員登録のご案内をお送りします。</p>\r
-        <form action="${contextPath}/registTemp.servlet" method="POST">\r
+        <form action="${contextPath}/html/registTemp.servlet" method="POST">\r
             <table border="0">\r
                 <c:if test="${!empty message}">\r
                 <tr>\r

diff --git a/andro-memo-web/war/regist2.jsp b/andro-memo-web/war/html/regist2.jsp
similarity index 91%
rename from andro-memo-web/war/regist2.jsp
rename to andro-memo-web/war/html/regist2.jsp
index 68c73f1..16e9b9a 100644 (file)
--- a/andro-memo-web/war/regist2.jsp
+++ b/andro-memo-web/war/html/regist2.jsp
@@ -14,7 +14,7 @@
     <body>\r
         <h1>AndroMemo</h1>\r
         <p>\r
-            <a href="${contextPath}/index.jsp">ホーム</a>\r
+            <a href="${contextPath}/html/index.jsp">ホーム</a>\r
         </p>\r
         <hr>\r
         <h2>会員登録</h2>\r

diff --git a/andro-memo-web/war/regist3.jsp b/andro-memo-web/war/html/regist3.jsp
similarity index 89%
rename from andro-memo-web/war/regist3.jsp
rename to andro-memo-web/war/html/regist3.jsp
index 60174e2..2a753a7 100644 (file)
--- a/andro-memo-web/war/regist3.jsp
+++ b/andro-memo-web/war/html/regist3.jsp
@@ -14,12 +14,12 @@
     <body>\r
         <h1>AndroMemo</h1>\r
         <p>\r
-            <a href="${contextPath}/index.jsp">ホーム</a>\r
+            <a href="${contextPath}/html/index.jsp">ホーム</a>\r
         </p>\r
         <hr>\r
         <h2>会員登録</h2>\r
         <p>会員登録を完了するため、以下の情報を入力してください。</p>\r
-        <form action="${contextPath}/regist.servlet" method="POST">\r
+        <form action="${contextPath}/html/regist.servlet" method="POST">\r
             <table border="0">\r
                 <c:if test="${!empty message}">\r
                 <tr>\r

diff --git a/andro-memo-web/war/regist4.jsp b/andro-memo-web/war/html/regist4.jsp
similarity index 81%
rename from andro-memo-web/war/regist4.jsp
rename to andro-memo-web/war/html/regist4.jsp
index d904072..aa59d5c 100644 (file)
--- a/andro-memo-web/war/regist4.jsp
+++ b/andro-memo-web/war/html/regist4.jsp
@@ -14,11 +14,11 @@
     <body>\r
         <h1>AndroMemo</h1>\r
         <p>\r
-            <a href="${contextPath}/index.jsp">ホーム</a>\r
+            <a href="${contextPath}/html/index.jsp">ホーム</a>\r
         </p>\r
         <hr>\r
         <h2>会員登録完了</h2>\r
         <p>会員登録を完了しました。AndroMemoで快適なメモ生活をお送りください。</p>\r
-        <p><a href="${contextPath}/user/myPage.servlet">マイトップ</a>へ。</p>\r
+        <p><a href="${contextPath}/html/user/myPage.servlet">マイトップ</a>へ。</p>\r
     </body>\r
 </html>\r

diff --git a/andro-memo-web/war/user/editMemo.jsp b/andro-memo-web/war/html/user/editMemo.jsp
similarity index 79%
rename from andro-memo-web/war/user/editMemo.jsp
rename to andro-memo-web/war/html/user/editMemo.jsp
index 02796f9..4c101ab 100644 (file)
--- a/andro-memo-web/war/user/editMemo.jsp
+++ b/andro-memo-web/war/html/user/editMemo.jsp
@@ -14,14 +14,14 @@
     <body>\r
         <h1>AndroMemo</h1>\r
         <p>\r
-            <a href="${contextPath}/user/myPage.servlet">マイページ</a>&nbsp;&nbsp;\r
-            <a href="${contextPath}/user/editMemo.servlet">新規メモ</a>&nbsp;&nbsp;\r
-            <a href="${contextPath}/user/logout.servlet">ログアウト</a>&nbsp;&nbsp;\r
+            <a href="${contextPath}/html/user/myPage.servlet">マイページ</a>&nbsp;&nbsp;\r
+            <a href="${contextPath}/html/user/editMemo.servlet">新規メモ</a>&nbsp;&nbsp;\r
+            <a href="${contextPath}/html/user/logout.servlet">ログアウト</a>&nbsp;&nbsp;\r
             ${email}&nbsp;さん\r
         </p>\r
         <hr>\r
         <h2>メモ編集</h2>\r
-        <form action="${contextPath}/user/editMemo.servlet" method="post">\r
+        <form action="${contextPath}/html/user/editMemo.servlet" method="post">\r
             <table>\r
                 <tr>\r
                     <th>タイトル</th>\r

diff --git a/andro-memo-web/war/user/mypage.jsp b/andro-memo-web/war/html/user/mypage.jsp
similarity index 72%
rename from andro-memo-web/war/user/mypage.jsp
rename to andro-memo-web/war/html/user/mypage.jsp
index d9b8074..8bc935b 100644 (file)
--- a/andro-memo-web/war/user/mypage.jsp
+++ b/andro-memo-web/war/html/user/mypage.jsp
@@ -14,9 +14,9 @@
     <body>\r
         <h1>AndroMemo</h1>\r
         <p>\r
-            <a href="${contextPath}/user/myPage.servlet">マイページ</a>&nbsp;&nbsp;\r
-            <a href="${contextPath}/user/editMemo.servlet">新規メモ</a>&nbsp;&nbsp;\r
-            <a href="${contextPath}/user/logout.servlet">ログアウト</a>&nbsp;&nbsp;\r
+            <a href="${contextPath}/html/user/myPage.servlet">マイページ</a>&nbsp;&nbsp;\r
+            <a href="${contextPath}/html/user/editMemo.servlet">新規メモ</a>&nbsp;&nbsp;\r
+            <a href="${contextPath}/html/user/logout.servlet">ログアウト</a>&nbsp;&nbsp;\r
             ${email}&nbsp;さん\r
         </p>\r
         <hr>\r
@@ -29,7 +29,7 @@
             </tr>\r
             <c:forEach items="${memoList}" var="memo">\r
             <tr>\r
-                <td><a href="${contextPath}/user/editMemo.servlet?key=${memo.key}">${memo.title}</a></td>\r
+                <td><a href="${contextPath}/html/user/editMemo.servlet?key=${memo.key}">${memo.title}</a></td>\r
                 <td><fmt:formatDate value="${memo.updateDatetime}" pattern="yyyy/MM/dd HH:mm:ss" /></td>\r
             </tr>\r
             </c:forEach>\r

diff --git a/andro-memo-web/war/index.html b/andro-memo-web/war/index.html
new file mode 100644 (file)
index 0000000..e9008df
--- /dev/null
+++ b/andro-memo-web/war/index.html
@@ -0,0 +1,10 @@
+<html>\r
+       <head>\r
+               <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\r
+               <title>ホーム | AndroMemo</title>\r
+       </head>\r
+       <body>\r
+               <h1>AndroMemo</h1>\r
+               <a href="html/index.jsp">簡易HTML</a>\r
+       </body>\r
+</html>\r