Menu
▾
▴
[Andromdaplugins-cvs] CVS update: plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/mda/src/uml Northwind.TimeTracker.Model.xmi
|
From: Chris M. <cm...@us...> - 2006-08-29 02:39:39
|
User: cmicali
Date: 06/08/28 19:39:37
Modified: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain
UserDaoImpl.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web.Common/Membership
DomainMembershipProvider.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web
Home.aspx SearchTimecards.aspx Web.config
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Public
Login.aspx
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/mda/src/uml
Northwind.TimeTracker.Model.xmi
Added: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web
TimecardDetails.aspx TimecardDetails.aspx.cs
Removed: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web
EditTimecard.aspx EditTimecard.aspx.cs
Log:
- Updates to timetracker m2
Revision Changes Path
1.2 +2 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/UserDaoImpl.cs
Index: UserDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/UserDaoImpl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- UserDaoImpl.cs 28 Aug 2006 04:22:17 -0000 1.1
+++ UserDaoImpl.cs 29 Aug 2006 02:39:33 -0000 1.2
@@ -30,7 +30,7 @@
roles[i++] = role.Role.ToString();
}
UserVO userVO = new UserVO(entity.Id,
- entity.UserName,
+ entity.Username,
entity.Email,
entity.IsActive,
entity.Comment,
@@ -49,7 +49,7 @@
User entity = User.Factory.newInstance();
entity.Id = userVO.Id;
- entity.UserName = userVO.UserName;
+ entity.Username = userVO.Username;
entity.Email = userVO.Email;
entity.IsActive = userVO.IsActive;
entity.Comment = userVO.Comment;
1.2 +3 -3 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web.Common/Membership/DomainMembershipProvider.cs
Index: DomainMembershipProvider.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web.Common/Membership/DomainMembershipProvider.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- DomainMembershipProvider.cs 28 Aug 2006 04:22:19 -0000 1.1
+++ DomainMembershipProvider.cs 29 Aug 2006 02:39:34 -0000 1.2
@@ -291,7 +291,7 @@
{
userVO.Id = (long)membershipUser.ProviderUserKey;
}
- userVO.UserName = membershipUser.UserName;
+ userVO.Username = membershipUser.UserName;
userVO.Email = membershipUser.Email;
userVO.Comment = membershipUser.Comment;
userVO.IsActive = !membershipUser.IsLockedOut;
@@ -305,7 +305,7 @@
DateTime createDate = DateTime.MinValue;
if (userVO.CreationDate.HasValue) createDate = userVO.CreationDate.Value;
return new DomainMembershipUser(this.Name,
- userVO.UserName,
+ userVO.Username,
userVO.Id,
userVO.Email,
string.Empty,
@@ -371,7 +371,7 @@
public override MembershipUser CreateUser(string username, string password, string email, string passwordQuestion, string passwordAnswer, bool isApproved, object providerUserKey, out MembershipCreateStatus status)
{
UserVO userVO = new UserVO();
- userVO.UserName = username;
+ userVO.Username = username;
userVO.Email = email;
userVO.IsActive = !isApproved;
userVO.CreationDate = DateTime.Now;
1.2 +2 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Home.aspx
Index: Home.aspx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Home.aspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- Home.aspx 28 Aug 2006 04:22:21 -0000 1.1
+++ Home.aspx 29 Aug 2006 02:39:34 -0000 1.2
@@ -5,8 +5,8 @@
<ul>
<li class="first"><a class="selected" href="Home.aspx">Home</a></li>
<li><a href="EditTimecard.aspx">Timecard Details</a></li>
- <li><a href="SearchTimecards.aspx">Search timecards</a></li>
- <li><a href="ApproveTimecards.aspx">Approve timecards</a></li>
+ <li><a href="SearchTimecards.aspx">Search Timecards</a></li>
+ <li><a href="ApproveTimecards.aspx">Approve Timecards</a></li>
</ul>
</div>
1.2 +13 -1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/SearchTimecards.aspx
Index: SearchTimecards.aspx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/SearchTimecards.aspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- SearchTimecards.aspx 28 Aug 2006 04:22:21 -0000 1.1
+++ SearchTimecards.aspx 29 Aug 2006 02:39:34 -0000 1.2
@@ -17,7 +17,19 @@
<div class="menubar">
<ul>
- <li class="first"><a href="Home.aspx">Home</a></li><li><a href="timecard.html">Timecard Details</a></li><li><a class="selected" href="SearchTimecards.aspx">Search timecards</a></li><li><a href="approve-timecards.html">Approve timecards</a></li></ul>
+ <li class="first">
+ <a href="Home.aspx">Home</a>
+ </li>
+ <li>
+ <a href="TimecardDetails.aspx">Timecard Details</a>
+ </li>
+ <li>
+ <a class="selected" href="SearchTimecards.aspx">Search Timecards</a>
+ </li>
+ <li>
+ <a href="ApproveTimecards.aspx">Approve Timecards</a>
+ </li>
+ </ul>
</div>
<div class="content">
1.2 +3 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Web.config
Index: Web.config
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Web.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- Web.config 28 Aug 2006 04:22:21 -0000 1.1
+++ Web.config 29 Aug 2006 02:39:34 -0000 1.2
@@ -31,7 +31,8 @@
<add name="DomainRoleProvider" type="Northwind.TimeTracker.Web.Common.DomainRoleProvider, Northwind.TimeTracker.Web.Common"/>
</providers>
</roleManager>
- <compilation debug="true"/>
+ <compilation debug="true">
+ </compilation>
<!--
The <authentication> section enables configuration
of the security authentication mode used by
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx
Index: TimecardDetails.aspx
===================================================================
<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="TimecardDetails.aspx.cs" Inherits="TimecardDetails" Title="Untitled Page" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
</asp:Content>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx.cs
Index: TimecardDetails.aspx.cs
===================================================================
using System;
using System.Data;
using System.Configuration;
using System.Collections;
using System.Web;
using System.Web.Security;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls;
public partial class TimecardDetails : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
1.2 +1 -3 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Public/Login.aspx
Index: Login.aspx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Public/Login.aspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- Login.aspx 28 Aug 2006 04:22:23 -0000 1.1
+++ Login.aspx 29 Aug 2006 02:39:36 -0000 1.2
@@ -10,7 +10,7 @@
<asp:RequiredFieldValidator ID="UserNameRequired" runat="server" ControlToValidate="UserName" ErrorMessage="User Name is required." ToolTip="User Name is required." ValidationGroup="login">*</asp:RequiredFieldValidator>
<br />
<asp:TextBox ID="UserName" runat="server"></asp:TextBox>
- <asp:CheckBox ID="RememberMe" runat="server" Text="Remember me" />
+ <asp:CheckBox ID="RememberMe" runat="server" Text="Remember me" CssClass="checkbox" />
<br />
<asp:Label ID="lblUsername" runat="server" AssociatedControlID="Password">Password</asp:Label>
@@ -18,8 +18,6 @@
<br />
<asp:TextBox ID="Password" runat="server" TextMode="Password"></asp:TextBox><br />
-
-
<br />
<asp:Button cssclass="button" ID="LoginButton" runat="server" CommandName="Login" Text="Log In" ValidationGroup="login" />
<asp:Literal ID="FailureText" runat="server" EnableViewState="False"></asp:Literal>
1.2 +6 -7 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/mda/src/uml/Northwind.TimeTracker.Model.xmi
Index: Northwind.TimeTracker.Model.xmi
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/mda/src/uml/Northwind.TimeTracker.Model.xmi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- Northwind.TimeTracker.Model.xmi 28 Aug 2006 04:22:25 -0000 1.1
+++ Northwind.TimeTracker.Model.xmi 29 Aug 2006 02:39:37 -0000 1.2
@@ -3,7 +3,7 @@
<!-- This xmi file is optimized for MagicDraw UML. Some references are not saved. -->
<!-- Change MagicDraw UML environment options property General->.Save Rich XMI -->
-<XMI xmi.version='1.2' timestamp='Mon Aug 28 00:11:33 EDT 2006' xmlns:UML='omg.org/UML/1.4'>
+<XMI xmi.version='1.2' timestamp='Mon Aug 28 12:33:29 EDT 2006' xmlns:UML='omg.org/UML/1.4'>
<XMI.header>
<XMI.documentation>
<XMI.exporter>MagicDraw UML</XMI.exporter>
@@ -747,9 +747,9 @@
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:Classifier.feature>
- <UML:Attribute xmi.id='_9_5_1_874026a_1147802173958_223149_613' name='userName' visibility='public'>
+ <UML:Attribute xmi.id='_9_5_1_874026a_1147802173958_223149_613' name='username' visibility='public'>
<UML:Attribute.initialValue>
- <UML:Expression xmi.id='_9_5_1_874026a_1156736949716_756156_1'/>
+ <UML:Expression xmi.id='_9_5_1_874026a_1156782766100_464046_347'/>
</UML:Attribute.initialValue>
<UML:StructuralFeature.type>
<UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
@@ -949,7 +949,6 @@
</UML:Association.connection>
</UML:Association>
<UML:Dependency xmi.id='_9_5_1_874026a_1156380816382_445084_2918' client='_9_5_1_874026a_1147797358974_560038_4' supplier='_9_5_1_874026a_1148487426786_832415_417'/>
- <UML:Class xmi.id='_9_5_1_874026a_1156457634151_799619_391' name='Northwind'/>
<UML:Class xmi.id='_9_5_1_874026a_1156474568417_376648_491' name='TimecardStatus[]'/>
<UML:Association xmi.id='_9_5_1_874026a_1156737323213_714933_188'>
<UML:Association.connection>
@@ -1256,9 +1255,9 @@
</UML:Classifier>
</UML:StructuralFeature.type>
</UML:Attribute>
- <UML:Attribute xmi.id='_9_5_1_874026a_1148487426786_138215_410' name='userName' visibility='public'>
+ <UML:Attribute xmi.id='_9_5_1_874026a_1148487426786_138215_410' name='username' visibility='public'>
<UML:Attribute.initialValue>
- <UML:Expression xmi.id='_9_5_1_874026a_1156737375779_246980_236'/>
+ <UML:Expression xmi.id='_9_5_1_874026a_1156782766280_636905_348'/>
</UML:Attribute.initialValue>
<UML:StructuralFeature.type>
<UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
@@ -2925,7 +2924,7 @@
<mdElement elementClass='StringProperty'>
<propertyID>INFO_PROPERTY</propertyID>
<propertyDescriptionID>INFO_PROPERTY_DESCRIPTION</propertyDescriptionID>
- <value>7e 33 f 41 26 59 43 7d 63 41 2d 24 ed 33 2e ce 24 3a 89 e3 50 92 e5 1d f4 2e 45 9a 68 78 c8 ef 17 4b ef c4 86 b9 d 96 c3 fb 23 2f 60 95 e 10 3e b 16 97 9a 79 28 dc 6b ae 18 b2 1f 11 aa 20 9c dc 94 f4 1a bd 6 </value>
+ <value>7e 33 f 41 26 59 43 7d 63 41 2d 24 ed 33 2e ce 24 3a 89 e3 50 92 e4 1f f4 2c 47 9a 69 72 c8 ef 17 4b ef c4 86 b9 d 96 c3 fb 23 2f 60 95 e 10 3e b 16 97 9a 79 28 dc 6b ae 18 b2 1f 11 aa 20 9c dc 94 f4 1a bd 6 </value>
<multiline xmi.value='false'/>
</mdElement>
<mdElement elementClass='ChoiceProperty'>
|
