OSDN Git Service

add user session
authorinabatch <nobuyuki.inaba@ULTP0259.ulsystems.co.jp>
Sat, 16 May 2009 14:24:37 +0000 (23:24 +0900)
committerinabatch <nobuyuki.inaba@ULTP0259.ulsystems.co.jp>
Sat, 16 May 2009 14:24:37 +0000 (23:24 +0900)
15 files changed:
src/jp/sourceforge/manganetwork/CloudMangaNetworkServlet.java [deleted file]
src/jp/sourceforge/manganetwork/WicketApplication.java
src/jp/sourceforge/manganetwork/page/ApplicationPage.html
src/jp/sourceforge/manganetwork/page/ApplicationPage.java
src/jp/sourceforge/manganetwork/page/LoginPage.java
src/jp/sourceforge/manganetwork/page/MenuApplicationPage.html
src/jp/sourceforge/manganetwork/page/MenuApplicationPage.java
war/WEB-INF/classes/jp/sourceforge/manganetwork/CloudMangaNetworkServlet.class [deleted file]
war/WEB-INF/classes/jp/sourceforge/manganetwork/WicketApplication.class
war/WEB-INF/classes/jp/sourceforge/manganetwork/page/ApplicationPage.class
war/WEB-INF/classes/jp/sourceforge/manganetwork/page/ApplicationPage.html [deleted file]
war/WEB-INF/classes/jp/sourceforge/manganetwork/page/LoginPage$1.class
war/WEB-INF/classes/jp/sourceforge/manganetwork/page/LoginPage.class
war/WEB-INF/classes/jp/sourceforge/manganetwork/page/MenuApplicationPage.class
war/WEB-INF/classes/jp/sourceforge/manganetwork/page/MenuApplicationPage.html [deleted file]

diff --git a/src/jp/sourceforge/manganetwork/CloudMangaNetworkServlet.java b/src/jp/sourceforge/manganetwork/CloudMangaNetworkServlet.java
deleted file mode 100644 (file)
index 73b7cc6..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-package jp.sourceforge.manganetwork;\r
-\r
-import java.io.IOException;\r
-import javax.servlet.http.*;\r
-\r
-@SuppressWarnings("serial")\r
-public class CloudMangaNetworkServlet extends HttpServlet {\r
-       public void doGet(HttpServletRequest req, HttpServletResponse resp)\r
-                       throws IOException {\r
-               resp.setContentType("text/plain");\r
-               resp.getWriter().println("Hello, world");\r
-       }\r
-}\r
index fbb3636..3ce2f75 100644 (file)
@@ -3,8 +3,13 @@ package jp.sourceforge.manganetwork;
 import jp.sourceforge.manganetwork.page.AdminHomePage;\r
 import jp.sourceforge.manganetwork.page.LoginPage;\r
 \r
+import org.apache.wicket.Request;\r
+import org.apache.wicket.RequestCycle;\r
+import org.apache.wicket.Response;\r
+import org.apache.wicket.Session;\r
 import org.apache.wicket.protocol.http.HttpSessionStore;\r
 import org.apache.wicket.protocol.http.WebApplication;\r
