Index: lams_central/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/struts-forms.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/conf/xdoclet/struts-forms.xml	10 Aug 2006 04:05:13 -0000	1.1
@@ -0,0 +1,20 @@
+<form-bean name="UserForm" type="org.apache.struts.action.DynaActionForm">
+	<form-property name="userId" type="java.lang.Integer" />
+	<form-property name="login" type="java.lang.String" />
+	<form-property name="password" type="java.lang.String" />
+	<form-property name="title" type="java.lang.String" />
+	<form-property name="firstName" type="java.lang.String" />
+	<form-property name="lastName" type="java.lang.String" />
+	<form-property name="addressLine1" type="java.lang.String" />
+	<form-property name="addressLine2" type="java.lang.String" />
+	<form-property name="addressLine3" type="java.lang.String" />
+	<form-property name="city" type="java.lang.String" />
+	<form-property name="state" type="java.lang.String" />
+	<form-property name="country" type="java.lang.String" />
+	<form-property name="dayPhone" type="java.lang.String" />
+	<form-property name="eveningPhone" type="java.lang.String" />
+	<form-property name="mobilePhone" type="java.lang.String" />
+	<form-property name="fax" type="java.lang.String" />
+	<form-property name="email" type="java.lang.String" />
+	<form-property name="localeId" type="java.lang.Byte" />
+</form-bean>
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java,v
diff -u -r1.1 -r1.2
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	28 Jun 2006 05:16:58 -0000	1.1
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	10 Aug 2006 04:05:13 -0000	1.2
@@ -22,13 +22,24 @@
  */
 package org.lamsfoundation.lams.web;
 
+import java.util.Collections;
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action.Action;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.usermanagement.SupportedLocale;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * @version
@@ -43,15 +54,56 @@
  */
 
 /**
- * @struts.action path="/profile"
- *                validation="false"
+ * @struts:action path="/profile"
+ *                name="UserForm"
+ * 	              scope="request"
+ *                parameter="method"
+ * 				  validate="false"
  * 
- * @struts.action-forward name="profile"
- *                        path="/profile.jsp"
+ * @struts:action-forward name="view" path=".profile"
+ * @struts:action-forward name="edit" path=".editprofile"
  */