+import org.apache.wicket.request.IRequestCycleProcessor;\r
 import org.apache.wicket.session.ISessionStore;\r
 \r
 public class WicketApplication extends WebApplication {\r
@@ -19,6 +24,15 @@ public class WicketApplication extends WebApplication {
        }\r
 \r
        @Override\r
+       public Session newSession(Request request, Response response) {\r
+               return new UserSession(request);\r
+       }\r
+\r
+       @Override\r
+       protected IRequestCycleProcessor newRequestCycleProcessor() {\r
+               return new MyWebRequestCycleProcessor();\r
+       }\r
+       @Override\r
        protected void init() {\r
                super.init();\r
                setEncoding();\r
index 1bc6cbd..2b05d84 100644 (file)
@@ -6,7 +6,7 @@
                <wicket:link>\r
                        <link rel="stylesheet" type="text/css" href="stylesheets/style.css">\r
                </wicket:link>\r
-               <title></title>\r
+               <title>マンガネットワーク</title>\r
     </head>\r
        <body>\r
                <div id="feedback" wicket:id="feedback" />\r
@@ -17,7 +17,7 @@
                <wicket:child />\r
                </div>\r
                <p/>\r
-               <div id="footer">\r
+               <div id="footer" align="center">\r
                        <span style="text-align: center;">powered by Wicket</span>\r
                </div>\r
        </body>\r
index 67dd11c..8f9b092 100644 (file)
@@ -1,5 +1,8 @@
 package jp.sourceforge.manganetwork.page;\r
 \r
+import jp.sourceforge.manganetwork.UserSession;\r
+import jp.sourceforge.manganetwork.model.User;\r
+\r
 import org.apache.wicket.markup.html.WebPage;\r
 import org.apache.wicket.markup.html.panel.FeedbackPanel;\r
 \r
@@ -10,4 +13,8 @@ public class ApplicationPage extends WebPage {
                add( new FeedbackPanel("feedback") );\r
        }\r
        \r
+       public User getLoginUser()\r
+       {\r
+               return ((UserSession)getSession()).getUser();\r
+       }\r
 }\r
index ca43f42..b116e69 100644 (file)
@@ -1,5 +1,8 @@
 package jp.sourceforge.manganetwork.page;\r
 \r
+import jp.sourceforge.manganetwork.UserSession;\r
+import jp.sourceforge.manganetwork.model.User;\r
+\r
 import org.apache.wicket.markup.html.form.Form;\r
 import org.apache.wicket.markup.html.form.PasswordTextField;\r
 import org.apache.wicket.markup.html.form.TextField;\r
@@ -24,6 +27,10 @@ public class LoginPage extends ApplicationPage {
                                if (userNameTextField.getModelObjectAsString().equals("admin") &&\r
                                        passwordTextField.getModelObjectAsString().equals("admin") )\r
                                {\r
+                                       User user = new User();\r
+                                       user.setName("admin");\r
+                                       \r
+                                       ((UserSession)getSession()).setUser(user);\r
                                        setResponsePage(HomePage.class);\r
                                }\r
                                else\r
index 0fbe476..0c9c579 100644 (file)
@@ -1,6 +1,7 @@
 <html>\r
   <title>マンガネットワーク</title>\r
   <head>\r
+       <wicket:head>\r
     <wicket:link>\r
       <script type="text/javascript" src="javascripts/spinelz_lib/prototype.js"></script>\r
       <script type="text/javascript" src="javascripts/spinelz_lib/scriptaculous.js"></script>\r
@@ -8,11 +9,14 @@
       <script type="text/javascript" src="javascripts/spinelz/menubar.js"></script>\r
       <link rel="stylesheet" href="stylesheets/spinelz/menubar.css" type="text/css" />\r
     </wicket:link>\r
+    </wicket:head>\r
   </head>\r
   <body>\r
-    <div id="header">\r
-      <h1>マンガネットワーク</h1>\r
-    </div>\r
+       <wicket:extend>\r
+       <div align="right">\r
+               <a href="#" wicket:id="loginLink">ログイン</a>\r
+               <a href="#" wicket:id="logoutLink">ログアウト</a>\r
+       </div>\r
     <div id="menucontents">\r
       <div>ホーム</div>\r
       <div>本\r
@@ -37,8 +41,8 @@
       alert('foo function was called.');\r
       }\r
     </script>\r
-\r
     <wicket:child />\r
+       </wicket:extend>    \r
 \r
   </body>\r
 </html>\r
index ea8773a..626bcad 100644 (file)
@@ -1,7 +1,30 @@
 package jp.sourceforge.manganetwork.page;\r
 \r
-import org.apache.wicket.markup.html.WebPage;\r
+import org.apache.wicket.markup.html.link.PageLink;\r
 \r
-public class MenuApplicationPage extends WebPage {\r
 \r
+public class MenuApplicationPage extends ApplicationPage {\r
+\r
+       public MenuApplicationPage()\r
+       {\r
+               PageLink loginLink = createPageLink("loginLink", HomePage.class);\r
+               PageLink logoutLink = createPageLink("logoutLink", HomePage.class);\r
+               if (getLoginUser() != null)\r
+               {\r
+                       loginLink.setVisible(false);\r
+                       logoutLink.setVisible(true);\r
+               }\r
+               else\r
+               {\r
+                       loginLink.setVisible(true);\r
+                       logoutLink.setVisible(false);\r
+               }\r
+               \r
+               add(loginLink);\r
+               add(logoutLink);\r
+       }\r
+\r
+       private PageLink createPageLink(String id, Class pageClass) {\r
+               return new PageLink(id, pageClass);\r
+       }\r
 }\r
diff --git a/war/WEB-INF/classes/jp/sourceforge/manganetwork/CloudMangaNetworkServlet.class b/war/WEB-INF/classes/jp/sourceforge/manganetwork/CloudMangaNetworkServlet.class
deleted file mode 100644 (file)
index 9c48d82..0000000
Binary files a/war/WEB-INF/classes/jp/sourceforge/manganetwork/CloudMangaNetworkServlet.class and /dev/null differ
index a792626..e9693e6 100644 (file)
Binary files a/war/WEB-INF/classes/jp/sourceforge/manganetwork/WicketApplication.class and b/war/WEB-INF/classes/jp/sourceforge/manganetwork/WicketApplication.class differ
index 1649293..f42e3c1 100644 (file)
Binary files a/war/WEB-INF/classes/jp/sourceforge/manganetwork/page/ApplicationPage.class and b/war/WEB-INF/classes/jp/sourceforge/manganetwork/page/ApplicationPage.class differ
diff --git a/war/WEB-INF/classes/jp/sourceforge/manganetwork/page/ApplicationPage.html b/war/WEB-INF/classes/jp/sourceforge/manganetwork/page/ApplicationPage.html
deleted file mode 100644 (file)
index 1bc6cbd..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"\r
-    "http://www.w3.org/TR/html4/loose.dtd">\r
-<html>\r
-       <head>\r
-               <meta http-equiv="Content-Type" content="text/html; charset=utf-8">\r
-               <wicket:link>\r
-                       <link rel="stylesheet" type="text/css" href="stylesheets/style.css">\r
-               </wicket:link>\r
-               <title></title>\r
-    </head>\r
-       <body>\r
-               <div id="feedback" wicket:id="feedback" />\r
-               <div id="header">\r
-                       <h1>マンガネットワーク</h1>\r
-               </div>\r
-               <div id="body">                             \r
-               <wicket:child />\r
-               </div>\r
-               <p/>\r
-               <div id="footer">\r
-                       <span style="text-align: center;">powered by Wicket</span>\r
-               </div>\r
-       </body>\r
-</html>
\ No newline at end of file
index 86205ff..5ce8fd8 100644 (file)
Binary files a/war/WEB-INF/classes/jp/sourceforge/manganetwork/page/LoginPage$1.class and b/war/WEB-INF/classes/jp/sourceforge/manganetwork/page/LoginPage$1.class differ
index 8bc340d..ebd590c 100644 (file)
Binary files a/war/WEB-INF/classes/jp/sourceforge/manganetwork/page/LoginPage.class and b/war/WEB-INF/classes/jp/sourceforge/manganetwork/page/LoginPage.class differ
index fa2a38b..c28dcb8 100644 (file)
Binary files a/war/WEB-INF/classes/jp/sourceforge/manganetwork/page/MenuApplicationPage.class and b/war/WEB-INF/classes/jp/sourceforge/manganetwork/page/MenuApplicationPage.class differ
diff --git a/war/WEB-INF/classes/jp/sourceforge/manganetwork/page/MenuApplicationPage.html b/war/WEB-INF/classes/jp/sourceforge/manganetwork/page/MenuApplicationPage.html
deleted file mode 100644 (file)
index 0fbe476..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>\r
-  <title>マンガネットワーク</title>\r
-  <head>\r
-    <wicket:link>\r
-      <script type="text/javascript" src="javascripts/spinelz_lib/prototype.js"></script>\r
-      <script type="text/javascript" src="javascripts/spinelz_lib/scriptaculous.js"></script>\r
-      <script type="text/javascript" src="javascripts/spinelz_lib/spinelz_util.js"></script>\r
-      <script type="text/javascript" src="javascripts/spinelz/menubar.js"></script>\r
-      <link rel="stylesheet" href="stylesheets/spinelz/menubar.css" type="text/css" />\r
-    </wicket:link>\r
-  </head>\r
-  <body>\r
-    <div id="header">\r
-      <h1>マンガネットワーク</h1>\r
-    </div>\r
-    <div id="menucontents">\r
-      <div>ホーム</div>\r
-      <div>本\r
-       <div>検索</div>\r
-       <div>登録</div>\r
-      </div>\r
-      <div>ワークフロー\r
-       <div>検索</div>\r
-       <div>登録</div>\r
-      </div>\r
-      <div>連絡\r
-       <div>登録</div>\r
-      </div>\r
-      <div>ユーザ情報\r
-       <div>参照</div>\r
-      </div>\r
-    </div>\r
-\r
-    <script type="text/javascript">\r
-      var menubar = new MenuBar('menucontents');\r
-      var foo = function() {\r
-      alert('foo function was called.');\r
-      }\r
-    </script>\r
-\r
-    <wicket:child />\r
-\r
-  </body>\r
-</html>\r