-public class ProfileAction extends Action {
+public class ProfileAction extends LamsDispatchAction {
 	
-	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception{
-		return mapping.findForward("profile");
+	private static Logger log = Logger.getLogger(ProfileAction.class);
+	private static IUserManagementService service;
+	private static List<SupportedLocale> locales;
+
+	public ActionForward view(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws Exception {
+		
+		User requestor = (User)getService().getUserByLogin(request.getRemoteUser());
+		String fullName = requestor.getTitle()+" "+requestor.getFirstName()+" "+requestor.getLastName();
+		
+		request.setAttribute("fullName", fullName);
+		request.setAttribute("email", requestor.getEmail());
+		return mapping.findForward("view");
 	}
+	
+	public ActionForward edit(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws Exception {
+		
+		User requestor = (User)getService().getUserByLogin(request.getRemoteUser());
+		log.debug("editing profile of userId: "+requestor.getUserId());
+		DynaActionForm userForm = (DynaActionForm)form;
+		BeanUtils.copyProperties(userForm, requestor);
+		SupportedLocale locale = getService().getSupportedLocale(requestor.getLocaleLanguage(),requestor.getLocaleCountry());
+		userForm.set("localeId",locale.getLocaleId());
+		request.setAttribute("locales", locales);
+		return mapping.findForward("edit");
+	}
+	
+	private IUserManagementService getService(){
+		if(service==null){
+			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
+			service = (IUserManagementService) ctx.getBean("userManagementServiceTarget");
+			locales = getService().findAll(SupportedLocale.class);
+			Collections.sort(locales);
+		}
+		return service;
+	}
 }
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	10 Aug 2006 04:05:13 -0000	1.1
@@ -0,0 +1,87 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id: ProfileSaveAction.java,v 1.1 2006/08/10 04:05:13 jliew Exp $ */
+package org.lamsfoundation.lams.web;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * @author jliew
+ *
+ */
+
+/**
+ * @struts:action path="/saveprofile"
+ *                name="UserForm"
+ *                input=".editprofile"
+ * 	              scope="request"
+ * 				  validate="false"
+ * 
+ * @struts:action-forward name="profile" path="/profile.do?method=view"
+ */
+public class ProfileSaveAction extends Action {
+	
+	private static Logger log = Logger.getLogger(ProfileSaveAction.class);
+	private static IUserManagementService service;
+
+	public ActionForward execute(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws Exception {
+		
+		if(isCancelled(request)){
+			return mapping.findForward("profile");
+		}
+		
+		User requestor = (User)getService().getUserByLogin(request.getRemoteUser());
+		DynaActionForm userForm = (DynaActionForm)form;
+		BeanUtils.copyProperties(requestor,userForm);
+		getService().save(requestor);
+		log.debug("profile edited: "+requestor);
+		
+		return mapping.findForward("profile");
+	}
+	
+	private IUserManagementService getService(){
+		if(service==null){
+			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
+			service = (IUserManagementService) ctx.getBean("userManagementServiceTarget");
+		}
+		return service;
+	}
+
+}
Index: lams_central/web/editprofile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/editprofile.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/web/editprofile.jsp	10 Aug 2006 04:05:13 -0000	1.1
@@ -0,0 +1,99 @@
+<%@ page contentType="text/html; charset=utf-8" language="java" %>
+
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<h2><fmt:message key="title.profile.edit.screen"/></h2>
+
+<html:form action="/saveprofile.do" method="post">
+<html:hidden property="userId" />
+<html:hidden property="login" />
+<html:hidden property="password" />
+
+<div align="center"><html:errors/></div>
+<table>
+  <col align="right" /><col align="left" />
+    <tr>
+		<td><fmt:message key="label.username"/>:</td>
+		<td><bean:write name="UserForm" property="login" /></td>
+	</tr>
+	<tr>
+	<td><fmt:message key="label.title"/>:</td>
+		<td><html:text property="title" size="20" maxlength="32" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.first_name"/>:</td>
+		<td><html:text property="firstName" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.last_name"/>:</td>
+		<td><html:text property="lastName" size="20" maxlength="128" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.address_line_1"/>:</td>
+		<td><html:text property="addressLine1" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.address_line_2"/>:</td>
+		<td><html:text property="addressLine2" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.address_line_3"/>:</td>
+		<td><html:text property="addressLine3" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.city"/>:</td>
+		<td><html:text property="city" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.state"/>:</td>
+		<td><html:text property="state" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.country"/>:</td>
+		<td><html:text property="country" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.day_phone"/>:</td>
+		<td><html:text property="dayPhone" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.evening_phone"/>:</td>
+		<td><html:text property="eveningPhone" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.mobile_phone"/>:</td>
+		<td><html:text property="mobilePhone" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.fax"/>:</td>
+		<td><html:text property="fax" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.email"/>:</td>
+		<td><html:text property="email" size="20" maxlength="128" /></td>
+	</tr>
+	<tr>
+		<td><fmt:message key="label.language"/>:</td>
+		<td>
+			<html:select property="localeId">
+				<c:forEach items="${locales}" var="locale">
+					<html:option value="${locale.localeId}">
+						<c:out value="${locale.description}" />
+					</html:option>
+				</c:forEach>	
+			</html:select>
+		</td>
+	</tr>
+	<tr>
+		<td colspan=2 align="right">
+			<html:submit><fmt:message key="button.save"/></html:submit>
+			<html:reset><fmt:message key="button.reset"/></html:reset>
+			<html:cancel><fmt:message key="button.cancel"/></html:cancel>
+		</td>
+	</tr>
+</table>
+</html:form>
\ No newline at end of file
Index: lams_central/web/profile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/profile.jsp,v
diff -u -r1.1 -r1.2
--- lams_central/web/profile.jsp	28 Jun 2006 05:17:24 -0000	1.1
+++ lams_central/web/profile.jsp	10 Aug 2006 04:05:13 -0000	1.2
@@ -1,20 +1,15 @@
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
 
-<HTML>
-<HEAD>
-	<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<TITLE>LAMS::Profile</TITLE>
-	<lams:css/>
-</HEAD>
+<h2>My Profile</h2>
 
-<BODY>
-	<div id="page">	
-		<div id="content">
-			<p>In construction</p>
-		</div>
-		<div id="footer"></div>
-	</div>
-</BODY>
-	
-</HTML>
\ No newline at end of file
+<p>Name: <bean:write name="fullName" /><br />
+Email: <bean:write name="email" />
+</p>
+
+<p><a href="profile.do?method=edit">Edit My Profile</a><br />
+<a href="password.do">Change my password</a><br />
+<a href="">Update my portrait</a><br />
+[My Courses]
+</p>
\ No newline at end of file
Index: lams_central/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tiles/Attic/tiles-defs.xml,v
diff -u -r1.5 -r1.6
--- lams_central/web/WEB-INF/tiles/tiles-defs.xml	23 Jun 2006 08:01:10 -0000	1.5
+++ lams_central/web/WEB-INF/tiles/tiles-defs.xml	10 Aug 2006 04:05:50 -0000	1.6
@@ -22,6 +22,16 @@
 -->
 <tiles-definitions>
 
+	<definition name=".profile" path="/template.jsp">
+		<put name="titleKey" value="title.profile.window"/>
+		<put name="content" value="profile.jsp"/>	
+	</definition>
+	
+	<definition name=".editprofile" path="/template.jsp">
+		<put name="titleKey" value="title.edit.profile.window"/>
+		<put name="content" value="editprofile.jsp"/>	
+	</definition>
+
 	<definition name=".login" path="/template.jsp">
 		<put name="titleKey" value="title.login.window"/>
 		<put name="header" value="header.jsp"/>