Menu
▾
▴
andromdaplugins-cvs — Each commit to the project CVS repository posts a message to this mailing list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(178) |
Feb
(169) |
Mar
(286) |
Apr
(117) |
May
(98) |
Jun
(68) |
Jul
(63) |
Aug
(121) |
Sep
(88) |
Oct
(124) |
Nov
(2) |
Dec
(111) |
| 2007 |
Jan
(224) |
Feb
(69) |
Mar
(10) |
Apr
(72) |
May
(7) |
Jun
(21) |
Jul
(33) |
Aug
(35) |
Sep
(12) |
Oct
(22) |
Nov
(5) |
Dec
(6) |
| 2008 |
Jan
(2) |
Feb
(10) |
Mar
(39) |
Apr
(58) |
May
(34) |
Jun
(9) |
Jul
(27) |
Aug
(10) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
|
From: Eric C. <ecr...@us...> - 2006-09-17 17:19:38
|
User: ecrutchfield Date: 06/09/17 10:19:38 cartridges/andromda-aspdotnet/src/main/java - New directory |
|
From: Eric C. <ecr...@us...> - 2006-09-17 17:19:38
|
User: ecrutchfield Date: 06/09/17 10:19:38 cartridges/andromda-aspdotnet/src/main/java/org - New directory |
|
From: Eric C. <ecr...@us...> - 2006-09-17 17:19:38
|
User: ecrutchfield Date: 06/09/17 10:19:38 cartridges/andromda-aspdotnet/src/main/java/org/andromda - New directory |
|
From: Vance K. <va...@us...> - 2006-09-14 14:31:34
|
User: vancek
Date: 06/09/14 07:31:31
Added: andromda-ejb3/src/site/axdoc howto7.xml installation.xml
howto13.xml howto6.xml howto10.xml howto5.xml
howto15.xml project.xml howto18.xml index.xml
howto11.xml howto9.xml howto.xml howto14.xml
howto16.xml howto1.xml howto19.xml howto4.xml
howto3.xml howto2.xml howto8.xml howto21.xml
howto12.xml howto20.xml howto17.xml tips.xml
Removed: andromda-ejb3/src/site/xdoc howto.xml howto12.xml
project.xml index.xml howto2.xml installation.xml
howto14.xml howto13.xml howto5.xml howto21.xml
howto1.xml howto18.xml howto6.xml howto3.xml
howto16.xml howto9.xml howto4.xml howto10.xml
howto17.xml howto15.xml howto11.xml howto7.xml
tips.xml howto8.xml howto20.xml howto19.xml
Log:
move xml from xdoc folder to new axdoc folder to be picked up by the andromda doxia xdoc module
Revision Changes Path
1.1 cartridges/andromda-ejb3/src/site/axdoc/howto7.xml
Index: howto7.xml
===================================================================
<?xml version="1.0" encoding="iso-8859-1"?>
<document>
<properties>
<author email="va...@us...">Vance Karimi</author>
<title>AndroMDA - EJB3 - HowTo Exceptions</title>
</properties>
<body>
<section name="Exceptions">
<p>
The EJB3 cartridge provides a similar exception handling process for applications
as the other persistence cartridges.
</p>
<p>
Simply model a class and assign it the <![CDATA[<<ApplicationException>>]]> stereotype or
the <![CDATA[<<UnexpectedException>>]]> stereotype (you will need to enable the Java cartridge
for this to work).
</p>
<p>
A default exception will be generated for all services since the
<code>allowDefaultServiceException</code> namespace property is set to <code>true</code> by
default. A set of default crud exceptions will also be generated and used in manageable service
beans for manageable entities. Please refer to <a href="howto16.html">Manageable Entities</a>
for more information on manageable service exceptions.
</p>
<p class="highlight">
EJB3 entities no longer throw exceptions. Following the session facade pattern, all business
logic should reside in the session bean, therefore, only the session bean should throw
application specific exceptions.
</p>
<p>
The next thing to do is draw a dependency from a <![CDATA[<<Service>>]]> to this exception,
this will make all operations throw this exception.
You may choose to have a single operation throw a specific exception by drawing the dependency
from that operation to the exception.
</p>
<p>
The following example builds on top of our tutorial example and adds the <code>RentalException</code>
application exception which is thrown from all operations of the <code>RentalService</code>
related classes. Notice how the bean class, bean implementation class, interface classes and
delegate class throw this exception from all operations.
</p>
<p>
<img src="images/org/andromda/test/7/a/uml.gif"/>
</p>
<p>
<ul>
<li class="gen">Auto-generated source that does not need manual editing</li>
<li class="impl">Auto-generated source that should be edited manually</li>
<li class="changed">File that is affected by the modifications applied in this section</li>
</ul>
</p>
<p>
<ul>
<li class="gen"><a href="src/org/andromda/test/howto7/a/CarEmbeddable.java"><code>CarEmbeddable.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto7/a/Car.java"><code>Car.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto7/a/CarType.java"><code>CarType.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto7/a/CarDao.java"><code>CarDao.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto7/a/CarDaoBase.java"><code>CarDaoBase.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto7/a/CarDaoImpl.java"><code>CarDaoImpl.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto7/a/CarDaoException.java"><code>CarDaoException.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto7/a/Person.java"><code>Person.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto7/a/PersonDao.java"><code>PersonDao.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto7/a/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto7/a/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto7/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></li>
<li class="impl"><a class="changed" href="src/org/andromda/test/howto7/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto7/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto7/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto7/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto7/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto7/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto7/a/RentalException.java"><code>RentalException.java</code></a></li>
</ul>
</p>
</section>
<section name="Next">
<p>
The next section covers the declarative security handling with JBossSX, click
<a href="howto8.html">here</a> to go to that section.
</p>
</section>
</body>
</document>
1.1 cartridges/andromda-ejb3/src/site/axdoc/installation.xml
Index: installation.xml
===================================================================
<?xml version="1.0" encoding="iso-8859-1"?>
<document>
<properties>
<author email="va...@us...">Vance Karimi</author>
<title>AndroMDA - EJB3 - Installation & Configuration</title>
</properties>
<body>
<section name="Installation">
<p>
Since the EJB3 cartridge is not part of the base AndroMDA package, you need to know a
few things to get started with the cartridge. This installation and configuration
guide should provide enough information to get you started.
</p>
<a name="Requirements"/>
<subsection name="Requirements">
<p>
You must have the latest Maven (currently 2.0.4) installed and configured.
You can install Maven
<a href="http://maven.apache.org/download.html#Installation">here</a>.
</p>
<p class="highlight">
If you want to build the site docs, you need to download the latest Maven 2.0.x source
from https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x and follow
the instructions to build, assemble and set your M2_HOME and PATH variables.
</p>
<p>
You need to have an instance of AndroMDA 3.2. At the time of writing this, 3.2 RC1
was released but the latest 3.2-SNAPSHOT from CVS contains updates to the project generator
and site plugin; this is more suitable to use with the EJB3 cartridge. Follow the anonymous
CVS access at <a href="http://sourceforge.net/cvs/?group_id=73047">AndroMDA project</a> to
checkout and build the latest <b>andromda-all</b> source.
</p>
</subsection>
<a name="Getting_the_Cartridge"/>
<subsection name="Getting the Cartridge">
<p>
Once you have met the requirements above, checkout the latest EJB3 cartridge from
CVS HEAD.
You have two options:
<ul>
<li>
Follow the anonymous CVS access at
<a href="http://sourceforge.net/cvs/?group_id=154568">andromdaplugins project</a>
on SourceForge to checkout the latest <b>andromda-plugins</b> module from
<code>HEAD</code>.
</li>
<li>
If you are using an IDE like Eclipse, open your CVS repository exploring perspective,
create a new repository with connection type (pserver), username (anonymous),
password(<i>blank</i>) host (andromdaplugins.cvs.sourceforge.net) and repository path
(/cvsroot/andromdaplugins). Once connected, expand HEAD and check out
<code>andromda-plugins</code>.
</li>
</ul>
Note that this will check out all cartridges and plugins
which are not relevant to the EJB3 cartridge, but will ease the your build process.
</p>
</subsection>
<a name="Building_the_Cartridge"/>
<subsection name="Building the Cartridge">
<p>
Once you have checked out the <code>andromda-plugins</code> project, you can simply build
the <b>andromda-ejb3</b> catridge in <code>andromda-plugins/cartridges/andromda-ejb3</code>
by running <i>mvn</i> in the latter location.
</p>
</subsection>
<a name="Building_Reports"/>
<subsection name="Building Reports">
<p>
To build the EJB3 cartridge site documentation requires a few extra Maven 2 plugins
to be downloaded from the Maven 2 sandbox in SVN. The
<a href="http://maven.apache.org/guides/development/guide-building-m2.html">Maven build</a>
documentation will give you some information on how to access their SVN.
</p>
<p>
You will need to check out the following plugins from Maven <b>sandbox</b>.
<ul>
<li>maven-changes-plugin</li>
<li>maven-changelog-plugin</li>
</ul>
Once you have built them (mvn install), these plugins will reside in your local repo.
</p>
<p>
In adopting the existing AndroMDA site format for the documentation, the Maven Doxia
plugin needs a patch to be applied. You can check out <b>doxia-1.0-alpha-8</b>
from Maven SVN and apply the patch <a href="http://jira.codehaus.org/browse/MNG-545">here</a>.
It is not critical to apply this patch, but if it's not applied, the generated XHTML will
not be formated correctly but still acceptable.
</p>
<p>
All other require plugins will be downloaded to your local repo if they don't already
exist.
</p>
<p>
You can download the source examples used in the howto for all sections
<a href="HowToModel-src.zip">here</a> and extract to the target/site folder of the
andromda-ejb3 plugin.
</p>
</subsection>
</section>
<section name="Next">
<p>
Before starting with the EJB3 howtos, find out how to generate your
<a href="project.html">EJB 3.0 project</a>.
</p>
</section>
</body>
</document>
1.1 cartridges/andromda-ejb3/src/site/axdoc/howto13.xml
Index: howto13.xml
===================================================================
<?xml version="1.0" encoding="iso-8859-1"?>
<document>
<properties>
<author email="va...@us...">Vance Karimi</author>
<title>AndroMDA - EJB3 - Interceptors</title>
</properties>
<body>
<section name="Interceptor">
<p>
Adding custom written interceptors is very easy using the EJB3 cartridge. The following sections
will provide you with enough detail to add your custom interceptors to session and
message-driven beans. It discusses default, class and method interceptors.
</p>
<p>
All interceptors are configured through the ejb-jar deployment descriptor. The EJB3 cartridges
does NOT use annotations to define interceptors and their exclusions.
</p>
<p>
The following example shows how to model a default interceptor as well as 2 class level
interceptors for the <code>RentalService</code> bean. Method level interceptor are
modelled in the same fashion, but a dependency is drawn from the session bean method rather than
the actual session bean class.
</p>
<p>
<img src="images/org/andromda/test/13/a/uml.gif"/>
</p>
<p>
<ul>
<li class="gen">Auto-generated source that does not need manual editing</li>
<li class="impl">Auto-generated source that should be edited manually</li>
<li class="changed">File that is affected by the modifications applied in this section</li>
</ul>
</p>
<p>
<ul>
<li class="gen"><a href="src/org/andromda/test/howto13/a/CarEmbeddable.java"><code>CarEmbeddable.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto13/a/Car.java"><code>Car.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/CarType.java"><code>CarType.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/CarDao.java"><code>CarDao.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/CarDaoBase.java"><code>CarDaoBase.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto13/a/CarDaoImpl.java"><code>CarDaoImpl.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/CarDaoException.java"><code>CarDaoException.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/Person.java"><code>Person.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/PersonDao.java"><code>PersonDao.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto13/a/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto13/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/RentalException.java"><code>RentalException.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto13/a/ejb-jar.xml"><code>ejb-jar.xml</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto13/a/jboss.xml"><code>jboss.xml</code></a></li>
<li class="impl"><a class="changed" href="src/org/andromda/test/howto13/a/DefaultInterceptor.java"><code>DefaultInterceptor.java</code></a></li>
<li class="impl"><a class="changed" href="src/org/andromda/test/howto13/a/LogInterceptor.java"><code>LogInterceptor.java</code></a></li>
<li class="impl"><a class="changed" href="src/org/andromda/test/howto13/a/AdminCheckerInterceptor.java"><code>AdminCheckerInterceptor.java</code></a></li>
</ul>
</p>
<a name="Default_Interceptors"/>
<subsection name="Default Interceptor">
<p>
A default interceptor is invoked any time a business method of any bean within that
deployment is invoked, unless default interceptors have been excluded on beans or
business methods of beans.
</p>
<p>
To define a default interceptor for your deployment, model the standard
<![CDATA[<<Interceptor>>]]> stereotype on a class and specify the
<code>@andromda.service.interceptor.default</code> tagged value as true on this class.
Since this interceptor is invoked
for all business methods of all beans, you do not need to model any dependencies on it.
The cartridge will generate the class with the necessary interceptor operation and
corresponding annotations within the interceptor class. It will also add the
<code>interceptor-binding</code> attribute to the <code>assembly-descriptor</code> element
of the ejb-jar deployment descriptor.
</p>
<p>
You can model as many default interceptor as you require, but at this stage, the ordering
of default interceptors is not guaranteed.
</p>
</subsection>
<a name="Class_Level_Interceptor"/>
<subsection name="Class Level Interceptor">
<p>
Class level interceptors are invoked when business methods of the modelled class are invoked,
unless class level interceptors have been excluded on business methods.
</p>
<p>
To define a class level interceptor, model the <![CDATA[<<Interceptor>>]]> stereotype on
a class. You must model a dependency from a source bean to this target class level interceptor
so that the cartridge knows to configure this interceptor at the class level in the ejb-jar
deployment descriptor.
</p>
<p>
If you would like to define multiple class level interceptors, then to guarantee the ordering
in which these interceptors are invoked, you must draw a dependency from the first interceptor
to the second interceptor and so forth. This will chain the interceptors and allow the
cartridge to configure them correctly in the ejb-jar deployment descriptor.
</p>
</subsection>
<a name="Method_Level_Interceptor"/>
<subsection name="Method Level Interceptor">
<p>
Method level interceptors are very much similar to class level interceptors, but they are
bound to a specific business method within a bean. This means that they are only invoked
when the modelled business methods of the bean are invoked.
</p>
<p>
To define a method level interceptor, model the <![CDATA[<<Interceptor>>]]> stereotype on
a class. You must model a dependency from a bean method to this target method level interceptor
so that the cartridge knows to configure this interceptor at the method level in the ejb-jar
deployment descriptor.
</p>
<p>
Chaining method level interceptors is exactly the same process as for class level interceptors.
</p>
</subsection>
<a name="Interceptor_Ordering"/>
<subsection name="Interceptor Ordering">
<p>
The following shows the ordering of default, class and method level interceptors.
</p>
<p>
<ul>
<li>Default Interceptors - Invoked before all other interceptors</li>
<li>
Class Level Interceptors - Invoked in the chain after default interceptors and before
method level interceptors.
</li>
<li>Method Level Interceptors - Invoked in the chain after all class level interceptors.</li>
</ul>
</p>
<p>
The above are the ordering for externally defined interceptors. If you define
class interceptor methods within your bean, then these are the last interceptors
to be invoked.
</p>
</subsection>
<a name="Interceptor_Exclusion"/>
<subsection name="Interceptor Exclusions">
<p>
The EJB3 cartridge allows you to exclude default interceptors for beans and bean methods.
It also allows you to exclude class level interceptors for bean methods.
</p>
<p>
To exclude the default interceptors, model the
<code>@andromda.service.interceptor.excludeDefault</code> tagged value. If this is applied to
a bean class, then the interceptor will be ignored for all methods of the bean class. If
it is modelled on a business method of a bean, then invocation of that business method
will NOT trigger invocation of the defined default interceptors.
</p>
<p>
To exclude class level interceptors, model the
<code>@andromda.service.interceptor.excludeClass</code> tagged value on business method
of beans. This will prevent the container from invoking the defined class level interceptor
when the associated bean method is invoked.
</p>
</subsection>
<a name="Interceptor_Tips"/>
<subsection name="Interceptor Tips">
<p>
In situations where you have an inheritance hierarchy, interceptor methods from the super
class are always invoked first. The exception to this rule is the case where the interceptor
has been overridden, regardless of whether the overriding method is defined as an
interceptor.
</p>
<p>
Once the interceptors have been generated, they will never be overwritten. This way, you
can add your implementation for the interceptor and call <code>InvocationContext.proceed()</code>
to continue to call the next interceptor.
</p>
<p>
Similar to bean classes, interceptor classes enjoy the benefits of dependency injection
in much the same way.
You can inject resources using the <code>@Resource</code> annotation or an
entity manager using the <code>@PersistenceContext</code> annotation.
</p>
</subsection>
</section>
<section name="Next">
<p>
For usage of lifecycle callbacks in entity, session and message-driven beans
click <a href="howto14.html">here</a>.
</p>
</section>
</body>
</document>
1.1 cartridges/andromda-ejb3/src/site/axdoc/howto6.xml
Index: howto6.xml
===================================================================
<?xml version="1.0" encoding="iso-8859-1"?>
<document>
<properties>
<author email="va...@an...">Vance Karimi</author>
<title>AndroMDA - HowTo - Queries</title>
</properties>
<body>
<section name="Queries">
<p>
All enterprise applications need to perform operations on the underlying datasource, and EJB3
supports this with <b>EJB Query Language</b> or <b>native query</b> support.
</p>
<p>
Most of what you are going to read here is very similar to the Hibernate cartridge support
for queries. There are a few differences which will be further discussed.
</p>
<p>
UML allows you to specify queries, be it in a more generic language. For this purpose OCL can
be used, which supports <code>body</code> constructs since OCL 2.0. Although you can choose
to override any generated query using a tagged value specifying your custom query, it is
strongly recommended to use OCL since this will guarantee your code to remain portable over different
technologies. If you don't want to get to know OCL and have no problem sticking to EJBQL
then you might consider using tagged values instead.
</p>
<p>
Finder methods require the <code>query flag</code> to be set, usually operations with this flag have
the <code>commercial at</code> symbol '@' in front of their name when displayed in diagrams. Make sure
you model the operation in <em>classifier scope</em>, in diagrams this will show them as underlined and
check the <code>Query</code> checkbox for the operation to indicate this is a finder method. By
enabling this checkbox, the '@' symbol will appear in front of the operation in your model.
</p>
<p>
Remember that classifier scoped operations go into the DAO while instance scoped operations go into the
entity's implementation class (they are considered to be business operations).
</p>
<p>
The documentation discussing the modeling of queries in UML is found here:
<a href="../andromda-ocl-query-library/modeling.html">Query Translation-Library Modeling</a>.
The tagged value overriding queries using EJB QL directly is found here:
<a href="../profile.html#@andromda_ejb_query">@andromda.ejb.query</a>.
</p>
<p>
<img src="images/org/andromda/test/6/a/uml.gif"/>
</p>
<p>
<ul>
<li class="gen">Auto-generated source that does not need manual editing</li>
<li class="impl">Auto-generated source that should be edited manually</li>
<li class="changed">File that is affected by the modifications applied in this section</li>
</ul>
</p>
<p>
<ul>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto6/a/CarEmbeddable.java"><code>CarEmbeddable.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto6/a/Car.java"><code>Car.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto6/a/CarType.java"><code>CarType.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto6/a/CarDetails.java"><code>CarDetails.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto6/a/CarListItem.java"><code>CarListItem.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto6/a/CarDao.java"><code>CarDao.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto6/a/CarDaoBase.java"><code>CarDaoBase.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto6/a/CarDaoImpl.java"><code>CarDaoImpl.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto6/a/CarDaoException.java"><code>CarDaoException.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto6/a/PersonEmbeddable.java"><code>PersonEmbeddable.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto6/a/Person.java"><code>Person.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto6/a/PersonDao.java"><code>PersonDao.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto6/a/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto6/a/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto6/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto6/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto6/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto6/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto6/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto6/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto6/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></li>
</ul>
</p>
<p>
If you look at the <code>Car</code> and <code>Person</code> Java entities, you will notice that
a set of <code>@NamedQuery</code> annotations define the named queries for each entity. By default
the <code>entityGenericFinders</code> namespace property is enabled, therefore a <code>findAll</code>
named query will always exist for every entity. Other named queries are either defined using AndroMDA's
default creation or OCL.
</p>
<p>
It is important to note that until the ORM xml descriptor is available, named queries are defined
in the class with the <code>@Entity</code> annotation. This has a drawback for entities with
instance scoped operations where a mapped superclass contains most of the persistence mapping
annotations, but the implementation class contains the <code>@Entity</code> and named query(ies)
annotations. In this example, the <code>Car</code> entity is an example of this case. Because
the <code>isRented()</code> operation is an instance scoped method, the named queries are defined
in the <code>Car.java</code> implementation which extends the <code>CarEmbeddable.java</code> class.
As a result, adding new finder methods to the <code>Car</code> entity will not generate these
named query definitions since the implementation class is not overriden. This is not the case for
the <code>Person</code> entity since it is always regenerated.
</p>
<p>
The DAO base classes provide the ability to use the named queries declared in the entities
or by specifying the query manually. By default, unless you manually specify the query string,
the DAO finder methods will use named queries, so keep this in mind when performing dynamic
queries. The <code>loadAll</code> DAO operation also used the generic finder method
named query defintion.
</p>
<p>
Currently, named queries are defined in two ways. Either you let AndroMDA auto create
your basic EJB QL for you, or use OCL to configure your query. Named queries will NOT be
defined if you use the <ocde>@andromda.ejb.query</ocde> tagged value. It would be suggested
that a new tagged value i.e <code>@andromda.ejb.query.named</code> be added to manually
set the named query, but OCL is still the preferred solution.
</p>
</section>
<section name="Nice to know">
<subsection name="A few supported query features">
<p>
</p>
</subsection>
<subsection name="Overriding queries">
<p>
It's allowed to override queries such as finders in the DAO, just override the appropriate method
in an entity's DAO implementation class. What follows is an example of a code snippet
overriding a generated EJBQL query (example taken from a ficticous <code>UserDAOImpl</code> class):
<source language="java"><![CDATA[
public List findActiveUsers(int transform)
{
// the next query is user-specified and overrides the one generated in super.findActiveUsers(int transform)
return super.findActiveUsers(transform, "from Users as user where user.exitDate is null");
}
]]></source>
</p>
<p>
You might consider doing this when you think the generated query is not performant enough, or
when you need to do something which is so complex the OCL translation can't properly handle it.
</p>
</subsection>
</section>
<section name="Next">
<p>
The next section will cover the modeling of exceptions, click
<a href="howto7.html">here</a> to go to that section.
</p>
</section>
</body>
</document>
1.1 cartridges/andromda-ejb3/src/site/axdoc/howto10.xml
Index: howto10.xml
===================================================================
<?xml version="1.0" encoding="iso-8859-1"?>
<document>
<properties>
<author email="va...@us...">Vance Karimi</author>
<title>AndroMDA - EJB3 - Message Driven Beans</title>
</properties>
<body>
<section name="Message Driven Beans">
<p>
A message driven bean is simply an 'asynchronous message consumer'. It is invoked by the container
when a message is received at the destination that the MDB services. There is no client side
visibility or conversational state with MDBs and the lifetime of the MDB instance is totally
controlled by the container.
</p>
<p>
The EJB 3.0 spec states:
<i>
<p>
A message-driven bean instance has no state for a specific client. However, the instance
variables of the message-driven bean instance can contain state accross the handling of
client messages. Examples of such state include an open database connection and a reference
to an enterprise bean.
</p>
<p>
A further goal of the message-driven bean model is to allow for the concurrent processing of
a stream of messages by means of container-provided pooling of message-driven bean
instances.
</p>
</i>
</p>
<p>
Like a session bean, the EJB3 cartridge generates a message driven bean class which should NOT be
modified manually and a corresponding implementation class that requires the business logic
for message processing. The MDB class contains all the necessary annotations. The MDB
implementation class extends the MDB class.
</p>
<p>
Currently, EJB3 cartridge does not generate the <code>@MessageDriven</code> metadata annotation in the
MDB class. Instead, the <code>ejb-jar.xml</code> and <code>jboss.xml</code> deployment
descriptors contain the necessary metadata, due to the design of separation by inheritance where the
business logic is separated in the subclass from the auto-generated code in the base class.
</p>
<p>
The <code>abstract</code> message-driven bean class defines all the business methods as
abstract. The message-driven bean implementation class requires the business method implementations.
The implementation class also contains the implementation of the <code>onMessage</code>
callback in the <code>MessageListener</code>.
</p>
<p>
The following examples illustrates how the EJB3 cartridge will generate the message-drive bean
related classes and the required references in the session bean classes. The
<code>PaymentProcessor</code> is the message-driven bean that is servicing the <code>Queue</code>
which is located at <code>queue/howtomodel/howto10a</code>. The tagged values used are
explained further down.
</p>
<p>
<img src="images/org/andromda/test/10/a/uml.gif"/>
</p>
<p>
<ul>
<li class="gen">Auto-generated source that does not need manual editing</li>
<li class="impl">Auto-generated source that should be edited manually</li>
<li class="changed">File that is affected by the modifications applied in this section</li>
</ul>
</p>
<p>
<ul>
<li class="gen"><a href="src/org/andromda/test/howto10/a/CarEmbeddable.java"><code>CarEmbeddable.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto10/a/Car.java"><code>Car.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto10/a/CarType.java"><code>CarType.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto10/a/CarDao.java"><code>CarDao.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto10/a/CarDaoBase.java"><code>CarDaoBase.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto10/a/CarDaoImpl.java"><code>CarDaoImpl.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto10/a/CarDaoException.java"><code>CarDaoException.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto10/a/Person.java"><code>Person.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto10/a/PersonDao.java"><code>PersonDao.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto10/a/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto10/a/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto10/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto10/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto10/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto10/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto10/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto10/a/RentalServiceBean.java"><code>RentalServiceBeanImpl.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto10/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto10/a/RentalException.java"><code>RentalException.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto10/a/PaymentServiceBase.java"><code>PaymentServiceBase.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto10/a/PaymentServiceRemote.java"><code>PaymentServiceRemote.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto10/a/PaymentServiceDelegate.java"><code>PaymentServiceDelegate.java</code></a></li>
<li class="impl"><a class="changed" href="src/org/andromda/test/howto10/a/PaymentServiceBean.java"><code>PaymentServiceBean.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto10/a/PaymentServiceException.java"><code>PaymentServiceException.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto10/a/PaymentProcessorMDBBean.java"><code>PaymentProcessorMDBBean.java</code></a></li>
<li class="impl"><a class="changed" href="src/org/andromda/test/howto10/a/PaymentProcessorMDBBeanImpl.java"><code>PaymentProcessorMDBBeanImpl.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto10/a/ejb-jar.xml"><code>ejb-jar.xml</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto10/a/jboss.xml"><code>jboss.xml</code></a></li>
</ul>
</p>
<p>
The dependency from the <code>RentalService</code> session bean to the <code>PaymentProcessor</code>
MDB injects the required connection factory and destination objects into the session bean.
Similarly, the dependency from the <code>PaymentProcessor</code> MDB to the <code>PaymentService</code>
session bean injects the EJB instance of the session bean into the MDB.
</p>
<a name="Destination_Type"/>
<subsection name="Destination Type">
<p>
For every message-driven bean, you <i>MUST</i> specify the destination type for the servicing
MDB. This is achieved by simply modelling the <code>@andromda.ejb.mdb.destination.type</code>
tagged value on the MDB class. Your options are:
<ul>
<li>
<p>
<b>javax.jms.Queue</b>
</p>
<p>
If you have only ONE listener on a destination, then you specify the destination
type as a Queue.
</p>
</li>
<li>
<p>
<b>javax.jms.Topic</b>
</p>
<p>
If you have multiple subscribers on a destination, then you specify the destination
as a Topic.
</p>
</li>
</ul>
</p>
</subsection>
<a name="Destination"/>
<subsection name="Destination">
<p>
For every message-driven bean, you <i>MUST</i> specify the destination queue or topic name
that the MDB is associated with. This is achieved by modelling the
<code>@andromda.ejb.mdb.destination</code> tagged value.
</p>
</subsection>
<a name="Acknowledge_Mode"/>
<subsection name="Acknowledge Mode">
<p>
To specify the acknowledge mode for a JMS message driven bean, simply model the
<code>@andromda.ejb.mdb.acknowledge.mode</code> tagged value on the class.
This only needs to be specified if <code>DUPS_OK_ACKNOWLEDGE</code> mode is required since
the default is <code>AUTO_ACKNOWLEDGE</code>.
</p>
</subsection>
<a name="Message_Selector"/>
<subsection name="Message Selector">
<p>
By specifying a message selector constraint, you can limit the messages that a message-driven
bean is configured to received. To set a message selector, simply model the
<code>@andromda.ejb.mdb.selector</code> tagged value on the MDB class.
</p>
</subsection>
<a name="Subscription_Durability"/>
<subsection name="Subscription Durability">
<p>
You can specify the message-driven bean subscription durability by modelling the
<code>@andromda.ejb.mdb.subscription.durability</code> tagged value on the MDB class.
Queues are always durable by default. The durability only needs to specified on Topics.
By default, Topics are <b>non-durable</b>.
Your options are:
<ul>
<li>Durable</li>
<li>NonDurable</li>
</ul>
</p>
</subsection>
<a name="Listener_Interceptor"/>
<subsection name="Listener Interceptor">
<p>
Message driven beans have lifecycle callback interceptor methods or regular interceptors which
can be defined in a separate interceptor class using the EJB3 cartridge. To find out more
information on interceptors, click on <a href="howto13.html">interceptors</a>.
To find out more information on lifecycle callbacks, click on
<a href="howto14.html">lifecycle callbacks</a>.
</p>
</subsection>
<a name="Transaction_Context"/>
<subsection name="Transaction Context">
<p>
Like session beans, message-driven beans can use container-managed or bean-managed
transaction demarcation. By default and if unspecified, the container-managed transaction
demarcation is adopted. However, you can specify bean-managed transaction demarcation by
modelling the <code>@andromda.ejb.transaction.management</code> tagged value to
<code>BEAN</code> on the message-driven class.
</p>
<p>
If the MDB is specified using container-managed transaction demarcation, you can specify
the transaction attribute type to either:
<ul>
<li>REQUIRED</li>
<li>NOT_SUPPORTED</li>
</ul>
By default, the EJB3 cartridge will generate the <code>@TransactionAttribute</code>
annotation, setting the attribute type to <code>REQUIRED</code>. To override this default
value, you can model the <code>@andromda.ejb.transaction.type</code> tagged value on
the MDB class.
</p>
</subsection>
<a name="Security"/>
<subsection name="Security">
<p>
Because message-driven beans lifecycle is totally controlled by the container, a client is
NOT calling the <code>onMessage</code> method directly. Therefore, the security identity
for the execution of methods in the MDB is controlled via the <code>@RunAs</code>
annotation. This can easily be set by following the security howto
<a href="howto8.html#Modelling">here</a>.
</p>
</subsection>
<a name="Message_Driven_Context"/>
<subsection name="Message Driven Context">
The EJB3 cartridge injects the <code>MessageDrivenContext</code> into every MDB using the
<code>@Resource</code> annotation by default. The <code>MessageDrivenContext</code> instance,
named <code>context</code>, provides the following methods:
<ul>
<li>setRollbackOnly</li>
<li>getRollbackOnly</li>
<li>getUserTransaction</li>
<li>getTimerService</li>
<li>getCallerPrincipal</li>
<li>isCallerInRole</li>
<li>getEJBHome</li>
<li>getEJBLocalHome</li>
<li>lookup</li>
</ul>
</subsection>
<a name="Session_Bean_Injection"/>
<subsection name="Session Bean Injection">
To inject a session bean into the MDB, model a dependency from the MDB to the destination
session bean. As a result, the <code>EJB</code> annotation will be generation on the
attribute declaring the injected destination session bean.
</subsection>
<a name="Resource_Injection"/>
<subsection name="Resource Injections">
<p>
To inject an environment entry resource value, model an attribute with classifer scope
and set the attribute stereotype to <![CDATA[<<EnvEntry>>]]>. The environment
entries will be defined in the MDB class and configured in the ejb-jar.xml
deployment descriptor.
You must define a default value for these attributes in the model. Refer to
<a href="howto11.html">Environment Entry Injections</a> for further information.
</p>
</subsection>
<a name="Singleton_MDB"/>
<subsection name="Singleton MDB">
<p>
In some circumstance, you need to configure your MDB to maintain a max pool size of 1
such that you have a singleton message driven bean. This can be achieved via
the <a href="profile.html#@andromda.ejb.mdb.pool.size.max">maximum pool size</a>
tagged value which is modelled on the MDB.
</p>
<p>
You also have the option of configuring the
<a href="profile.html#@andromda.ejb.mdb.pool.size.min">minimum pool size</a>
of the MDB.
</p>
<p>
Both tagged values will add the appropriate activation config property to the
<code>ejb-jar.xml</code> deployment descriptor.
</p>
</subsection>
<a name="MQ_Destinations_Descriptor"/>
<subsection name="MQ Destinations Descriptor">
<p>
The EJB3 cartridge will create the default MQ destinations XML descriptor which can be
hot deployed to the JBoss container for creating your queues or topics. The following
is a very basic example with a single queue mbean definition.
<source language="xml"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
<server>
<mbean code="org.jboss.mq.server.jmx.Queue"
name="jboss.mq.destination:service=Queue,name=EmailSenderMDBBean">
<depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
<attribute name="JNDIName">queue/emailSender</attribute>
</mbean>
<!-- jboss mq destinations merge-point -->
</server>
]]></source>
This file is created in your project/app/target directory and will be named something like
<code>{PROJECT_NAME}-mq-destinations-service.xml</code>. Just deploy this to your JBoss
deploy directory before deploying your application EAR.
</p>
</subsection>
</section>
<section name="Next">
<p>
To find out how to inject environment entries to session and message driven beans, click
<a href="howto11.html">here</a>.
</p>
</section>
</body>
</document>
1.1 cartridges/andromda-ejb3/src/site/axdoc/howto5.xml
Index: howto5.xml
===================================================================
<?xml version="1.0" encoding="iso-8859-1"?>
<document>
<properties>
<author email="va...@us...">Vance Karimi</author>
<title>AndroMDA - EJB3 - HowTo Enumerations</title>
</properties>
<body>
<section name="Enumerations">
<p>
You might have noticed the attribute named <code>carType</code> in the <code>Car</code> entity. It is
is of type <code>String</code>, while in fact it makes more sense to restrict the set of possible
values for this attribute. This can be achieved using <i>type-safe enumerations</i>.
This is the topic discussed on this page.
</p>
<p>
Type-safe enumerations are modelled by means of a regular class, only this time you need
to use the <![CDATA[<<Enumeration>>]]> stereotype. All attributes on such an enumeration will
be known as enumeration literals, they will assume the default values you assign to the attributes,
or the name of the attribute if the default value is missing.
</p>
<p>
In the EJB3 cartridge, enumerations are <i>NOT</i> persisted behind the scenes, unlike the
Hibernate framework, however we can still use these enumeration types for entity attributes.
</p>
<p>
In the next picture we have replaced the type of the <code>type</code> attribute in the
<code>Car</code> entity from <code>datatype::String</code> to
<code>org.andromda.test.howto5.a.CarType</code> and set the enumeration type to <code>STRING</code>
(default being <code>ORDINAL</code>).
</p>
<p>
<img src="images/org/andromda/test/5/a/uml.gif"/>
</p>
<p>
<ul>
<li class="gen">Auto-generated source that does not need manual editing</li>
<li class="impl">Auto-generated source that should be edited manually</li>
<li class="changed">File that is affected by the modifications applied in this section</li>
</ul>
</p>
<p>
<ul>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto5/a/CarEmbeddable.java"><code>CarEmbeddable.java</code></a></li>
<li class="impl"><a href="src/org/andromda/test/howto5/a/Car.java"><code>Car.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto5/a/CarType.java"><code>CarType.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto5/a/CarDao.java"><code>CarDao.java</code></a...
[truncated message content] |
|
From: Vance K. <va...@us...> - 2006-09-14 14:30:48
|
User: vancek Date: 06/09/14 07:30:46 cartridges/andromda-ejb3/src/site/axdoc - New directory |
|
From: Vance K. <va...@us...> - 2006-09-14 14:23:36
|
User: vancek
Date: 06/09/14 07:23:35
Modified: andromda-ejb3 pom.xml
Log:
fix groupId for andromda-site-plugin
moved maven-site-plugin from reporting section to build section adding andromda-doxia-module-xdoc dependency to this plugin
Revision Changes Path
1.9 +16 -9 cartridges/andromda-ejb3/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/pom.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- pom.xml 11 Aug 2006 05:49:48 -0000 1.8
+++ pom.xml 14 Sep 2006 14:23:35 -0000 1.9
@@ -63,7 +63,7 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.andromda.maven.plugins</groupId>
+ <groupId>org.andromda.maven.site</groupId>
<artifactId>andromda-site-plugin</artifactId>
<version>3.2-SNAPSHOT</version>
<executions>
@@ -81,22 +81,29 @@
</execution>
</executions>
</plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.andromda.maven.site</groupId>
+ <artifactId>andromda-doxia-module-xdoc</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
<configuration>
<locales>en</locales>
<outputEncoding>UTF-8</outputEncoding>
</configuration>
</plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
|
|
From: Chris M. <cm...@us...> - 2006-09-08 14:49:11
|
User: cmicali
Date: 06/09/08 07:48:54
Modified: andromda-nhibernate pom.xml
andromda-nhibernate/src/main/resources/templates/nhibernate
NHibernateEntity.vsl
andromda-nhibernate/src/test/expected cartridge-output.zip
andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate
EntityOne.cs EntityTwo.cs
Log:
- Fixed issue with nhibernate version property (added virtual keyword)
Revision Changes Path
1.8 +0 -1 cartridges/andromda-nhibernate/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/pom.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- pom.xml 17 Aug 2006 21:02:04 -0000 1.7
+++ pom.xml 8 Sep 2006 14:48:54 -0000 1.8
@@ -10,7 +10,6 @@
<artifactId>andromda-nhibernate-cartridge</artifactId>
<packaging>andromda-cartridge</packaging>
<name>AndroMDA NHibernate Cartridge</name>
- <version>1.0-SNAPSHOT</version>
<description>
Produces NHibernate entities optionally services implemented as Session EJB facades.
</description>
1.5 +1 -1 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl
Index: NHibernateEntity.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- NHibernateEntity.vsl 23 Aug 2006 21:25:00 -0000 1.4
+++ NHibernateEntity.vsl 8 Sep 2006 14:48:54 -0000 1.5
@@ -31,7 +31,7 @@
/// </summary>
private int _$versionProperty;
- public int ${stringUtils.upperCamelCaseName($versionProperty)}
+ public virtual int ${stringUtils.upperCamelCaseName($versionProperty)}
{
get { return _$versionProperty; }
set { this._$versionProperty = value; }
1.5 +13 -17 cartridges/andromda-nhibernate/src/test/expected/cartridge-output.zip
<<Binary file>>
1.4 +1 -1 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.cs
Index: EntityOne.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- EntityOne.cs 23 Aug 2006 21:25:00 -0000 1.3
+++ EntityOne.cs 8 Sep 2006 14:48:54 -0000 1.4
@@ -22,7 +22,7 @@
/// </summary>
private int _version;
- public int Version
+ public virtual int Version
{
get { return _version; }
set { this._version = value; }
1.4 +1 -1 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.cs
Index: EntityTwo.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- EntityTwo.cs 23 Aug 2006 21:25:00 -0000 1.3
+++ EntityTwo.cs 8 Sep 2006 14:48:54 -0000 1.4
@@ -22,7 +22,7 @@
/// </summary>
private int _version;
- public int Version
+ public virtual int Version
{
get { return _version; }
set { this._version = value; }
|
User: cmicali
Date: 06/08/31 17:21:34
Modified: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain
TimecardDaoImpl.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_Code
DataSourceUtils.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web
SearchTimecards.aspx.cs TimecardDetails.aspx
TimecardDetails.aspx.cs
Log:
Revision Changes Path
1.6 +5 -5 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardDaoImpl.cs
Index: TimecardDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardDaoImpl.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- TimecardDaoImpl.cs 31 Aug 2006 23:37:46 -0000 1.5
+++ TimecardDaoImpl.cs 1 Sep 2006 00:21:34 -0000 1.6
@@ -68,11 +68,11 @@
valueObject.SubmitterName = string.Empty;
if (entity.Approver != null)
{
- valueObject.ApproverName = entity.Approver.FirstName + " " + entity.Approver.LastName;
+ valueObject.ApproverName = entity.Approver.Username;
}
if (entity.Submitter != null)
{
- valueObject.SubmitterName = entity.Submitter.FirstName + " " + entity.Submitter.LastName;
+ valueObject.SubmitterName = entity.Submitter.Username;
}
}
@@ -104,10 +104,12 @@
if (timecardVO.Id > 0)
{
entity = this.Load(timecardVO.Id);
- if (entity.Status != TimecardStatus.Draft)
+ if (entity.Status != TimecardStatus.Draft && entity.Status != TimecardStatus.Rejected)
{
throw new Exception("Unable to save Timecard in " + entity.Status.ToString() + " status");
}
+ entity.StartDate = timecardVO.StartDate;
+ entity.Submitter = this.UserDao.FindByUsername(timecardVO.SubmitterName);
}
else
{
@@ -116,9 +118,7 @@
}
entity.Comments = timecardVO.Comments;
- entity.StartDate = timecardVO.StartDate;
entity.Approver = this.UserDao.FindByUsername(timecardVO.ApproverName);
- entity.Submitter = this.UserDao.FindByUsername(timecardVO.SubmitterName);
// Update existing and remove missing allocations
ArrayList allocationsToRemove = new ArrayList();
1.4 +0 -1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_Code/DataSourceUtils.cs
Index: DataSourceUtils.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_Code/DataSourceUtils.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- DataSourceUtils.cs 31 Aug 2006 23:37:46 -0000 1.3
+++ DataSourceUtils.cs 1 Sep 2006 00:21:34 -0000 1.4
@@ -45,7 +45,6 @@
}
}
-
public static TimeTrackerUser[] GetAllUsers()
{
MembershipUserCollection membershipUsers = Membership.GetAllUsers();
1.3 +1 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/SearchTimecards.aspx.cs
Index: SearchTimecards.aspx.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/SearchTimecards.aspx.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- SearchTimecards.aspx.cs 29 Aug 2006 15:53:37 -0000 1.2
+++ SearchTimecards.aspx.cs 1 Sep 2006 00:21:34 -0000 1.3
@@ -56,4 +56,5 @@
dgSearchResults.DataSource = service.FindTimecards(criteria);
dgSearchResults.DataBind();
}
+
}
1.5 +10 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx
Index: TimecardDetails.aspx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- TimecardDetails.aspx 31 Aug 2006 23:37:47 -0000 1.4
+++ TimecardDetails.aspx 1 Sep 2006 00:21:34 -0000 1.5
@@ -67,7 +67,9 @@
<HeaderTemplate>
<table class="full_width">
<colgroup span="4" style="width:22%;" />
+ <% if (!ReadOnly) { %>
<colgroup span="1" style="width:12%;" />
+ <% } %>
<thead>
<tr>
<th>Date</th>
@@ -75,9 +77,11 @@
<th>End</th>
<th>Task</th>
+ <% if (!ReadOnly) { %>
<th class="align_center">
- <asp:LinkButton ID="btnDeleteAllocation" runat="server" CssClass="button" Text="Delete" OnClick="btnDeleteAllocation_Click"/>
+ <asp:LinkButton ID="btnDeleteAllocation" runat="server" CssClass="button" Text="Delete" OnClick="btnDeleteAllocation_Click" ValidationGroup="DeleteAllocation"/>
</th>
+ <% } %>
</tr>
</thead>
<tbody>
@@ -96,12 +100,15 @@
<td><%# ((DateTime)Eval("TimePeriodVO.StartTime")).ToString("t") %></td>
<td><%# ((DateTime)Eval("TimePeriodVO.EndTime")).ToString("t") %></td>
<td><%# ddlTasks.Items.FindByValue(Eval("TaskId").ToString()) %></td>
+ <% if (!ReadOnly) { %>
<td><center><asp:CheckBox ID="cbDelete" runat="server" /></center></td>
+ <% } %>
+
</tr>
</ItemTemplate>
</asp:Repeater>
-
+ <asp:Panel runat="server" ID="pnlAddAllocation">
<table class="add_allocation_table bordered_table full_width">
<colgroup span="4" style="width:22%;" />
<colgroup span="1" style="width:12%;" />
@@ -136,6 +143,7 @@
</tbody>
</table>
+ </asp:Panel>
</div>
<div class="comments">
1.5 +40 -10 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx.cs
Index: TimecardDetails.aspx.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- TimecardDetails.aspx.cs 31 Aug 2006 23:39:44 -0000 1.4
+++ TimecardDetails.aspx.cs 1 Sep 2006 00:21:34 -0000 1.5
@@ -15,6 +15,14 @@
public partial class TimecardDetails : System.Web.UI.Page
{
+ private bool m_ReadOnly = true;
+
+ public bool ReadOnly
+ {
+ get { return m_ReadOnly = true; }
+ set { m_ReadOnly = value; }
+ }
+
protected ArrayList Allocations
{
get
@@ -75,9 +83,9 @@
ddlTasks.DataBind();
ddlApprover.DataBind();
- lblSubmitter.Text = timecard.SubmitterName;
+ lblSubmitter.Text = ddlApprover.Items.FindByValue(timecard.SubmitterName).Text;
this.Title = timecard.ApproverName;
- ListItem approverItem = ddlApprover.Items.FindByText(timecard.ApproverName);
+ ListItem approverItem = ddlApprover.Items.FindByValue(timecard.ApproverName);
if (approverItem != null)
{
approverItem.Selected = true;
@@ -100,8 +108,30 @@
rptAllocations.DataBind();
if (timecard.Status == TimecardStatus.Approved ||
- timecard.Status == TimecardStatus.Submitted)
+ timecard.Status == TimecardStatus.Submitted
+ // || Submitter != current user
+ )
{
+ DisableScreen();
+ }
+ else
+ {
+ ReadOnly = true;
+ }
+
+ }
+
+
+ protected void DisableScreen()
+ {
+ ddlApprover.Enabled = false;
+ txtComments.Enabled = false;
+ txtEndTime.Enabled = false;
+ txtStartTime.Enabled = false;
+ ddlTasks.Enabled = false;
+ btnAdd.Enabled = false;
+ btnAdd.CssClass = "disabledbutton";
+
btnSave.Enabled = false;
btnSave.CssClass = "disabledbutton";
@@ -110,8 +140,8 @@
btnSubmit.Enabled = false;
btnSubmit.CssClass = "disabledbutton";
- }
+ pnlAddAllocation.Visible = false;
}
protected void BuildStartDateDropdown(DateTime startDate)
|
|
From: Chris M. <cm...@us...> - 2006-08-31 23:51:55
|
User: cmicali
Date: 06/08/31 16:51:54
Added: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Bin
RJS.Web.WebControl.PopCalendar.dll.refresh
Log:
Revision Changes Path
1.3 +0 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Bin/RJS.Web.WebControl.PopCalendar.dll.refresh
<<Binary file>>
|
|
From: Chris M. <cm...@us...> - 2006-08-31 23:51:11
|
User: cmicali
Date: 06/08/31 16:51:11
Removed: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Bin
RJS.Web.WebControl.PopCalendar.dll.refresh
Log:
|
|
From: Chris M. <cm...@us...> - 2006-08-31 23:48:39
|
User: cmicali
Date: 06/08/31 16:48:38
Added: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Bin
RJS.Web.WebControl.PopCalendar.dll.refresh
Log:
Revision Changes Path
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Bin/RJS.Web.WebControl.PopCalendar.dll.refresh
<<Binary file>>
|
|
From: Chris M. <cm...@us...> - 2006-08-31 23:39:44
|
User: cmicali
Date: 06/08/31 16:39:44
Modified: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web
TimecardDetails.aspx.cs
Log:
Revision Changes Path
1.4 +12 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx.cs
Index: TimecardDetails.aspx.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- TimecardDetails.aspx.cs 31 Aug 2006 23:37:47 -0000 1.3
+++ TimecardDetails.aspx.cs 31 Aug 2006 23:39:44 -0000 1.4
@@ -99,6 +99,18 @@
rptAllocations.DataSource = Allocations;
rptAllocations.DataBind();
+ if (timecard.Status == TimecardStatus.Approved ||
+ timecard.Status == TimecardStatus.Submitted)
+ {
+ btnSave.Enabled = false;
+ btnSave.CssClass = "disabledbutton";
+
+ btnDelete.Enabled = false;
+ btnDelete.CssClass = "disabledbutton";
+
+ btnSubmit.Enabled = false;
+ btnSubmit.CssClass = "disabledbutton";
+ }
}
|
User: cmicali
Date: 06/08/31 16:37:48
Modified: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain
TimeAllocationDaoImpl.cs TimecardDaoImpl.cs
TimecardImpl.cs UserDaoImpl.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Service
TimeTrackingServiceImpl.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.WebServices/App_Code
TimeTrackingService.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_Code
DataSourceUtils.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_WebReferences/TimeTrackingService
TimeTrackingService.disco
TimeTrackingService.discomap
TimeTrackingService.wsdl
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web
NewTimecardSetup.aspx NewTimecardSetup.aspx.cs
SearchTimecards.aspx TimecardDetails.aspx
TimecardDetails.aspx.cs Web.config
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Style
global.css
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker
Northwind.TimeTracker.sln
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/mda/src/uml
Northwind.TimeTracker.Model.xmi
Added: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Lib
RJS.Web.WebControl.PopCalendar.dll
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/PopCalendar2005/CSS
Classic.css
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/PopCalendar2005/CSS/Classic_Images
baddate.gif close.gif closedown.gif down.gif
drop1.gif drop2.gif left1.gif left2.gif right1.gif
right2.gif special.gif up.gif
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/PopCalendar2005
Calendar.gif DisableCalendar.gif PopCalendar.js
PopCalendarFunctions.js
Log:
- Updated
Revision Changes Path
1.4 +31 -6 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimeAllocationDaoImpl.cs
Index: TimeAllocationDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimeAllocationDaoImpl.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- TimeAllocationDaoImpl.cs 29 Aug 2006 05:02:06 -0000 1.3
+++ TimeAllocationDaoImpl.cs 31 Aug 2006 23:37:46 -0000 1.4
@@ -37,13 +37,38 @@
/// </summary>
public override Northwind.TimeTracker.Domain.TimeAllocation TimeAllocationVOToEntity(Northwind.TimeTracker.VO.TimeAllocationVO timeAllocationVO)
{
- // VO to entity conversion
- Northwind.TimeTracker.Domain.TimeAllocation entity = Northwind.TimeTracker.Domain.TimeAllocation.Factory.newInstance();
-
+ Northwind.TimeTracker.Domain.TimeAllocation entity;
+ if (timeAllocationVO.Id > 0)
+ {
+ entity = this.Load(timeAllocationVO.Id);
+ }
+ else
+ {
+ entity = Northwind.TimeTracker.Domain.TimeAllocation.Factory.newInstance();
entity.Id = timeAllocationVO.Id;
- // entity.Task
- // entity.Timecard
- // entity.TimePeriod
+ }
+
+ if (timeAllocationVO.TaskId.HasValue)
+ {
+ entity.Task = this.TaskDao.Load(timeAllocationVO.TaskId.Value);
+ }
+
+ if (entity.TimePeriod == null)
+ {
+ entity.TimePeriod = TimePeriod.newInstance(timeAllocationVO.TimePeriodVO.StartTime, timeAllocationVO.TimePeriodVO.EndTime);
+ }
+ else
+ {
+ if (timeAllocationVO.TimePeriodVO.StartTime.HasValue)
+ {
+ entity.TimePeriod.StartTime = timeAllocationVO.TimePeriodVO.StartTime.Value;
+ }
+
+ if (timeAllocationVO.TimePeriodVO.EndTime.HasValue)
+ {
+ entity.TimePeriod.EndTime = timeAllocationVO.TimePeriodVO.EndTime.Value;
+ }
+ }
return entity;
1.5 +70 -7 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardDaoImpl.cs
Index: TimecardDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardDaoImpl.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- TimecardDaoImpl.cs 29 Aug 2006 15:53:37 -0000 1.4
+++ TimecardDaoImpl.cs 31 Aug 2006 23:37:46 -0000 1.5
@@ -10,6 +10,7 @@
using NHibernate;
using NHibernate.Expression;
using System.Collections;
+using Northwind.TimeTracker.VO;
namespace Northwind.TimeTracker.Domain
@@ -99,16 +100,78 @@
/// </summary>
public override Northwind.TimeTracker.Domain.Timecard TimecardVOToEntity(Northwind.TimeTracker.VO.TimecardVO timecardVO)
{
- // VO to entity conversion
- Northwind.TimeTracker.Domain.Timecard entity = Northwind.TimeTracker.Domain.Timecard.Factory.newInstance();
+ Northwind.TimeTracker.Domain.Timecard entity;
+ if (timecardVO.Id > 0)
+ {
+ entity = this.Load(timecardVO.Id);
+ if (entity.Status != TimecardStatus.Draft)
+ {
+ throw new Exception("Unable to save Timecard in " + entity.Status.ToString() + " status");
+ }
+ }
+ else
+ {
+ entity = Northwind.TimeTracker.Domain.Timecard.Factory.newInstance();
+ entity.Status = TimecardStatus.Draft;
+ }
entity.Comments = timecardVO.Comments;
- entity.Id = timecardVO.Id;
entity.StartDate = timecardVO.StartDate;
- entity.Status = timecardVO.Status;
- // entity.Allocations
- // entity.Approver
- // entity.Submitter
+ entity.Approver = this.UserDao.FindByUsername(timecardVO.ApproverName);
+ entity.Submitter = this.UserDao.FindByUsername(timecardVO.SubmitterName);
+
+ // Update existing and remove missing allocations
+ ArrayList allocationsToRemove = new ArrayList();
+ foreach (TimeAllocation allocation in entity.Allocations)
+ {
+ bool existsInVo = false;
+ foreach (TimeAllocationVO allocationVO in timecardVO.Allocations)
+ {
+ if (allocation.Id == allocationVO.Id)
+ {
+ existsInVo = true;
+ // Allocation was found in VO list
+ // Update it
+ break;
+ }
+ }
+ if (!existsInVo)
+ {
+ // Allocation was not found in VO list
+ // Mark for removal
+ allocationsToRemove.Add(allocation);
+ }
+ }
+ // Remove all marked allocations
+ entity.Allocations.RemoveAll(allocationsToRemove);
+
+ ArrayList allocationsToAdd = new ArrayList();
+ // Add new allocations
+ foreach (TimeAllocationVO allocationVO in timecardVO.Allocations)
+ {
+ bool existsInEntity = false;
+ if (allocationVO.Id > 0)
+ {
+ foreach (TimeAllocation allocation in entity.Allocations)
+ {
+ if (allocationVO.Id == allocation.Id)
+ {
+ existsInEntity = true;
+ break;
+ }
+ }
+ }
+ if (!existsInEntity)
+ {
+ TimeAllocation newAllocation = this.TimeAllocationDao.TimeAllocationVOToEntity(allocationVO);
+ allocationsToAdd.Add(newAllocation);
+ }
+ }
+
+ foreach (TimeAllocation allocation in allocationsToAdd)
+ {
+ entity.AddTimeAllocation(allocation);
+ }
return entity;
1.2 +2 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardImpl.cs
Index: TimecardImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardImpl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TimecardImpl.cs 28 Aug 2006 04:22:17 -0000 1.1
+++ TimecardImpl.cs 31 Aug 2006 23:37:46 -0000 1.2
@@ -22,8 +22,8 @@
/// </summary>
public override void AddTimeAllocation(Northwind.TimeTracker.Domain.TimeAllocation timeAllocation)
{
- //${toDoTag} implement public void addTimeAllocation(Northwind.TimeTracker.Domain.TimeAllocation timeAllocation)
- throw new NotImplementedException("Northwind.TimeTracker.Domain.Timecard.addTimeAllocation(Northwind.TimeTracker.Domain.TimeAllocation timeAllocation) Not implemented!");
+ this.Allocations.Add(timeAllocation);
+ timeAllocation.Timecard = this;
}
}
1.3 +6 -1 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- UserDaoImpl.cs 29 Aug 2006 02:39:33 -0000 1.2
+++ UserDaoImpl.cs 31 Aug 2006 23:37:46 -0000 1.3
@@ -35,7 +35,10 @@
entity.IsActive,
entity.Comment,
entity.CreationDate,
- roles);
+ roles,
+ entity.FirstName,
+ entity.LastName);
+
return userVO;
}
@@ -54,6 +57,8 @@
entity.IsActive = userVO.IsActive;
entity.Comment = userVO.Comment;
entity.CreationDate = userVO.CreationDate;
+ entity.FirstName = userVO.FirstName;
+ entity.LastName = userVO.LastName;
return entity;
1.3 +37 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Service/TimeTrackingServiceImpl.cs
Index: TimeTrackingServiceImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Service/TimeTrackingServiceImpl.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- TimeTrackingServiceImpl.cs 29 Aug 2006 05:02:07 -0000 1.2
+++ TimeTrackingServiceImpl.cs 31 Aug 2006 23:37:46 -0000 1.3
@@ -54,5 +54,42 @@
taskVos.CopyTo(voArray, 0);
return voArray;
}
+
+ protected override long HandleSaveTimecard(TimecardVO timecard)
+ {
+ Timecard entity = this.TimecardDao.TimecardVOToEntity(timecard);
+ entity.Status = TimecardStatus.Draft;
+ if (timecard.Id == 0)
+ {
+ this.TimecardDao.Create(entity);
+ }
+ else
+ {
+ this.TimecardDao.Update(entity);
+ }
+ return entity.Id;
+ }
+
+ protected override long HandleSubmitTimecard(TimecardVO timecard)
+ {
+ Timecard entity = this.TimecardDao.TimecardVOToEntity(timecard);
+ entity.Status = TimecardStatus.Submitted;
+ if (timecard.Id == 0)
+ {
+ this.TimecardDao.Create(entity);
+ }
+ else
+ {
+ this.TimecardDao.Update(entity);
+ }
+ return entity.Id;
+
+ }
+
+ protected override void HandleDeleteTimecard(long timecardId)
+ {
+ this.TimecardDao.Remove(timecardId);
+ }
+
}
}
1.3 +18 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.WebServices/App_Code/TimeTrackingService.cs
Index: TimeTrackingService.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.WebServices/App_Code/TimeTrackingService.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- TimeTrackingService.cs 29 Aug 2006 05:02:07 -0000 1.2
+++ TimeTrackingService.cs 31 Aug 2006 23:37:46 -0000 1.3
@@ -63,5 +63,23 @@
return Service.GetAllTasks();
}
+ [WebMethod]
+ public long SaveTimecard(TimecardVO timecard)
+ {
+ return Service.SaveTimecard(timecard);
+ }
+
+ [WebMethod]
+ public long SubmitTimecard(TimecardVO timecard)
+ {
+ return Service.SubmitTimecard(timecard);
+ }
+
+ [WebMethod]
+ public void DeleteTimecard(long timecardId)
+ {
+ Service.DeleteTimecard(timecardId);
+ }
+
}
1.3 +40 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_Code/DataSourceUtils.cs
Index: DataSourceUtils.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_Code/DataSourceUtils.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- DataSourceUtils.cs 29 Aug 2006 05:02:07 -0000 1.2
+++ DataSourceUtils.cs 31 Aug 2006 23:37:46 -0000 1.3
@@ -9,6 +9,7 @@
using System.Web.UI.HtmlControls;
using TimeTrackingService;
+using Northwind.TimeTracker.Web.Common;
/// <summary>
/// Summary description for DataSourceUtils
@@ -19,9 +20,46 @@
{
}
- public static MembershipUserCollection GetAllUsers()
+ public class TimeTrackerUser
{
- return Membership.GetAllUsers();
+ private string m_fullName;
+ private string m_username;
+ private long m_id;
+
+ public long Id
+ {
+ get { return m_id; }
+ set { m_id = value; }
+ }
+
+ public string Username
+ {
+ get { return m_username; }
+ set { m_username = value; }
+ }
+
+ public string FullName
+ {
+ get { return m_fullName; }
+ set { m_fullName = value; }
+ }
+ }
+
+
+ public static TimeTrackerUser[] GetAllUsers()
+ {
+ MembershipUserCollection membershipUsers = Membership.GetAllUsers();
+ TimeTrackerUser[] users = new TimeTrackerUser[membershipUsers.Count];
+ int i = 0;
+ foreach(DomainMembershipUser user in membershipUsers)
+ {
+ users[i] = new TimeTrackerUser();
+ users[i].FullName = user.UserVO.FirstName + " " + user.UserVO.LastName;
+ users[i].Username = user.UserVO.Username;
+ users[i].Id = user.UserVO.Id;
+ i++;
+ }
+ return users;
}
public static string[] GetAllStatuses()
1.2 +3 -3 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_WebReferences/TimeTrackingService/TimeTrackingService.disco
Index: TimeTrackingService.disco
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_WebReferences/TimeTrackingService/TimeTrackingService.disco,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TimeTrackingService.disco 28 Aug 2006 04:22:20 -0000 1.1
+++ TimeTrackingService.disco 31 Aug 2006 23:37:46 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
- <contractRef ref="http://localhost:4773/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx?wsdl" docRef="http://localhost:4773/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
- <soap address="http://localhost:4773/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx" xmlns:q1="http://tempuri.org/" binding="q1:TimeTrackingServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
- <soap address="http://localhost:4773/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx" xmlns:q2="http://tempuri.org/" binding="q2:TimeTrackingServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+ <contractRef ref="http://localhost:3784/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx?wsdl" docRef="http://localhost:3784/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+ <soap address="http://localhost:3784/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx" xmlns:q1="http://tempuri.org/" binding="q1:TimeTrackingServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+ <soap address="http://localhost:3784/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx" xmlns:q2="http://tempuri.org/" binding="q2:TimeTrackingServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
</discovery>
\ No newline at end of file
1.2 +2 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_WebReferences/TimeTrackingService/TimeTrackingService.discomap
Index: TimeTrackingService.discomap
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_WebReferences/TimeTrackingService/TimeTrackingService.discomap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TimeTrackingService.discomap 28 Aug 2006 04:22:20 -0000 1.1
+++ TimeTrackingService.discomap 31 Aug 2006 23:37:46 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Results>
- <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost:4773/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx?disco" filename="TimeTrackingService.disco" />
- <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost:4773/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx?wsdl" filename="TimeTrackingService.wsdl" />
+ <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost:3784/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx?disco" filename="TimeTrackingService.disco" />
+ <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost:3784/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx?wsdl" filename="TimeTrackingService.wsdl" />
</Results>
</DiscoveryClientResultsFile>
\ No newline at end of file
1.3 +124 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_WebReferences/TimeTrackingService/TimeTrackingService.wsdl
Index: TimeTrackingService.wsdl
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_WebReferences/TimeTrackingService/TimeTrackingService.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- TimeTrackingService.wsdl 29 Aug 2006 05:02:07 -0000 1.2
+++ TimeTrackingService.wsdl 31 Aug 2006 23:37:46 -0000 1.3
@@ -115,6 +115,44 @@
<s:element minOccurs="0" maxOccurs="1" name="Name" type="s:string" />
</s:sequence>
</s:complexType>
+ <s:element name="SaveTimecard">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="timecard" type="tns:TimecardVO" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="SaveTimecardResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="SaveTimecardResult" type="s:long" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="SubmitTimecard">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="timecard" type="tns:TimecardVO" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="SubmitTimecardResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="SubmitTimecardResult" type="s:long" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="DeleteTimecard">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="timecardId" type="s:long" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="DeleteTimecardResponse">
+ <s:complexType />
+ </s:element>
</s:schema>
</wsdl:types>
<wsdl:message name="FindTimecardsSoapIn">
@@ -135,6 +173,24 @@
<wsdl:message name="GetAllTasksSoapOut">
<wsdl:part name="parameters" element="tns:GetAllTasksResponse" />
</wsdl:message>
+ <wsdl:message name="SaveTimecardSoapIn">
+ <wsdl:part name="parameters" element="tns:SaveTimecard" />
+ </wsdl:message>
+ <wsdl:message name="SaveTimecardSoapOut">
+ <wsdl:part name="parameters" element="tns:SaveTimecardResponse" />
+ </wsdl:message>
+ <wsdl:message name="SubmitTimecardSoapIn">
+ <wsdl:part name="parameters" element="tns:SubmitTimecard" />
+ </wsdl:message>
+ <wsdl:message name="SubmitTimecardSoapOut">
+ <wsdl:part name="parameters" element="tns:SubmitTimecardResponse" />
+ </wsdl:message>
+ <wsdl:message name="DeleteTimecardSoapIn">
+ <wsdl:part name="parameters" element="tns:DeleteTimecard" />
+ </wsdl:message>
+ <wsdl:message name="DeleteTimecardSoapOut">
+ <wsdl:part name="parameters" element="tns:DeleteTimecardResponse" />
+ </wsdl:message>
<wsdl:portType name="TimeTrackingServiceSoap">
<wsdl:operation name="FindTimecards">
<wsdl:input message="tns:FindTimecardsSoapIn" />
@@ -148,6 +204,18 @@
<wsdl:input message="tns:GetAllTasksSoapIn" />
<wsdl:output message="tns:GetAllTasksSoapOut" />
</wsdl:operation>
+ <wsdl:operation name="SaveTimecard">
+ <wsdl:input message="tns:SaveTimecardSoapIn" />
+ <wsdl:output message="tns:SaveTimecardSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="SubmitTimecard">
+ <wsdl:input message="tns:SubmitTimecardSoapIn" />
+ <wsdl:output message="tns:SubmitTimecardSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="DeleteTimecard">
+ <wsdl:input message="tns:DeleteTimecardSoapIn" />
+ <wsdl:output message="tns:DeleteTimecardSoapOut" />
+ </wsdl:operation>
</wsdl:portType>
<wsdl:binding name="TimeTrackingServiceSoap" type="tns:TimeTrackingServiceSoap">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
@@ -178,6 +246,33 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="SaveTimecard">
+ <soap:operation soapAction="http://tempuri.org/SaveTimecard" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="SubmitTimecard">
+ <soap:operation soapAction="http://tempuri.org/SubmitTimecard" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="DeleteTimecard">
+ <soap:operation soapAction="http://tempuri.org/DeleteTimecard" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:binding name="TimeTrackingServiceSoap12" type="tns:TimeTrackingServiceSoap">
<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
@@ -208,13 +303,40 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="SaveTimecard">
+ <soap12:operation soapAction="http://tempuri.org/SaveTimecard" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="SubmitTimecard">
+ <soap12:operation soapAction="http://tempuri.org/SubmitTimecard" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="DeleteTimecard">
+ <soap12:operation soapAction="http://tempuri.org/DeleteTimecard" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="TimeTrackingService">
<wsdl:port name="TimeTrackingServiceSoap" binding="tns:TimeTrackingServiceSoap">
- <soap:address location="http://localhost:4773/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx" />
+ <soap:address location="http://localhost:3784/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx" />
</wsdl:port>
<wsdl:port name="TimeTrackingServiceSoap12" binding="tns:TimeTrackingServiceSoap12">
- <soap12:address location="http://localhost:4773/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx" />
+ <soap12:address location="http://localhost:3784/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file
1.3 +14 -7 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/NewTimecardSetup.aspx
Index: NewTimecardSetup.aspx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/NewTimecardSetup.aspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NewTimecardSetup.aspx 29 Aug 2006 04:01:18 -0000 1.2
+++ NewTimecardSetup.aspx 31 Aug 2006 23:37:47 -0000 1.3
@@ -1,13 +1,12 @@
-<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="NewTimecardSetup.aspx.cs" Inherits="NewTimecardSetup" Title="Untitled Page" %>
+<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="NewTimecardSetup.aspx.cs" Inherits="NewTimecardSetup" Title="New Timecard Setup" %>
+
+<%@ Register Assembly="RJS.Web.WebControl.PopCalendar" Namespace="RJS.Web.WebControl"
+ TagPrefix="rjs" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<div class="menubar">
<ul>
- <li><a class="selected" href="Home.aspx">Home</a></li>
- <li class="first"><a href="TimecardDetails.aspx">Timecard Details</a></li>
- <li><a href="SearchTimecards.aspx">Search Timecards</a></li>
- <li><a href="ApproveTimecards.aspx">Approve Timecards</a></li>
- </ul>
+ <li><a class="selected" href="Home.aspx">Home</a></li><li class="first"><a href="TimecardDetails.aspx">Timecard Details</a></li><li><a href="SearchTimecards.aspx">Search Timecards</a></li><li><a href="ApproveTimecards.aspx">Approve Timecards</a></li></ul>
</div>
<div class="content">
@@ -16,8 +15,16 @@
<div class="fieldgroup">
<asp:Label runat="server" ID="lblStartDate" AssociatedControlID="txtStartDate" Text="Start Date" />
<asp:TextBox ID="txtStartDate" runat="server" />
+
+
+ <rjs:popcalendar id="PopCalendar1" runat="server" control="txtStartDate" format="mm dd yyyy"
+ from-date="2006-07-31" requireddate="True" selectweekend="False" separator="/"
+ shadow="True" showweeknumber="True" to-date="2050-12-31" weekend="Tuesday" weekenddays="6" Visible="true"></rjs:popcalendar>
+ <rjs:popcalendarmessagecontainer id="PopCalendarMessageContainer1" runat="server" Calendar="PopCalendar1"></rjs:popcalendarmessagecontainer>
+
+
<br /><br />
- <asp:LinkButton ID="btnNewTimecard" runat="server" CssClass="button" Text="Create New Timecard" />
+ <asp:LinkButton ID="btnNewTimecard" runat="server" CssClass="button" Text="Create New Timecard" OnClick="btnNewTimecard_Click" />
</div>
</div>
1.2 +9 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/NewTimecardSetup.aspx.cs
Index: NewTimecardSetup.aspx.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/NewTimecardSetup.aspx.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NewTimecardSetup.aspx.cs 28 Aug 2006 04:22:21 -0000 1.1
+++ NewTimecardSetup.aspx.cs 31 Aug 2006 23:37:47 -0000 1.2
@@ -15,4 +15,13 @@
{
}
+
+ protected void btnNewTimecard_Click(object sender, EventArgs e)
+ {
+ Response.Redirect("TimecardDetails.aspx?StartDate=" + txtStartDate.Text);
+ }
+ protected void PopCalendar1_SelectionChanged(object sender, EventArgs e)
+ {
+ txtStartDate.Text = PopCalendar1.DateValue.ToString("d");
+ }
}
1.6 +11 -7 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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- SearchTimecards.aspx 29 Aug 2006 15:53:37 -0000 1.5
+++ SearchTimecards.aspx 31 Aug 2006 23:37:47 -0000 1.6
@@ -1,4 +1,6 @@
<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="SearchTimecards.aspx.cs" Inherits="SearchTimecards" Title="Search Timecards" %>
+<%@ Register Assembly="RJS.Web.WebControl.PopCalendar" Namespace="RJS.Web.WebControl"
+ TagPrefix="rjs" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<asp:ObjectDataSource
@@ -39,12 +41,12 @@
<h2>Search Criteria</h2>
<h3>Submitter</h3>
- <asp:DropDownList ID="ddlSubmitter" runat="server" DataSourceID="AllUsersDataSource" DataTextField="UserName" DataValueField="ProviderUserKey" AppendDataBoundItems="true">
+ <asp:DropDownList ID="ddlSubmitter" runat="server" DataSourceID="AllUsersDataSource" DataTextField="FullName" DataValueField="Id" AppendDataBoundItems="true">
<asp:ListItem Text="-- All --" Value=""/>
</asp:DropDownList>
<h3>Approver</h3>
- <asp:DropDownList ID="ddlApprover" runat="server" DataSourceID="AllUsersDataSource" DataTextField="UserName" DataValueField="ProviderUserKey" AppendDataBoundItems="true">
+ <asp:DropDownList ID="ddlApprover" runat="server" DataSourceID="AllUsersDataSource" DataTextField="FullName" DataValueField="Id" AppendDataBoundItems="true">
<asp:ListItem Text="-- All --" Value=""/>
</asp:DropDownList>
@@ -56,13 +58,15 @@
<br /><br />
<h3>Start Date Minimum</h3>
<asp:TextBox ID="txtStartDateMin" runat="server" />
- <asp:RegularExpressionValidator ID="reqStartDateMin" runat="server"
- ValidationExpression="\d\d?/\d\d?/\d\d\d\d" ControlToValidate="txtStartDateMin" CssClass="tinytext"><br />Must be MM/DD/YYY format</asp:RegularExpressionValidator>
+
+ <rjs:popcalendar id="PopCalendar1" runat="server" Visible="true" weekenddays="6" weekend="Tuesday" to-date="2050-12-31" showweeknumber="True" shadow="True" separator="/" selectweekend="False" requireddate="False" from-date="2006-01-01" format="mm dd yyyy" control="txtStartDateMin"></rjs:popcalendar><br />
+ <rjs:popcalendarmessagecontainer id="PopCalendarMessageContainer1" runat="server" Calendar="PopCalendar1"></rjs:popcalendarmessagecontainer>
<h3>Start Date Maximum</h3>
<asp:TextBox ID="txtStartDateMax" runat="server" />
- <asp:RegularExpressionValidator ID="reqStartDateMax" runat="server"
- ValidationExpression="\d\d?/\d\d?/\d\d\d\d" ControlToValidate="txtStartDateMax" CssClass="tinytext"><br />Must be MM/DD/YYY format</asp:RegularExpressionValidator>
+
+ <rjs:popcalendar id="PopCalendar2" runat="server" Visible="true" weekenddays="6" weekend="Tuesday" to-date="2050-12-31" showweeknumber="True" shadow="True" separator="/" selectweekend="False" requireddate="False" from-date="2006-01-01" format="mm dd yyyy" control="txtStartDateMax"></rjs:popcalendar><br />
+ <rjs:popcalendarmessagecontainer id="PopCalendarMessageContainer2" runat="server" Calendar="PopCalendar2"></rjs:popcalendarmessagecontainer>
<br /><br />
<asp:LinkButton runat="server" ID="btnSearch" Text="Search" CssClass="button" OnClick="btnSearch_Click" />
1.4 +48 -22 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx
Index: TimecardDetails.aspx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- TimecardDetails.aspx 29 Aug 2006 05:02:08 -0000 1.3
+++ TimecardDetails.aspx 31 Aug 2006 23:37:47 -0000 1.4
@@ -15,6 +15,8 @@
TypeName="DataSourceUtils">
</asp:ObjectDataSource>
+ <asp:HiddenField id="hdnTimecardId" runat="server" />
+
<div class="menubar">
<ul>
<li class="first">
@@ -48,9 +50,10 @@
<tr>
<td><asp:Label ID="lblSubmitter" runat="server" /></td>
<td>
- <asp:DropDownList ID="ddlApprover" runat="server" DataSourceID="AllUsersDataSource" DataTextField="UserName" DataValueField="ProviderUserKey" AppendDataBoundItems="true">
+ <asp:DropDownList ID="ddlApprover" runat="server" DataSourceID="AllUsersDataSource" DataTextField="FullName" DataValueField="Username" AppendDataBoundItems="true">
<asp:ListItem Text="-- Select --" Value=""/>
</asp:DropDownList>
+ <asp:RequiredFieldValidator ID="reqApprover" runat="server" ControlToValidate="ddlApprover">*</asp:RequiredFieldValidator>
</td>
<td><asp:Label ID="lblStatus" runat="server" /></td>
<td><asp:Label ID="lblStartDate" runat="server" /></td>
@@ -59,6 +62,9 @@
</asp:Panel>
<div class="timecard">
+
+ <asp:Repeater ID="rptAllocations" runat="server" >
+ <HeaderTemplate>
<table class="full_width">
<colgroup span="4" style="width:22%;" />
<colgroup span="1" style="width:12%;" />
@@ -69,13 +75,32 @@
<th>End</th>
<th>Task</th>
- <th class="align_center"><a class="button" href="">Delete</a></th>
+ <th class="align_center">
+ <asp:LinkButton ID="btnDeleteAllocation" runat="server" CssClass="button" Text="Delete" OnClick="btnDeleteAllocation_Click"/>
+ </th>
</tr>
</thead>
<tbody>
+ </HeaderTemplate>
+
+ <FooterTemplate>
</tbody>
</table>
+ </FooterTemplate>
+
+ <ItemTemplate>
+
+ <tr>
+ <td><%# ((DateTime)Eval("TimePeriodVO.StartTime")).ToString("d") %></td>
+ <td><%# ((DateTime)Eval("TimePeriodVO.StartTime")).ToString("t") %></td>
+ <td><%# ((DateTime)Eval("TimePeriodVO.EndTime")).ToString("t") %></td>
+ <td><%# ddlTasks.Items.FindByValue(Eval("TaskId").ToString()) %></td>
+ <td><center><asp:CheckBox ID="cbDelete" runat="server" /></center></td>
+ </tr>
+ </ItemTemplate>
+ </asp:Repeater>
+
<table class="add_allocation_table bordered_table full_width">
<colgroup span="4" style="width:22%;" />
@@ -83,28 +108,30 @@
<tbody>
<tr>
<td>
- <select name="date">
-
- <option value="0" selected="">06/05/2006</option>
- <option value="1">06/06/2006</option>
- <option value="2">06/07/2006</option>
- <option value="3">06/08/2006</option>
- <option value="4">06/09/2006</option>
- <option value="5">06/10/2006</option>
-
- <option value="6">06/11/2006</option>
- </select>
+ <asp:DropDownList ID="ddlDate" runat="server">
+ </asp:DropDownList>
+ </td>
+ <td>
+ <asp:TextBox ID="txtStartTime" runat="server" Columns="7" />
+ <asp:RequiredFieldValidator ID="reqStartTime" runat="server" ControlToValidate="txtStartTime" ValidationGroup="Add">*</asp:RequiredFieldValidator>
+ <asp:RegularExpressionValidator ID="reqStartTimeFmt" runat="server" ControlToValidate="txtStartTime" ValidationGroup="Add" ValidationExpression="\d\d?:\d\d A?P?M?">*</asp:RegularExpressionValidator>
+ </td>
+ <td>
+ <asp:TextBox ID="txtEndTime" runat="server" Columns="7" />
+ <asp:RequiredFieldValidator ID="reqEndTime" runat="server" ControlToValidate="txtEndTime" ValidationGroup="Add">*</asp:RequiredFieldValidator>
+ <asp:RegularExpressionValidator ID="reqEndTimeFmt" runat="server" ControlToValidate="txtEndTime" ValidationGroup="Add" ValidationExpression="\d\d?:\d\d A?P?M?">*</asp:RegularExpressionValidator>
</td>
- <td><input type="text" id="start" size="7" /></td>
- <td><input type="text" id="end" size="7" /></td>
<td>
<asp:DropDownList ID="ddlTasks" runat="server" DataSourceID="AllTasksDataSource" DataTextField="Name" DataValueField="Id" AppendDataBoundItems="true">
<asp:ListItem Text="-- Select --" Value=""/>
</asp:DropDownList>
+ <asp:RequiredFieldValidator ID="reqTasks" runat="server" ControlToValidate="ddlTasks" ValidationGroup="Add">*</asp:RequiredFieldValidator>
</td>
- <td class="align_center"><a class="button" href="">Add</a></td>
+ <td class="align_center">
+ <asp:LinkButton ValidationGroup="Add" ID="btnAdd" runat="server" CssClass="button" Text="Add" OnClick="btnAdd_Click"/>
+ </td>
</tr>
</tbody>
@@ -118,11 +145,10 @@
<div>
<asp:LinkButton runat="server" ID="btnSave" Text="Save" CssClass="button" OnClick="btnSave_Click" />
- <asp:LinkButton runat="server" ID="btnDelete" Text="Delete" CssClass="button" OnClick="btnDelete_Click" />
+ <asp:LinkButton runat="server" ID="btnDelete" Text="Delete" CssClass="button" OnClick="btnDelete_Click" ValidationGroup="DeleteTimecard"/>
<asp:LinkButton runat="server" ID="btnSubmit" Text="Submit" CssClass="button" OnClick="btnSubmit_Click" />
</div>
</div>
</asp:Content>
-
1.3 +149 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx.cs
Index: TimecardDetails.aspx.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- TimecardDetails.aspx.cs 29 Aug 2006 05:02:08 -0000 1.2
+++ TimecardDetails.aspx.cs 31 Aug 2006 23:37:47 -0000 1.3
@@ -10,19 +10,61 @@
using System.Web.UI.HtmlControls;
using TimeTrackingService;
+using Northwind.TimeTracker.Web.Common;
public partial class TimecardDetails : System.Web.UI.Page
{
+
+ protected ArrayList Allocations
+ {
+ get
+ {
+ if (ViewState["Allocations"] == null)
+ {
+ ViewState["Allocations"] = new ArrayList();
+ }
+ return (ArrayList)ViewState["Allocations"];
+ }
+ set
+ {
+ ViewState["Allocations"] = value;
+ }
+ }
+
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
if (Request.QueryString["TimecardId"] != null)
{
+ // We are displaying an existing timecard
+
long timecardId = long.Parse(Request.QueryString["TimecardId"]);
LoadTimecard(timecardId);
}
+ else if (Request.QueryString["StartDate"] != null)
+ {
+ // We are creating a new timecard
+ InitNewTimecard(DateTime.Parse(Request.QueryString["StartDate"]));
+ }
+ }
}
+
+ protected void InitNewTimecard(DateTime startDate)
+ {
+ Northwind.TimeTracker.VO.UserVO user = ((DomainMembershipUser)Membership.GetUser()).UserVO;
+ lblSubmitter.Text = user.FirstName + " " + user.LastName;
+ lblStartDate.Text = startDate.ToString("d");
+ lblStatus.Text = "New";
+ BuildStartDateDropdown(startDate);
+
+ hdnTimecardId.Value = "0";
+
+ btnDelete.Enabled = false;
+ btnDelete.CssClass = "disabledbutton";
+
+ rptAllocations.DataSource = Allocations;
+ rptAllocations.DataBind();
}
protected void LoadTimecard(long timecardId)
@@ -30,24 +72,129 @@
TimeTrackingService.TimeTrackingService service = new TimeTrackingService.TimeTrackingService();
TimeTrackingService.TimecardVO timecard = service.GetTimecard(timecardId);
+ ddlTasks.DataBind();
+ ddlApprover.DataBind();
+
lblSubmitter.Text = timecard.SubmitterName;
+ this.Title = timecard.ApproverName;
+ ListItem approverItem = ddlApprover.Items.FindByText(timecard.ApproverName);
+ if (approverItem != null)
+ {
+ approverItem.Selected = true;
+ }
+
lblStatus.Text = timecard.Status.ToString();
lblStartDate.Text = timecard.StartDate.Value.ToString("d");
txtComments.Text = timecard.Comments;
+ hdnTimecardId.Value = timecard.Id.ToString();
+
+ BuildStartDateDropdown(timecard.StartDate.Value);
+
+ foreach (TimeAllocationVO allocation in timecard.Allocations)
+ {
+ Allocations.Add(allocation);
}
+ rptAllocations.DataSource = Allocations;
+ rptAllocations.DataBind();
- protected void btnSave_Click(object sender, EventArgs e)
+
+ }
+
+ protected void BuildStartDateDropdown(DateTime startDate)
+ {
+ DateTime date = new DateTime(startDate.Year, startDate.Month, startDate.Day);
+ for(int i = 0; i<7; i++)
+ {
+ ddlDate.Items.Add(new ListItem(date.ToString("d"), i.ToString()));
+ date = date.AddDays(1);
+ }
+ }
+
+ protected TimecardVO GetTimecardVOFromForm()
{
+ TimecardVO timecard = new TimecardVO();
+ timecard.Id = long.Parse(hdnTimecardId.Value);
+ timecard.Allocations = new TimeAllocationVO[Allocations.Count];
+ Allocations.CopyTo(timecard.Allocations);
+ timecard.Comments = txtComments.Text;
+ timecard.SubmitterName = User.Identity.Name;
+ timecard.ApproverName = ddlApprover.SelectedItem.Value;
+ timecard.StartDate = DateTime.Parse(lblStartDate.Text);
+ return timecard;
+ }
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ TimeTrackingService.TimeTrackingService service = new TimeTrackingService.TimeTrackingService();
+ TimecardVO timecard = GetTimecardVOFromForm();
+ timecard.Status = TimecardStatus.Draft;
+ long timecardId = service.SaveTimecard(timecard);
+ Response.Redirect("TimecardDetails.aspx?TimecardId=" + timecardId.ToString());
}
+
protected void btnDelete_Click(object sender, EventArgs e)
{
-
+ TimeTrackingService.TimeTrackingService service = new TimeTrackingService.TimeTrackingService();
+ service.DeleteTimecard(long.Parse(hdnTimecardId.Value));
+ Response.Redirect("Home.aspx");
}
+
protected void btnSubmit_Click(object sender, EventArgs e)
{
+ TimeTrackingService.TimeTrackingService service = new TimeTrackingService.TimeTrackingService();
+ TimecardVO timecard = GetTimecardVOFromForm();
+ timecard.Status = TimecardStatus.Submitted;
+ long timecardId = service.SubmitTimecard(timecard);
+ Response.Redirect("TimecardDetails.aspx?TimecardId=" + timecardId.ToString());
+ }
+
+ protected void btnAdd_Click(object sender, EventArgs e)
+ {
+ TimeAllocationVO allocation = new TimeAllocationVO();
+ allocation.TimePeriodVO = new TimePeriodVO();
+ allocation.TaskId = long.Parse(ddlTasks.SelectedValue);
+
+ txtStartTime.Text = txtStartTime.Text.Trim().ToUpper();
+ if (txtStartTime.Text.EndsWith("A") || txtStartTime.Text.EndsWith("P")) txtStartTime.Text += "M";
+ txtEndTime.Text = txtEndTime.Text.Trim().ToUpper();
+ if (txtEndTime.Text.EndsWith("A") || txtEndTime.Text.EndsWith("P")) txtEndTime.Text += "M";
+
+ try
+ {
+ string startDate = ddlDate.SelectedItem.Text + " " + txtStartTime.Text;
+ string endDate = ddlDate.SelectedItem.Text + " " + txtEndTime.Text;
+
+ allocation.TimePeriodVO.StartTime = DateTime.Parse(startDate);
+ allocation.TimePeriodVO.EndTime = DateTime.Parse(endDate);
+
+ Allocations.Add(allocation);
+ }
+ catch { }
+
+ rptAllocations.DataSource = Allocations;
+ rptAllocations.DataBind();
+ }
+
+ protected void btnDeleteAllocation_Click(object source, EventArgs e)
+ {
+ int i = 0;
+ foreach (RepeaterItem item in rptAllocations.Items)
+ {
+ CheckBox cbDelete = (CheckBox)item.FindControl("cbDelete");
+ if (cbDelete.Checked)
+ {
+ Allocations.RemoveAt(i);
+ }
+ else
+ {
+ i++;
+ }
+ }
+ rptAllocations.DataSource = Allocations;
+ rptAllocations.DataBind();
}
+
}
1.3 +4 -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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Web.config 29 Aug 2006 02:39:34 -0000 1.2
+++ Web.config 31 Aug 2006 23:37:47 -0000 1.3
@@ -10,7 +10,7 @@
<configuration>
<appSettings>
<add key="nhibernate.config" value="~/nhibernate.config"/>
- <add key="TimeTrackingService.TimeTrackingService" value="http://localhost:4773/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx"/>
+ <add key="TimeTrackingService.TimeTrackingService" value="http://localhost:3784/Northwind.TimeTracker.WebServices/TimeTrackingService.asmx"/>
</appSettings>
<connectionStrings/>
<system.web>
@@ -32,7 +32,9 @@
</providers>
</roleManager>
<compilation debug="true">
- </compilation>
+ <assemblies>
+ <add assembly="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+ <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/></assemblies></compilation>
<!--
The <authentication> section enables configuration
of the security authentication mode used by
1.3 +14 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Style/global.css
Index: global.css
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Style/global.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- global.css 29 Aug 2006 15:53:38 -0000 1.2
+++ global.css 31 Aug 2006 23:37:47 -0000 1.3
@@ -15,6 +15,8 @@
color: #DD6900;
}
+
+
a.button:link, a.button:visited, a.button:hover
{
padding: 2px 4px 2px 4px;
@@ -27,6 +29,18 @@
font-weight: bold;
}
+a.disabledbutton, a.disabledbutton:link, a.disabledbutton:visited, a.disabledbutton:hover
+{
+ padding: 2px 4px 2px 4px;
+ border: outset 2px #dddddd;
+ background-color: #dddddd;
+ text-decoration: none;
+ text-align: center;
+ color: #888888;
+ font-size: 0.8em;
+ font-weight: bold;
+}
+
.tinytext
{
font-size: 0.7em;
1.2 +2 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.sln
Index: Northwind.TimeTracker.sln
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- Northwind.TimeTracker.sln 28 Aug 2006 04:22:24 -0000 1.1
+++ Northwind.TimeTracker.sln 31 Aug 2006 23:37:47 -0000 1.2
@@ -19,7 +19,7 @@
Release.AspNetCompiler.ForceOverwrite = "true"
Release.AspNetCompiler.FixedNames = "false"
Release.AspNetCompiler.Debug = "False"
- VWDPort = "3896"
+ VWDPort = "3781"
DefaultWebSiteLanguage = "Visual C#"
EndProjectSection
EndProject
@@ -40,7 +40,7 @@
Release.AspNetCompiler.ForceOverwrite = "true"
Release.AspNetCompiler.FixedNames = "false"
Release.AspNetCompiler.Debug = "False"
- VWDPort = "4773"
+ VWDPort = "3784"
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Northwind.TimeTracker.Web.Common", "Northwind.TimeTracker.Web.Common\Northwind.TimeTracker.Web.Common.csproj", "{7FE008D6-9835-45B8-B130-6587CC4B6379}"
1.5 +463 -354 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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- Northwind.TimeTracker.Model.xmi 29 Aug 2006 05:02:08 -0000 1.4
+++ Northwind.TimeTracker.Model.xmi 31 Aug 2006 23:37:47 -0000 1.5
@@ -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='Tue Aug 29 00:48:53 EDT 2006' xmlns:UML='omg.org/UML/1.4'>
+<XMI xmi.version='1.2' timestamp='Thu Aug 31 19:03:00 EDT 2006' xmlns:UML='omg.org/UML/1.4'>
<XMI.header>
<XMI.documentation>
<XMI.exporter>MagicDraw UML</XMI.exporter>
@@ -75,6 +75,56 @@
<UML:Parameter xmi.id='_9_5_1_874026a_1156826449914_918676_364' kind='return' type='_9_5_1_874026a_1156376533391_931343_959'/>
</UML:BehavioralFeature.parameter>
</UML:Operation>
+ <UML:Operation xmi.id='_9_5_1_874026a_1157054617912_364872_468' name='SaveTimecard' visibility='public'>
+ <UML:BehavioralFeature.parameter>
+ <UML:Parameter xmi.id='_9_5_1_874026a_1157054627456_860851_470' name='timecard' type='_9_5_1_874026a_1156376533381_936385_939'/>
+ <UML:Parameter xmi.id='_9_5_1_874026a_1157054627456_794156_471' kind='return'>
+ <UML:Parameter.type>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_238790_9'>
+ <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
+ <referentPath xmi.value='datatype::long'/>
+ </XMI.extension>
+ </UML:Classifier>
+ </UML:Parameter.type>
+ </UML:Parameter>
+ </UML:BehavioralFeature.parameter>
+ </UML:Operation>
+ <UML:Operation xmi.id='_9_5_1_874026a_1157054627546_357319_473' name='SubmitTimecard' visibility='public'>
+ <UML:BehavioralFeature.parameter>
+ <UML:Parameter xmi.id='_9_5_1_874026a_1157054656818_384841_475' name='timecard' type='_9_5_1_874026a_1156376533381_936385_939'/>
+ <UML:Parameter xmi.i...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2006-08-31 19:14:54
|
User: cmicali Date: 06/08/31 12:14:53 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/PopCalendar2005/CSS/Classic_Images - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-31 19:14:46
|
User: cmicali Date: 06/08/31 12:14:41 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/PopCalendar2005/CSS - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-31 19:14:38
|
User: cmicali Date: 06/08/31 12:14:36 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/PopCalendar2005 - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-29 15:53:42
|
User: cmicali
Date: 06/08/29 08:53:41
Modified: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain
TimecardDaoImpl.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web
SearchTimecards.aspx SearchTimecards.aspx.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Style
global.css
Log:
- Fixed date filtering on search screen
- Fixed approver filtering on search screen
- Fixed style for checkbox on login screen
Revision Changes Path
1.4 +1 -1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardDaoImpl.cs
Index: TimecardDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardDaoImpl.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- TimecardDaoImpl.cs 29 Aug 2006 05:02:06 -0000 1.3
+++ TimecardDaoImpl.cs 29 Aug 2006 15:53:37 -0000 1.4
@@ -36,7 +36,7 @@
if (criteria.ApproverId.HasValue)
{
- timecardCriteria.CreateCriteria("Approver").Add(Expression.Eq("Id", criteria.SubmitterId.Value));
+ timecardCriteria.CreateCriteria("Approver").Add(Expression.Eq("Id", criteria.ApproverId.Value));
}
if (criteria.Status != null && criteria.Status.Length > 0)
1.5 +2 -2 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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- SearchTimecards.aspx 29 Aug 2006 05:02:08 -0000 1.4
+++ SearchTimecards.aspx 29 Aug 2006 15:53:37 -0000 1.5
@@ -57,12 +57,12 @@
<h3>Start Date Minimum</h3>
<asp:TextBox ID="txtStartDateMin" runat="server" />
<asp:RegularExpressionValidator ID="reqStartDateMin" runat="server"
- ValidationExpression="\d\d/\d\d/\d\d\d\d" ControlToValidate="txtStartDateMin" CssClass="tinytext"><br />Must be MM/DD/YYY format</asp:RegularExpressionValidator>
+ ValidationExpression="\d\d?/\d\d?/\d\d\d\d" ControlToValidate="txtStartDateMin" CssClass="tinytext"><br />Must be MM/DD/YYY format</asp:RegularExpressionValidator>
<h3>Start Date Maximum</h3>
<asp:TextBox ID="txtStartDateMax" runat="server" />
<asp:RegularExpressionValidator ID="reqStartDateMax" runat="server"
- ValidationExpression="\d\d/\d\d/\d\d\d\d" ControlToValidate="txtStartDateMax" CssClass="tinytext"><br />Must be MM/DD/YYY format</asp:RegularExpressionValidator>
+ ValidationExpression="\d\d?/\d\d?/\d\d\d\d" ControlToValidate="txtStartDateMax" CssClass="tinytext"><br />Must be MM/DD/YYY format</asp:RegularExpressionValidator>
<br /><br />
<asp:LinkButton runat="server" ID="btnSearch" Text="Search" CssClass="button" OnClick="btnSearch_Click" />
1.2 +10 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/SearchTimecards.aspx.cs
Index: SearchTimecards.aspx.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/SearchTimecards.aspx.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- SearchTimecards.aspx.cs 28 Aug 2006 04:22:21 -0000 1.1
+++ SearchTimecards.aspx.cs 29 Aug 2006 15:53:37 -0000 1.2
@@ -43,6 +43,16 @@
criteria.Status[0] = (TimecardStatus)Enum.Parse(typeof(TimecardStatus), ddlStatus.SelectedValue);
}
+ if (txtStartDateMin.Text.Length > 0)
+ {
+ criteria.StartDateMin = DateTime.Parse(txtStartDateMin.Text);
+ }
+
+ if (txtStartDateMax.Text.Length > 0)
+ {
+ criteria.StartDateMax = DateTime.Parse(txtStartDateMax.Text);
+ }
+
dgSearchResults.DataSource = service.FindTimecards(criteria);
dgSearchResults.DataBind();
}
1.2 +2 -1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Style/global.css
Index: global.css
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Style/global.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- global.css 28 Aug 2006 04:22:24 -0000 1.1
+++ global.css 29 Aug 2006 15:53:38 -0000 1.2
@@ -138,7 +138,8 @@
font-weight: bold;
}
-.checkbox
+.checkbox,
+.checkbox input
{
border: none;
}
|
|
From: Chris M. <cm...@us...> - 2006-08-29 05:02:08
|
User: cmicali
Date: 06/08/28 22:02:08
Modified: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain
TimeAllocationDaoImpl.cs TimecardDaoImpl.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Service
TimeTrackingServiceImpl.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.WebServices/App_Code
TimeTrackingService.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_Code
DataSourceUtils.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_WebReferences/TimeTrackingService
TimeTrackingService.wsdl
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web
SearchTimecards.aspx TimecardDetails.aspx
TimecardDetails.aspx.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/mda/src/uml
Northwind.TimeTracker.Model.xmi
Log:
- Updated TimecardDetails page
- Added GetTimecard and GetAllTasks methods to service
Revision Changes Path
1.3 +11 -3 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimeAllocationDaoImpl.cs
Index: TimeAllocationDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimeAllocationDaoImpl.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- TimeAllocationDaoImpl.cs 29 Aug 2006 04:01:18 -0000 1.2
+++ TimeAllocationDaoImpl.cs 29 Aug 2006 05:02:06 -0000 1.3
@@ -26,7 +26,7 @@
valueObject.Id = entity.Id;
valueObject.TaskId = entity.Task.Id;
- // valueObject.TimePeriodVO
+ valueObject.TimePeriodVO = new Northwind.TimeTracker.VO.TimePeriodVO(entity.TimePeriod.StartTime, entity.TimePeriod.EndTime);
return valueObject;
@@ -37,8 +37,16 @@
/// </summary>
public override Northwind.TimeTracker.Domain.TimeAllocation TimeAllocationVOToEntity(Northwind.TimeTracker.VO.TimeAllocationVO timeAllocationVO)
{
- // put your implementation here
- return null;
+ // VO to entity conversion
+ Northwind.TimeTracker.Domain.TimeAllocation entity = Northwind.TimeTracker.Domain.TimeAllocation.Factory.newInstance();
+
+ entity.Id = timeAllocationVO.Id;
+ // entity.Task
+ // entity.Timecard
+ // entity.TimePeriod
+
+ return entity;
+
}
}
1.3 +7 -5 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardDaoImpl.cs
Index: TimecardDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardDaoImpl.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- TimecardDaoImpl.cs 29 Aug 2006 04:01:18 -0000 1.2
+++ TimecardDaoImpl.cs 29 Aug 2006 05:02:06 -0000 1.3
@@ -9,6 +9,7 @@
using System;
using NHibernate;
using NHibernate.Expression;
+using System.Collections;
namespace Northwind.TimeTracker.Domain
@@ -64,16 +65,14 @@
valueObject.Status = entity.Status;
valueObject.ApproverName = string.Empty;
valueObject.SubmitterName = string.Empty;
- try
+ if (entity.Approver != null)
{
valueObject.ApproverName = entity.Approver.FirstName + " " + entity.Approver.LastName;
}
- catch { }
- try
+ if (entity.Submitter != null)
{
valueObject.SubmitterName = entity.Submitter.FirstName + " " + entity.Submitter.LastName;
}
- catch { }
}
/// <summary>
@@ -86,7 +85,10 @@
Northwind.TimeTracker.VO.TimecardVO valueObject = new Northwind.TimeTracker.VO.TimecardVO();
CopyTimecardToTimecardSummaryVO(valueObject, entity);
- // valueObject.Allocations
+
+ valueObject.Allocations = new Northwind.TimeTracker.VO.TimeAllocationVO[entity.Allocations.Count];
+ IList allocationVos = DaoFactory.GetTimeAllocationDao().ToTimeAllocationVOList(entity.Allocations);
+ allocationVos.CopyTo(valueObject.Allocations, 0);
return valueObject;
1.2 +12 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Service/TimeTrackingServiceImpl.cs
Index: TimeTrackingServiceImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Service/TimeTrackingServiceImpl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TimeTrackingServiceImpl.cs 28 Aug 2006 04:22:18 -0000 1.1
+++ TimeTrackingServiceImpl.cs 29 Aug 2006 05:02:07 -0000 1.2
@@ -42,5 +42,17 @@
return voArray;
}
+ protected override TimecardVO HandleGetTimecard(long timecardId)
+ {
+ return this.TimecardDao.ToTimecardVO(this.TimecardDao.Load(timecardId));
+ }
+
+ protected override TaskVO[] HandleGetAllTasks()
+ {
+ IList taskVos = this.TaskDao.ToTaskVOList(this.TaskDao.LoadAll());
+ TaskVO[] voArray = new TaskVO[taskVos.Count];
+ taskVos.CopyTo(voArray, 0);
+ return voArray;
+ }
}
}
1.2 +12 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.WebServices/App_Code/TimeTrackingService.cs
Index: TimeTrackingService.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.WebServices/App_Code/TimeTrackingService.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TimeTrackingService.cs 28 Aug 2006 04:22:20 -0000 1.1
+++ TimeTrackingService.cs 29 Aug 2006 05:02:07 -0000 1.2
@@ -51,5 +51,17 @@
return Service.FindTimecards(criteria);
}
+ [WebMethod]
+ public TimecardVO GetTimecard(long timecardId)
+ {
+ return Service.GetTimecard(timecardId);
+ }
+
+ [WebMethod]
+ public TaskVO[] GetAllTasks()
+ {
+ return Service.GetAllTasks();
+ }
+
}
1.2 +10 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_Code/DataSourceUtils.cs
Index: DataSourceUtils.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_Code/DataSourceUtils.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- DataSourceUtils.cs 28 Aug 2006 04:22:20 -0000 1.1
+++ DataSourceUtils.cs 29 Aug 2006 05:02:07 -0000 1.2
@@ -8,6 +8,8 @@
using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls;
+using TimeTrackingService;
+
/// <summary>
/// Summary description for DataSourceUtils
/// </summary>
@@ -26,4 +28,12 @@
{
return Enum.GetNames(typeof(TimeTrackingService.TimecardStatus));
}
+
+ public static TimeTrackingService.TaskVO[] GetAllTasks()
+ {
+ TimeTrackingService.TimeTrackingService service = new TimeTrackingService.TimeTrackingService();
+ TaskVO[] tasks = service.GetAllTasks();
+ return tasks;
+ }
+
}
1.2 +118 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_WebReferences/TimeTrackingService/TimeTrackingService.wsdl
Index: TimeTrackingService.wsdl
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_WebReferences/TimeTrackingService/TimeTrackingService.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TimeTrackingService.wsdl 28 Aug 2006 04:22:20 -0000 1.1
+++ TimeTrackingService.wsdl 29 Aug 2006 05:02:07 -0000 1.2
@@ -53,6 +53,68 @@
<s:element minOccurs="0" maxOccurs="1" name="ApproverName" type="s:string" />
</s:sequence>
</s:complexType>
+ <s:element name="GetTimecard">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="timecardId" type="s:long" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="GetTimecardResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="GetTimecardResult" type="tns:TimecardVO" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:complexType name="TimecardVO">
+ <s:complexContent mixed="false">
+ <s:extension base="tns:TimecardSummaryVO">
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="Allocations" type="tns:ArrayOfTimeAllocationVO" />
+ </s:sequence>
+ </s:extension>
+ </s:complexContent>
+ </s:complexType>
+ <s:complexType name="ArrayOfTimeAllocationVO">
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="unbounded" name="TimeAllocationVO" nillable="true" type="tns:TimeAllocationVO" />
+ </s:sequence>
+ </s:complexType>
+ <s:complexType name="TimeAllocationVO">
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="Id" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="TimePeriodVO" type="tns:TimePeriodVO" />
+ <s:element minOccurs="1" maxOccurs="1" name="TaskId" nillable="true" type="s:long" />
+ </s:sequence>
+ </s:complexType>
+ <s:complexType name="TimePeriodVO">
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="StartTime" nillable="true" type="s:dateTime" />
+ <s:element minOccurs="1" maxOccurs="1" name="EndTime" nillable="true" type="s:dateTime" />
+ </s:sequence>
+ </s:complexType>
+ <s:element name="GetAllTasks">
+ <s:complexType />
+ </s:element>
+ <s:element name="GetAllTasksResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="GetAllTasksResult" type="tns:ArrayOfTaskVO" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:complexType name="ArrayOfTaskVO">
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="unbounded" name="TaskVO" nillable="true" type="tns:TaskVO" />
+ </s:sequence>
+ </s:complexType>
+ <s:complexType name="TaskVO">
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="Id" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="Name" type="s:string" />
+ </s:sequence>
+ </s:complexType>
</s:schema>
</wsdl:types>
<wsdl:message name="FindTimecardsSoapIn">
@@ -61,11 +123,31 @@
<wsdl:message name="FindTimecardsSoapOut">
<wsdl:part name="parameters" element="tns:FindTimecardsResponse" />
</wsdl:message>
+ <wsdl:message name="GetTimecardSoapIn">
+ <wsdl:part name="parameters" element="tns:GetTimecard" />
+ </wsdl:message>
+ <wsdl:message name="GetTimecardSoapOut">
+ <wsdl:part name="parameters" element="tns:GetTimecardResponse" />
+ </wsdl:message>
+ <wsdl:message name="GetAllTasksSoapIn">
+ <wsdl:part name="parameters" element="tns:GetAllTasks" />
+ </wsdl:message>
+ <wsdl:message name="GetAllTasksSoapOut">
+ <wsdl:part name="parameters" element="tns:GetAllTasksResponse" />
+ </wsdl:message>
<wsdl:portType name="TimeTrackingServiceSoap">
<wsdl:operation name="FindTimecards">
<wsdl:input message="tns:FindTimecardsSoapIn" />
<wsdl:output message="tns:FindTimecardsSoapOut" />
</wsdl:operation>
+ <wsdl:operation name="GetTimecard">
+ <wsdl:input message="tns:GetTimecardSoapIn" />
+ <wsdl:output message="tns:GetTimecardSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="GetAllTasks">
+ <wsdl:input message="tns:GetAllTasksSoapIn" />
+ <wsdl:output message="tns:GetAllTasksSoapOut" />
+ </wsdl:operation>
</wsdl:portType>
<wsdl:binding name="TimeTrackingServiceSoap" type="tns:TimeTrackingServiceSoap">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
@@ -78,6 +160,24 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="GetTimecard">
+ <soap:operation soapAction="http://tempuri.org/GetTimecard" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="GetAllTasks">
+ <soap:operation soapAction="http://tempuri.org/GetAllTasks" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:binding name="TimeTrackingServiceSoap12" type="tns:TimeTrackingServiceSoap">
<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
@@ -90,6 +190,24 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="GetTimecard">
+ <soap12:operation soapAction="http://tempuri.org/GetTimecard" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="GetAllTasks">
+ <soap12:operation soapAction="http://tempuri.org/GetAllTasks" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="TimeTrackingService">
<wsdl:port name="TimeTrackingServiceSoap" binding="tns:TimeTrackingServiceSoap">
1.4 +1 -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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- SearchTimecards.aspx 29 Aug 2006 04:01:18 -0000 1.3
+++ SearchTimecards.aspx 29 Aug 2006 05:02:08 -0000 1.4
@@ -94,7 +94,7 @@
<td><%# Eval("ApproverName") %></td>
<td><%# Eval("Status") %></td>
<td><%# ((DateTime)Eval("StartDate")).ToString("d") %></td>
- <td><a href="EditTimecard.aspx?Id=<%# Eval("Id") %>">Details</a></td>
+ <td><a href="TimecardDetails.aspx?TimecardId=<%# Eval("Id") %>">Details</a></td>
</tr>
</ItemTemplate>
<FooterTemplate>
1.3 +106 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx
Index: TimecardDetails.aspx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- TimecardDetails.aspx 29 Aug 2006 04:01:18 -0000 1.2
+++ TimecardDetails.aspx 29 Aug 2006 05:02:08 -0000 1.3
@@ -1,6 +1,20 @@
<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="TimecardDetails.aspx.cs" Inherits="TimecardDetails" Title="Timecard Details" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+ <asp:ObjectDataSource
+ ID="AllUsersDataSource"
+ runat="server"
+ SelectMethod="GetAllUsers"
+ TypeName="DataSourceUtils">
+ </asp:ObjectDataSource>
+
+ <asp:ObjectDataSource
+ ID="AllTasksDataSource"
+ runat="server"
+ SelectMethod="GetAllTasks"
+ TypeName="DataSourceUtils">
+ </asp:ObjectDataSource>
+
<div class="menubar">
<ul>
<li class="first">
@@ -18,5 +32,97 @@
</ul>
</div>
+ <div class="content">
+
+ <h2>Timecard</h2>
+
+ <asp:Panel ID="pnlTimeCardStatus" CssClass="timecardstatus" runat="server">
+ <table class="timecardtable">
+ <tr>
+ <th>Submitter</th>
+ <th>Approver</th>
+
+ <th>Status</th>
+ <th>Start Date</th>
+ </tr>
+ <tr>
+ <td><asp:Label ID="lblSubmitter" runat="server" /></td>
+ <td>
+ <asp:DropDownList ID="ddlApprover" runat="server" DataSourceID="AllUsersDataSource" DataTextField="UserName" DataValueField="ProviderUserKey" AppendDataBoundItems="true">
+ <asp:ListItem Text="-- Select --" Value=""/>
+ </asp:DropDownList>
+ </td>
+ <td><asp:Label ID="lblStatus" runat="server" /></td>
+ <td><asp:Label ID="lblStartDate" runat="server" /></td>
+ </tr>
+ </table>
+ </asp:Panel>
+
+ <div class="timecard">
+ <table class="full_width">
+ <colgroup span="4" style="width:22%;" />
+ <colgroup span="1" style="width:12%;" />
+ <thead>
+ <tr>
+ <th>Date</th>
+ <th>Start</th>
+
+ <th>End</th>
+ <th>Task</th>
+ <th class="align_center"><a class="button" href="">Delete</a></th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+
+ </table>
+
+ <table class="add_allocation_table bordered_table full_width">
+ <colgroup span="4" style="width:22%;" />
+ <colgroup span="1" style="width:12%;" />
+ <tbody>
+ <tr>
+ <td>
+ <select name="date">
+
+ <option value="0" selected="">06/05/2006</option>
+ <option value="1">06/06/2006</option>
+ <option value="2">06/07/2006</option>
+ <option value="3">06/08/2006</option>
+ <option value="4">06/09/2006</option>
+ <option value="5">06/10/2006</option>
+
+ <option value="6">06/11/2006</option>
+ </select>
+ </td>
+ <td><input type="text" id="start" size="7" /></td>
+ <td><input type="text" id="end" size="7" /></td>
+ <td>
+
+ <asp:DropDownList ID="ddlTasks" runat="server" DataSourceID="AllTasksDataSource" DataTextField="Name" DataValueField="Id" AppendDataBoundItems="true">
+ <asp:ListItem Text="-- Select --" Value=""/>
+ </asp:DropDownList>
+
+ </td>
+ <td class="align_center"><a class="button" href="">Add</a></td>
+ </tr>
+ </tbody>
+
+ </table>
+ </div>
+
+ <div class="comments">
+ <label for="comments">Comments</label><br />
+ <asp:TextBox ID="txtComments" runat="server" Rows="2" Columns="80" TextMode="MultiLine"/>
+ </div>
+
+ <div>
+ <asp:LinkButton runat="server" ID="btnSave" Text="Save" CssClass="button" OnClick="btnSave_Click" />
+ <asp:LinkButton runat="server" ID="btnDelete" Text="Delete" CssClass="button" OnClick="btnDelete_Click" />
+ <asp:LinkButton runat="server" ID="btnSubmit" Text="Submit" CssClass="button" OnClick="btnSubmit_Click" />
+ </div>
+
+ </div>
+
</asp:Content>
1.2 +35 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx.cs
Index: TimecardDetails.aspx.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TimecardDetails.aspx.cs 29 Aug 2006 02:39:34 -0000 1.1
+++ TimecardDetails.aspx.cs 29 Aug 2006 05:02:08 -0000 1.2
@@ -9,10 +9,45 @@
using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls;
+using TimeTrackingService;
+
public partial class TimecardDetails : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
+ if (!IsPostBack)
+ {
+ if (Request.QueryString["TimecardId"] != null)
+ {
+ long timecardId = long.Parse(Request.QueryString["TimecardId"]);
+ LoadTimecard(timecardId);
+ }
+ }
+ }
+
+ protected void LoadTimecard(long timecardId)
+ {
+ TimeTrackingService.TimeTrackingService service = new TimeTrackingService.TimeTrackingService();
+ TimeTrackingService.TimecardVO timecard = service.GetTimecard(timecardId);
+
+ lblSubmitter.Text = timecard.SubmitterName;
+ lblStatus.Text = timecard.Status.ToString();
+ lblStartDate.Text = timecard.StartDate.Value.ToString("d");
+ txtComments.Text = timecard.Comments;
+
+ }
+
+
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+
+ }
+ protected void btnDelete_Click(object sender, EventArgs e)
+ {
+
+ }
+ protected void btnSubmit_Click(object sender, EventArgs e)
+ {
}
}
1.4 +149 -18 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- Northwind.TimeTracker.Model.xmi 29 Aug 2006 04:01:19 -0000 1.3
+++ Northwind.TimeTracker.Model.xmi 29 Aug 2006 05:02:08 -0000 1.4
@@ -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 23:32:25 EDT 2006' xmlns:UML='omg.org/UML/1.4'>
+<XMI xmi.version='1.2' timestamp='Tue Aug 29 00:48:53 EDT 2006' xmlns:UML='omg.org/UML/1.4'>
<XMI.header>
<XMI.documentation>
<XMI.exporter>MagicDraw UML</XMI.exporter>
@@ -56,6 +56,25 @@
<UML:Parameter xmi.id='_9_5_1_874026a_1156376533371_724328_906' kind='return' type='_9_5_1_874026a_1156376533381_82452_951'/>
</UML:BehavioralFeature.parameter>
</UML:Operation>
+ <UML:Operation xmi.id='_9_5_1_874026a_1156825329903_405940_357' name='GetTimecard' visibility='public'>
+ <UML:BehavioralFeature.parameter>
+ <UML:Parameter xmi.id='_9_5_1_874026a_1156825352366_452924_359' name='timecardId'>
+ <UML:Parameter.type>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_238790_9'>
+ <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
+ <referentPath xmi.value='datatype::long'/>
+ </XMI.extension>
+ </UML:Classifier>
+ </UML:Parameter.type>
+ </UML:Parameter>
+ <UML:Parameter xmi.id='_9_5_1_874026a_1156825352366_479259_360' kind='return' type='_9_5_1_874026a_1156376533381_936385_939'/>
+ </UML:BehavioralFeature.parameter>
+ </UML:Operation>
+ <UML:Operation xmi.id='_9_5_1_874026a_1156826440190_993450_362' name='GetAllTasks' visibility='public'>
+ <UML:BehavioralFeature.parameter>
+ <UML:Parameter xmi.id='_9_5_1_874026a_1156826449914_918676_364' kind='return' type='_9_5_1_874026a_1156376533391_931343_959'/>
+ </UML:BehavioralFeature.parameter>
+ </UML:Operation>
</UML:Classifier.feature>
</UML:Class>
<UML:Class xmi.id='_9_5_1_874026a_1147802008009_352337_395' name='MembershipService'>
@@ -479,6 +498,8 @@
</UML:Class>
<UML:Dependency xmi.id='_9_5_1_874026a_1147802108654_796021_602' client='_9_5_1_874026a_1147802008009_352337_395' supplier='_9_5_1_874026a_1147797367717_238216_5'/>
<UML:Dependency xmi.id='_9_5_1_874026a_1147802105730_622383_591' client='_9_5_1_874026a_1147802008009_352337_395' supplier='_9_5_1_874026a_1147797358974_560038_4'/>
+ <UML:Dependency xmi.id='_9_5_1_874026a_1156826895314_255949_365' client='_9_5_1_874026a_1156376533371_439579_908' supplier='_9_5_1_874026a_1156376533381_336030_917'/>
+ <UML:Dependency xmi.id='_9_5_1_874026a_1156826908033_195470_422' client='_9_5_1_874026a_1156376533371_439579_908' supplier='_9_5_1_874026a_1156376533381_298555_915'/>
</UML:Namespace.ownedElement>
</UML:Package>
<UML:Package xmi.id='_9_5_1_874026a_1156376533361_957766_898' name='Domain'>
@@ -1367,11 +1388,11 @@
<elementID xmi.idref='_9_5_1_874026a_1156376533361_627672_894'/>
<zoomFactor xmi.value='1.0'/>
<diagramOpened xmi.value='true'/>
- <diagramWindowBounds>0, 1, 1032, 828</diagramWindowBounds>
- <diagramScrollPositionX xmi.value='0'/>
+ <diagramWindowBounds>0, 0, 907, 687</diagramWindowBounds>
+ <diagramScrollPositionX xmi.value='237'/>
<diagramScrollPositionY xmi.value='0'/>
- <maximized xmi.value='false'/>
- <active xmi.value='false'/>
+ <maximized xmi.value='true'/>
+ <active xmi.value='true'/>
<mdOwnedViews>
<mdElement elementClass='ClassView' xmi.id='_9_5_1_874026a_1156376850487_112015_1035'>
<elementID xmi.idref='_9_5_1_874026a_1156376533371_439579_908'/>
@@ -1383,7 +1404,7 @@
<value xmi.value='true'/>
</mdElement>
</properties>
- <geometry>250, 250, 439, 66</geometry>
+ <geometry>250, 250, 439, 96</geometry>
</mdElement>
<mdElement elementClass='ClassView' xmi.id='_9_5_1_874026a_1156376850487_592501_1036'>
<elementID xmi.idref='_9_5_1_874026a_1156376533401_956476_991'/>
@@ -1416,18 +1437,18 @@
</properties>
<linkFirstEndID xmi.idref='_9_5_1_874026a_1156376850487_592501_1036'/>
<linkSecondEndID xmi.idref='_9_5_1_874026a_1156376850487_112015_1035'/>
- <geometry>312, 393; 312, 316; </geometry>
+ <geometry>312, 393; 312, 346; </geometry>
<linkNameID xmi.idref='_9_5_1_874026a_1156376850497_151861_1038'/>
<nameVisible xmi.value='true'/>
<mdOwnedViews>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156376850497_151861_1038'>
<visible xmi.value='false'/>
- <geometry>297, 339, 30, 15</geometry>
+ <geometry>297, 357, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_874026a_1156376850497_744818_1039'>
<editable xmi.value='false'/>
<visible xmi.value='false'/>
- <geometry>312, 369, 30, 15</geometry>
+ <geometry>312, 375, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156376850497_261256_1040'>
<editable xmi.value='false'/>
@@ -1442,7 +1463,7 @@
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156376850497_187340_1041'>
<editable xmi.value='false'/>
<visible xmi.value='false'/>
- <geometry>297, 339, 30, 15</geometry>
+ <geometry>297, 357, 30, 15</geometry>
</mdElement>
</mdOwnedViews>
<linkConstraintID xmi.idref='_9_5_1_874026a_1156376850497_187340_1041'/>
@@ -1465,7 +1486,117 @@
<value xmi.value='true'/>
</mdElement>
</properties>
- <geometry>490, 390, 91, 72</geometry>
+ <geometry>370, 390, 91, 72</geometry>
+ </mdElement>
+ <mdElement elementClass='DependencyView' xmi.id='_9_5_1_874026a_1156826895334_933853_366'>
+ <elementID xmi.idref='_9_5_1_874026a_1156826895314_255949_365'/>
+ <properties>
+ <mdElement elementClass='ChoiceProperty'>
+ <propertyID>LINK_LINE_STYLE</propertyID>
+ <propertyDescriptionID>LINK_LINE_STYLE_DESCRIPTION</propertyDescriptionID>
+ <value>RECTILINEAR</value>
+ <choice xmi.value='RECTILINEAR^OBLIQUE^BEZIER'/>
+ <index xmi.value='0'/>
+ </mdElement>
+ </properties>
+ <linkFirstEndID xmi.idref='_9_5_1_874026a_1156376850497_214394_1042'/>
+ <linkSecondEndID xmi.idref='_9_5_1_874026a_1156376850487_112015_1035'/>
+ <geometry>415, 393; 415, 346; </geometry>
+ <linkNameID xmi.idref='_9_5_1_874026a_1156826895344_778871_367'/>
+ <nameVisible xmi.value='true'/>
+ <mdOwnedViews>
+ <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156826895344_778871_367'>
+ <visible xmi.value='false'/>
+ <geometry>398, 361, 30, 15</geometry>
+ </mdElement>
+ <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156826895344_449029_369'>
+ <editable xmi.value='false'/>
+ <visible xmi.value='false'/>
+ <geometry>393, 354, 30, 15</geometry>
+ </mdElement>
+ <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_874026a_1156826895364_411191_371'>
+ <editable xmi.value='false'/>
+ <visible xmi.value='false'/>
+ <geometry>405, 371, 30, 15</geometry>
+ </mdElement>
+ <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156826895364_366082_374'>
+ <editable xmi.value='false'/>
+ <visible xmi.value='false'/>
+ <geometry>0, 317, 30, 15</geometry>
+ <text><html>
+<body>
+<p></p>
+</body>
+</html></text>
+ </mdElement>
+ </mdOwnedViews>
+ <linkConstraintID xmi.idref='_9_5_1_874026a_1156826895344_449029_369'/>
+ <linkStereotypeID xmi.idref='_9_5_1_874026a_1156826895364_411191_371'/>
+ <linkTaggedValuesID xmi.idref='_9_5_1_874026a_1156826895364_366082_374'/>
+ </mdElement>
+ <mdElement elementClass='ClassView' xmi.id='_9_5_1_874026a_1156826901083_884394_391'>
+ <elementID xmi.idref='_9_5_1_874026a_1156376533381_298555_915'/>
+ <properties>
+ <mdElement elementClass='BooleanProperty'>
+ <propertyID>SUPPRESS_CLASS_OPERATIONS</propertyID>
+ <propertyGroup>OPERATIONS</propertyGroup>
+ <propertyDescriptionID>SUPPRESS_CLASS_OPERATIONS_DESCRIPTION</propertyDescriptionID>
+ <value xmi.value='true'/>
+ </mdElement>
+ <mdElement elementClass='BooleanProperty'>
+ <propertyID>SUPPRESS_CLASS_ATTRIBUTES</propertyID>
+ <propertyGroup>ATTRIBUTES</propertyGroup>
+ <propertyDescriptionID>SUPPRESS_CLASS_ATTRIBUTES_DESCRIPTION</propertyDescriptionID>
+ <value xmi.value='true'/>
+ </mdElement>
+ </properties>
+ <geometry>520, 390, 64, 72</geometry>
+ </mdElement>
+ <mdElement elementClass='DependencyView' xmi.id='_9_5_1_874026a_1156826908033_128481_423'>
+ <elementID xmi.idref='_9_5_1_874026a_1156826908033_195470_422'/>
+ <properties>
+ <mdElement elementClass='ChoiceProperty'>
+ <propertyID>LINK_LINE_STYLE</propertyID>
+ <propertyDescriptionID>LINK_LINE_STYLE_DESCRIPTION</propertyDescriptionID>
+ <value>RECTILINEAR</value>
+ <choice xmi.value='RECTILINEAR^OBLIQUE^BEZIER'/>
+ <index xmi.value='0'/>
+ </mdElement>
+ </properties>
+ <linkFirstEndID xmi.idref='_9_5_1_874026a_1156826901083_884394_391'/>
+ <linkSecondEndID xmi.idref='_9_5_1_874026a_1156376850487_112015_1035'/>
+ <geometry>550, 393; 550, 346; </geometry>
+ <linkNameID xmi.idref='_9_5_1_874026a_1156826908033_613364_424'/>
+ <nameVisible xmi.value='true'/>
+ <mdOwnedViews>
+ <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156826908033_613364_424'>
+ <visible xmi.value='false'/>
+ <geometry>539, 361, 30, 15</geometry>
+ </mdElement>
+ <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156826908033_901033_426'>
+ <editable xmi.value='false'/>
+ <visible xmi.value='false'/>
+ <geometry>546, 358, 30, 15</geometry>
+ </mdElement>
+ <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_874026a_1156826908033_959183_428'>
+ <editable xmi.value='false'/>
+ <visible xmi.value='false'/>
+ <geometry>523, 368, 30, 15</geometry>
+ </mdElement>
+ <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156826908033_796441_431'>
+ <editable xmi.value='false'/>
+ <visible xmi.value='false'/>
+ <geometry>330, 209, 30, 15</geometry>
+ <text><html>
+<body>
+<p></p>
+</body>
+</html></text>
+ </mdElement>
+ </mdOwnedViews>
+ <linkConstraintID xmi.idref='_9_5_1_874026a_1156826908033_901033_426'/>
+ <linkStereotypeID xmi.idref='_9_5_1_874026a_1156826908033_959183_428'/>
+ <linkTaggedValuesID xmi.idref='_9_5_1_874026a_1156826908033_796441_431'/>
</mdElement>
</mdOwnedViews>
</mdElement>
@@ -1481,8 +1612,8 @@
<elementID xmi.idref='_9_5_1_874026a_1156376533361_291811_892'/>
<zoomFactor xmi.value='1.0'/>
<diagramOpened xmi.value='true'/>
- <diagramWindowBounds>0, 1, 975, 827</diagramWindowBounds>
- <diagramScrollPositionX xmi.value='0'/>
+ <diagramWindowBounds>0, 1, 907, 686</diagramWindowBounds>
+ <diagramScrollPositionX xmi.value='219'/>
<diagramScrollPositionY xmi.value='0'/>
<maximized xmi.value='false'/>
<active xmi.value='false'/>
@@ -2061,11 +2192,11 @@
<elementID xmi.idref='_9_5_1_874026a_1156376533361_245304_893'/>
<zoomFactor xmi.value='1.0'/>
<diagramOpened xmi.value='true'/>
- <diagramWindowBounds>0, 0, 491, 551</diagramWindowBounds>
+ <diagramWindowBounds>0, 24, 487, 527</diagramWindowBounds>
<diagramScrollPositionX xmi.value='470'/>
<diagramScrollPositionY xmi.value='17'/>
- <maximized xmi.value='true'/>
- <active xmi.value='true'/>
+ <maximized xmi.value='false'/>
+ <active xmi.value='false'/>
<mdOwnedViews>
<mdElement elementClass='ClassView' xmi.id='_9_5_1_874026a_1156376850517_577854_1102'>
<elementID xmi.idref='_9_5_1_874026a_1156376533401_956476_991'/>
@@ -2889,7 +3020,7 @@
<mdElement elementClass='StringProperty'>
<propertyID>BROWSER_LAYOUT</propertyID>
<propertyDescriptionID>BROWSER_LAYOUT_DESCRIPTION</propertyDescriptionID>
- <value>0 13 0 0 0 1 0 0 0 0 0 0 3 53 0 0 2 c4 0 0 0 0 0 0 0 9 0 0 0 d 0 44 0 4f 0 43 0 55 0 4d 0 45 0 4e 0 54 0 41 0 54 0 49 0 4f 0 4e 0 0 6e 53 0 0 0 8 0 0 0 1 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 6e 53 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 3f a1 0 0 0 3 0 0 df d6 0 0 6e 53 0 0 b9 47 0 0 0 2 0 0 34 7a 0 0 3f a1 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 d 0 44 0 49 0 41 0 47 0 52 0 41 0 4d 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 dd 75 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 dd 75 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 c 0 5a 0 4f 0 4f 0 4d 0 5f 0 43 0 4f 0 4e 0 54 0 52 0 4f 0 4c 0 0 df d6 0 0 0 8 0 0 0 1 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 df d6 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 3f a1 0 0 0 3 0 0 df d6 0 0 6e 53 0 0 b9 47 0 0 0 2 0 0 34 7a 0 0 3f a1 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 f 0 45 0 58 0 54 0 45 0 4e 0 53 0 49 0 4f 0 4e 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 bf 59 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 bf 59 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 49 0 4e 0 48 0 45 0 52 0 49 0 54 0 41 0 4e 0 43 0 45 0 5f 0 54 0 52 0 45 0 45 0 0 bd c3 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 bd c3 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 0 53 0 45 0 41 0 52 0 43 0 48 0 5f 0 52 0 45 0 53 0 55 0 4c 0 54 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 eb 9a 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 eb 9a 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 f 0 4d 0 45 0 53 0 53 0 41 0 47 0 45 0 53 0 5f 0 57 0 49 0 4e 0 44 0 4f 0 57 0 0 8c eb 0 0 0 2 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 8c eb 0 0 0 0 0 0 0 3c 0 0 0 3c 0 0 0 c8 0 0 0 c8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 a 0 50 0 52 0 4f 0 50 0 45 0 52 0 54 0 49 0 45 0 53 0 0 b9 47 0 0 0 8 0 0 0 1 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 b9 47 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 3f a1 0 0 0 3 0 0 df d6 0 0 6e 53 0 0 b9 47 0 0 0 2 0 0 34 7a 0 0 3f a1 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 43 0 4f 0 4e 0 54 0 41 0 49 0 4e 0 4d 0 45 0 4e 0 54 0 5f 0 54 0 52 0 45 0 45 0 0 2e 63 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 2e 63 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 63 0 0 0 0 0 0 1e 98 0 0 0 1 0 0 4 63 0 0 0 1 0 0 c1 f 0 0 0 2 0 0 4 63 0 0 0 0 0 0 34 7a 0 0 0 2 0 0 4 64 0 0 21 4f 0 0 0 5 0 0 4 65 0 0 0 10 0 43 0 4f 0 4e 0 54 0 41 0 49 0 4e 0 4d 0 45 0 4e 0 54 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 10 0 49 0 4e 0 48 0 45 0 52 0 49 0 54 0 41 0 4e 0 43 0 45 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 d 0 44 0 49 0 41 0 47 0 52 0 41 0 4d 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 f 0 45 0 58 0 54 0 45 0 4e 0 53 0 49 0 4f 0 4e 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 13 0 53 0 45 0 41 0 52 0 43 0 48 0 5f 0 52 0 45 0 53 0 55 0 4c 0 54 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 1 5c 0 0 1 26 0 0 0 0 0 0 4 64 0 0 3f a1 0 0 0 3 0 0 4 65 0 0 0 c 0 5a 0 4f 0 4f 0 4d 0 5f 0 43 0 4f 0 4e 0 54 0 52 0 4f 0 4c 0 0 4 65 0 0 0 d 0 44 0 4f 0 43 0 55 0 4d 0 45 0 4e 0 54 0 41 0 54 0 49 0 4f 0 4e 0 0 4 65 0 0 0 a 0 50 0 52 0 4f 0 50 0 45 0 52 0 54 0 49 0 45 0 53 0 0 1 5c 0 0 1 26 0 0 0 0 0 0 1 5c 0 0 2 50 0 0 4 66 0 0 0 1 0 0 0 19 0 0 0 0 0 0 1 61 0 0 2 50 0 0 1 61 0 0 2 50 0 0 0 3 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 f 0 4d 0 45 0 53 0 53 0 41 0 47 0 45 0 53 0 5f 0 57 0 49 0 4e 0 44 0 4f 0 57 </value>
+ <value>0 13 0 0 0 1 0 0 0 0 0 0 4 f3 0 0 3 4c 0 0 0 0 0 0 0 9 0 0 0 d 0 44 0 4f 0 43 0 55 0 4d 0 45 0 4e 0 54 0 41 0 54 0 49 0 4f 0 4e 0 0 6e 53 0 0 0 8 0 0 0 1 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 49 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 6e 53 0 0 0 2 0 0 0 0 0 0 0 0 0 0 4 eb 0 0 2 c7 0 0 0 8 0 0 0 0 0 0 3f a1 0 0 0 3 0 0 df d6 0 0 6e 53 0 0 b9 47 0 0 0 2 0 0 34 7a 0 0 3f a1 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 d 0 44 0 49 0 41 0 47 0 52 0 41 0 4d 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 dd 75 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 dd 75 0 0 0 2 0 0 0 0 0 0 0 0 0 0 4 eb 0 0 2 c7 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 c 0 5a 0 4f 0 4f 0 4d 0 5f 0 43 0 4f 0 4e 0 54 0 52 0 4f 0 4c 0 0 df d6 0 0 0 8 0 0 0 1 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 49 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 df d6 0 0 0 2 0 0 0 0 0 0 0 0 0 0 4 eb 0 0 2 c7 0 0 0 8 0 0 0 0 0 0 3f a1 0 0 0 3 0 0 df d6 0 0 6e 53 0 0 b9 47 0 0 0 2 0 0 34 7a 0 0 3f a1 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 f 0 45 0 58 0 54 0 45 0 4e 0 53 0 49 0 4f 0 4e 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 bf 59 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 bf 59 0 0 0 2 0 0 0 0 0 0 0 0 0 0 4 eb 0 0 2 c7 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 49 0 4e 0 48 0 45 0 52 0 49 0 54 0 41 0 4e 0 43 0 45 0 5f 0 54 0 52 0 45 0 45 0 0 bd c3 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 bd c3 0 0 0 2 0 0 0 0 0 0 0 0 0 0 4 eb 0 0 2 c7 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 0 53 0 45 0 41 0 52 0 43 0 48 0 5f 0 52 0 45 0 53 0 55 0 4c 0 54 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 eb 9a 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 eb 9a 0 0 0 2 0 0 0 0 0 0 0 0 0 0 4 eb 0 0 2 c7 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 f 0 4d 0 45 0 53 0 53 0 41 0 47 0 45 0 53 0 5f 0 57 0 49 0 4e 0 44 0 4f 0 57 0 0 8c eb 0 0 0 2 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 8c eb 0 0 0 0 0 0 0 3c 0 0 0 3c 0 0 0 c8 0 0 0 c8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 a 0 50 0 52 0 4f 0 50 0 45 0 52 0 54 0 49 0 45 0 53 0 0 b9 47 0 0 0 8 0 0 0 1 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 49 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 b9 47 0 0 0 2 0 0 0 0 0 0 0 0 0 0 4 eb 0 0 2 c7 0 0 0 8 0 0 0 0 0 0 3f a1 0 0 0 3 0 0 df d6 0 0 6e 53 0 0 b9 47 0 0 0 2 0 0 34 7a 0 0 3f a1 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 43 0 4f 0 4e 0 54 0 41 0 49 0 4e 0 4d 0 45 0 4e 0 54 0 5f 0 54 0 52 0 45 0 45 0 0 2e 63 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 2e 63 0 0 0 2 0 0 0 0 0 0 0 0 0 0 4 eb 0 0 2 c7 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 63 0 0 0 0 0 0 1e 98 0 0 0 1 0 0 4 63 0 0 0 1 0 0 c1 f 0 0 0 2 0 0 4 63 0 0 0 0 0 0 34 7a 0 0 0 2 0 0 4 64 0 0 21 4f 0 0 0 5 0 0 4 65 0 0 0 10 0 43 0 4f 0 4e 0 54 0 41 0 49 0 4e 0 4d 0 45 0 4e 0 54 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 10 0 49 0 4e 0 48 0 45 0 52 0 49 0 54 0 41 0 4e 0 43 0 45 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 d 0 44 0 49 0 41 0 47 0 52 0 41 0 4d 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 f 0 45 0 58 0 54 0 45 0 4e 0 53 0 49 0 4f 0 4e 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 13 0 53 0 45 0 41 0 52 0 43 0 48 0 5f 0 52 0 45 0 53 0 55 0 4c 0 54 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 1 5c 0 0 1 26 0 0 0 0 0 0 4 64 0 0 3f a1 0 0 0 3 0 0 4 65 0 0 0 c 0 5a 0 4f 0 4f 0 4d 0 5f 0 43 0 4f 0 4e 0 54 0 52 0 4f 0 4c 0 0 4 65 0 0 0 d 0 44 0 4f 0 43 0 55 0 4d 0 45 0 4e 0 54 0 41 0 54 0 49 0 4f 0 4e 0 0 4 65 0 0 0 a 0 50 0 52 0 4f 0 50 0 45 0 52 0 54 0 49 0 45 0 53 0 0 1 5c 0 0 1 26 0 0 0 0 0 0 1 5c 0 0 2 50 0 0 4 66 0 0 0 1 0 0 0 19 0 0 0 0 0 0 1 61 0 0 2 50 0 0 1 61 0 0 2 50 0 0 0 3 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 f 0 4d 0 45 0 53 0 53 0 41 0 47 0 45 0 53 0 5f 0 57 0 49 0 4e 0 44 0 4f 0 57 </value>
<multiline xmi.value='false'/>
</mdElement>
<mdElement elementClass='StringProperty'>
@@ -2938,7 +3069,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 e7 1e f4 2c 46 9a 69 7e 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 3d f7 38 2e ce 24 3a 89 e3 51 92 e5 1d f4 2b 4c 9a 6e 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>
<multiline xmi.value='false'/>
</mdElement>
<mdElement elementClass='ChoiceProperty'>
|
|
From: Chris M. <cm...@us...> - 2006-08-29 04:02:18
|
User: cmicali
Date: 06/08/28 21:02:17
Modified: . pom.xml
Log:
- Enabled distribution package
Revision Changes Path
1.12 +1 -0 plugins/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/pom.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- pom.xml 19 Jul 2006 15:14:32 -0000 1.11
+++ pom.xml 29 Aug 2006 04:02:17 -0000 1.12
@@ -183,6 +183,7 @@
<module>cartridges</module>
<module>andromdapp</module>
<module>maven2/plugins</module>
+ <module>distribution</module>
</modules>
<repositories>
<repository>
|
User: cmicali
Date: 06/08/28 21:01:20
Modified: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain
TaskDaoImpl.cs TimeAllocationDaoImpl.cs
TimecardDaoImpl.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Service
MembershipServiceImpl.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web
ApproveTimecards.aspx Home.aspx
NewTimecardSetup.aspx SearchTimecards.aspx
TimecardDetails.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/Database
build-db.bat static-data-delete.sql
static-data-insert.sql test-data-delete.sql
test-data-insert.sql
Removed: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Database
TestData.sql
Log:
- Database build scripts
- Fixed spelling errors
Revision Changes Path
1.2 +17 -4 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TaskDaoImpl.cs
Index: TaskDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TaskDaoImpl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TaskDaoImpl.cs 28 Aug 2006 04:22:17 -0000 1.1
+++ TaskDaoImpl.cs 29 Aug 2006 04:01:18 -0000 1.2
@@ -20,8 +20,15 @@
/// </summary>
public override Northwind.TimeTracker.VO.TaskVO ToTaskVO(Northwind.TimeTracker.Domain.Task entity)
{
- // put your implementation here
- return null;
+ // Entity to VO conversion
+
+ Northwind.TimeTracker.VO.TaskVO valueObject = new Northwind.TimeTracker.VO.TaskVO();
+
+ valueObject.Id = entity.Id;
+ valueObject.Name = entity.Name;
+
+ return valueObject;
+
}
/// <summary>
@@ -29,8 +36,14 @@
/// </summary>
public override Northwind.TimeTracker.Domain.Task TaskVOToEntity(Northwind.TimeTracker.VO.TaskVO taskVO)
{
- // put your implementation here
- return null;
+ // VO to entity conversion
+ Northwind.TimeTracker.Domain.Task entity = Northwind.TimeTracker.Domain.Task.Factory.newInstance();
+
+ entity.Id = taskVO.Id;
+ entity.Name = taskVO.Name;
+
+ return entity;
+
}
}
1.2 +10 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimeAllocationDaoImpl.cs
Index: TimeAllocationDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimeAllocationDaoImpl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TimeAllocationDaoImpl.cs 28 Aug 2006 04:22:17 -0000 1.1
+++ TimeAllocationDaoImpl.cs 29 Aug 2006 04:01:18 -0000 1.2
@@ -20,8 +20,16 @@
/// </summary>
public override Northwind.TimeTracker.VO.TimeAllocationVO ToTimeAllocationVO(Northwind.TimeTracker.Domain.TimeAllocation entity)
{
- // put your implementation here
- return null;
+ // Entity to VO conversion
+
+ Northwind.TimeTracker.VO.TimeAllocationVO valueObject = new Northwind.TimeTracker.VO.TimeAllocationVO();
+
+ valueObject.Id = entity.Id;
+ valueObject.TaskId = entity.Task.Id;
+ // valueObject.TimePeriodVO
+
+ return valueObject;
+
}
/// <summary>
1.2 +12 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardDaoImpl.cs
Index: TimecardDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardDaoImpl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TimecardDaoImpl.cs 28 Aug 2006 04:22:17 -0000 1.1
+++ TimecardDaoImpl.cs 29 Aug 2006 04:01:18 -0000 1.2
@@ -62,9 +62,19 @@
valueObject.Id = entity.Id;
valueObject.StartDate = entity.StartDate;
valueObject.Status = entity.Status;
+ valueObject.ApproverName = string.Empty;
+ valueObject.SubmitterName = string.Empty;
+ try
+ {
valueObject.ApproverName = entity.Approver.FirstName + " " + entity.Approver.LastName;
+ }
+ catch { }
+ try
+ {
valueObject.SubmitterName = entity.Submitter.FirstName + " " + entity.Submitter.LastName;
}
+ catch { }
+ }
/// <summary>
/// @see Northwind.TimeTracker.Domain.ITimecardDao#ToTimecardVO(Northwind.TimeTracker.Domain.Timecard)
1.2 +10 -10 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Service/MembershipServiceImpl.cs
Index: MembershipServiceImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Service/MembershipServiceImpl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- MembershipServiceImpl.cs 28 Aug 2006 04:22:18 -0000 1.1
+++ MembershipServiceImpl.cs 29 Aug 2006 04:01:18 -0000 1.2
@@ -38,7 +38,7 @@
protected override string HandleGetUserNameByEmail(string email)
{
ISession session = SessionManagerFactory.SessionManager.Session;
- IQuery query = session.CreateQuery("SELECT user.UserName FROM UserImpl user WHERE user.Email = :email");
+ IQuery query = session.CreateQuery("SELECT user.Username FROM UserImpl user WHERE user.Email = :email");
query.SetParameter("email", email);
return (string)query.UniqueResult();
}
@@ -49,7 +49,7 @@
protected override long HandleGetUserIdByUsername(string username)
{
ISession session = SessionManagerFactory.SessionManager.Session;
- IQuery query = session.CreateQuery("SELECT user.Id FROM UserImpl user WHERE user.UserName = :username");
+ IQuery query = session.CreateQuery("SELECT user.Id FROM UserImpl user WHERE user.Username = :username");
query.SetParameter("username", username);
return (long)query.UniqueResult();
}
@@ -60,7 +60,7 @@
protected override UserVO HandleGetUser(String username)
{
ISession session = SessionManagerFactory.SessionManager.Session;
- IQuery query = session.CreateQuery("FROM UserImpl user WHERE user.UserName = :username");
+ IQuery query = session.CreateQuery("FROM UserImpl user WHERE user.Username = :username");
query.SetParameter("username", username);
IList users = query.List();
if (users.Count == 1)
@@ -168,7 +168,7 @@
protected override bool HandleUpdatePassword(string username, string oldPassword, string newPassword)
{
ISession session = SessionManagerFactory.SessionManager.Session;
- IQuery query = session.CreateQuery("FROM UserImpl user WHERE user.UserName = :username AND user.Password = :password");
+ IQuery query = session.CreateQuery("FROM UserImpl user WHERE user.Username = :username AND user.Password = :password");
query.SetParameter("username", username);
query.SetParameter("password", oldPassword);
IList users = query.List();
@@ -208,7 +208,7 @@
protected override System.Collections.IList HandleFindUsersByName(String usernameToMatch, int pageIndex, int pageSize)
{
ISession session = SessionManagerFactory.SessionManager.Session;
- IQuery query = session.CreateQuery("FROM UserImpl user WHERE user.UserName LIKE :username");
+ IQuery query = session.CreateQuery("FROM UserImpl user WHERE user.Username LIKE :username");
query.SetParameter("username", usernameToMatch);
return this.UserDao.ToUserVOList(query.List());
}
@@ -219,7 +219,7 @@
protected override UserVO HandleValidateUser(String username, String password)
{
ISession session = SessionManagerFactory.SessionManager.Session;
- IQuery query = session.CreateQuery("FROM UserImpl user WHERE user.UserName = :username AND user.Password = :password");
+ IQuery query = session.CreateQuery("FROM UserImpl user WHERE user.Username = :username AND user.Password = :password");
query.SetParameter("username", username);
query.SetParameter("password", password);
IList users = query.List();
@@ -260,7 +260,7 @@
protected override Role[] HandleGetRolesForUser(string username)
{
ISession session = SessionManagerFactory.SessionManager.Session;
- IQuery query = session.CreateQuery("FROM UserRoleImpl role WHERE role.User.UserName = :username");
+ IQuery query = session.CreateQuery("FROM UserRoleImpl role WHERE role.User.Username = :username");
query.SetParameter("username", username);
IList results = query.List();
Role[] roles = new Role[results.Count];
@@ -277,7 +277,7 @@
protected override string[] HandleGetUsernamesInRole(Role role)
{
ISession session = SessionManagerFactory.SessionManager.Session;
- IQuery query = session.CreateQuery("SELECT role.User.UserName FROM UserRoleImpl role WHERE role.Role = :roletype");
+ IQuery query = session.CreateQuery("SELECT role.User.Username FROM UserRoleImpl role WHERE role.Role = :roletype");
query.SetParameter("roletype", (int)role);
IList usernameList = query.List();
Array usernames = Array.CreateInstance(typeof(string), usernameList.Count);
@@ -291,7 +291,7 @@
protected override string[] HandleFindUsernamesInRole(Role role, string usernameToMatch)
{
ISession session = SessionManagerFactory.SessionManager.Session;
- IQuery query = session.CreateQuery("SELECT role.User.UserName FROM UserRoleImpl role WHERE role.Role = :roletype AND role.User.UserName LIKE :usernameToMatch");
+ IQuery query = session.CreateQuery("SELECT role.User.Username FROM UserRoleImpl role WHERE role.Role = :roletype AND role.User.Username LIKE :usernameToMatch");
query.SetParameter("roletype", (int)role);
query.SetParameter("usernameToMatch", usernameToMatch);
IList usernameList = query.List();
@@ -321,7 +321,7 @@
protected override bool HandleIsUserInRole(string username, Role role)
{
ISession session = SessionManagerFactory.SessionManager.Session;
- IQuery query = session.CreateQuery("SELECT role.Id FROM UserRoleImpl role WHERE role.User.UserName = :username AND role.Role = :roletype");
+ IQuery query = session.CreateQuery("SELECT role.Id FROM UserRoleImpl role WHERE role.User.Username = :username AND role.Role = :roletype");
query.SetParameter("username", username);
query.SetParameter("roletype", (int)role);
IList roles = query.List();
1.2 +19 -1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/ApproveTimecards.aspx
Index: ApproveTimecards.aspx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/ApproveTimecards.aspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ApproveTimecards.aspx 28 Aug 2006 04:22:20 -0000 1.1
+++ ApproveTimecards.aspx 29 Aug 2006 04:01:18 -0000 1.2
@@ -1,4 +1,22 @@
-<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="ApproveTimecards.aspx.cs" Inherits="ApproveTimecards" Title="Untitled Page" %>
+<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="ApproveTimecards.aspx.cs" Inherits="ApproveTimecards" Title="Approve Timecards" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+
+ <div class="menubar">
+ <ul>
+ <li class="first">
+ <a href="Home.aspx">Home</a>
+ </li>
+ <li>
+ <a href="TimecardDetails.aspx">Timecard Details</a>
+ </li>
+ <li>
+ <a href="SearchTimecards.aspx">Search Timecards</a>
+ </li>
+ <li>
+ <a class="selected" href="ApproveTimecards.aspx">Approve Timecards</a>
+ </li>
+ </ul>
+ </div>
+
</asp:Content>
1.3 +3 -3 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Home.aspx 29 Aug 2006 02:39:34 -0000 1.2
+++ Home.aspx 29 Aug 2006 04:01:18 -0000 1.3
@@ -1,10 +1,10 @@
-<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="Home.aspx.cs" Inherits="Home" Title="Untitled Page" %>
+<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="Home.aspx.cs" Inherits="Home" Title="Home" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<div class="menubar">
<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="TimecardDetails.aspx">Timecard Details</a></li>
<li><a href="SearchTimecards.aspx">Search Timecards</a></li>
<li><a href="ApproveTimecards.aspx">Approve Timecards</a></li>
</ul>
@@ -22,7 +22,7 @@
<td><a href="NewTimecardSetup.aspx">New timecard</a></td>
</tr>
<tr>
- <td><a href="timecard.html">Last saved timecard</a></td>
+ <td><a href="TimecardDetails.aspx">Last saved timecard</a></td>
</tr>
<tr>
<td><a href="SearchTimecards.aspx">Search timecards</a></td>
1.2 +9 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/NewTimecardSetup.aspx
Index: NewTimecardSetup.aspx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/NewTimecardSetup.aspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NewTimecardSetup.aspx 28 Aug 2006 04:22:21 -0000 1.1
+++ NewTimecardSetup.aspx 29 Aug 2006 04:01:18 -0000 1.2
@@ -1,6 +1,15 @@
<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="NewTimecardSetup.aspx.cs" Inherits="NewTimecardSetup" Title="Untitled Page" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+ <div class="menubar">
+ <ul>
+ <li><a class="selected" href="Home.aspx">Home</a></li>
+ <li class="first"><a href="TimecardDetails.aspx">Timecard Details</a></li>
+ <li><a href="SearchTimecards.aspx">Search Timecards</a></li>
+ <li><a href="ApproveTimecards.aspx">Approve Timecards</a></li>
+ </ul>
+ </div>
+
<div class="content">
<h2>New Timecard Setup</h2>
1.3 +2 -2 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- SearchTimecards.aspx 29 Aug 2006 02:39:34 -0000 1.2
+++ SearchTimecards.aspx 29 Aug 2006 04:01:18 -0000 1.3
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="SearchTimecards.aspx.cs" Inherits="SearchTimecards" Title="Untitled Page" %>
+<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="SearchTimecards.aspx.cs" Inherits="SearchTimecards" Title="Search Timecards" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<asp:ObjectDataSource
@@ -93,7 +93,7 @@
<td><%# Eval("SubmitterName") %></td>
<td><%# Eval("ApproverName") %></td>
<td><%# Eval("Status") %></td>
- <td><%# Eval("StartDate") %></td>
+ <td><%# ((DateTime)Eval("StartDate")).ToString("d") %></td>
<td><a href="EditTimecard.aspx?Id=<%# Eval("Id") %>">Details</a></td>
</tr>
</ItemTemplate>
1.2 +19 -1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx
Index: TimecardDetails.aspx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TimecardDetails.aspx 29 Aug 2006 02:39:34 -0000 1.1
+++ TimecardDetails.aspx 29 Aug 2006 04:01:18 -0000 1.2
@@ -1,4 +1,22 @@
-<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="TimecardDetails.aspx.cs" Inherits="TimecardDetails" Title="Untitled Page" %>
+<%@ Page Language="C#" MasterPageFile="~/Layout/Default.master" AutoEventWireup="true" CodeFile="TimecardDetails.aspx.cs" Inherits="TimecardDetails" Title="Timecard Details" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+
+ <div class="menubar">
+ <ul>
+ <li class="first">
+ <a href="Home.aspx">Home</a>
+ </li>
+ <li>
+ <a class="selected" href="TimecardDetails.aspx">Timecard Details</a>
+ </li>
+ <li>
+ <a href="SearchTimecards.aspx">Search Timecards</a>
+ </li>
+ <li>
+ <a href="ApproveTimecards.aspx">Approve Timecards</a>
+ </li>
+ </ul>
+ </div>
+
</asp:Content>
1.3 +59 -45 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Northwind.TimeTracker.Model.xmi 29 Aug 2006 02:39:37 -0000 1.2
+++ Northwind.TimeTracker.Model.xmi 29 Aug 2006 04:01:19 -0000 1.3
@@ -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 12:33:29 EDT 2006' xmlns:UML='omg.org/UML/1.4'>
+<XMI xmi.version='1.2' timestamp='Mon Aug 28 23:32:25 EDT 2006' xmlns:UML='omg.org/UML/1.4'>
<XMI.header>
<XMI.documentation>
<XMI.exporter>MagicDraw UML</XMI.exporter>
@@ -827,8 +827,15 @@
</UML:StructuralFeature.type>
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1156385000753_225025_324' name='firstName' visibility='public'>
+ <UML:StructuralFeature.multiplicity>
+ <UML:Multiplicity xmi.id='_9_5_1_874026a_1156822345619_77763_350'>
+ <UML:Multiplicity.range>
+ <UML:MultiplicityRange xmi.id='_9_5_1_874026a_1156822345619_358016_351' lower='0' upper='1'/>
+ </UML:Multiplicity.range>
+ </UML:Multiplicity>
+ </UML:StructuralFeature.multiplicity>
<UML:Attribute.initialValue>
- <UML:Expression xmi.id='_9_5_1_874026a_1156736949726_423672_7'/>
+ <UML:Expression xmi.id='_9_5_1_874026a_1156822345619_109517_352'/>
</UML:Attribute.initialValue>
<UML:StructuralFeature.type>
<UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
@@ -839,8 +846,15 @@
</UML:StructuralFeature.type>
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1156385004158_820166_328' name='lastName' visibility='public'>
+ <UML:StructuralFeature.multiplicity>
+ <UML:Multiplicity xmi.id='_9_5_1_874026a_1156822345619_412241_353'>
+ <UML:Multiplicity.range>
+ <UML:MultiplicityRange xmi.id='_9_5_1_874026a_1156822345619_834179_354' lower='0' upper='1'/>
+ </UML:Multiplicity.range>
+ </UML:Multiplicity>
+ </UML:StructuralFeature.multiplicity>
<UML:Attribute.initialValue>
- <UML:Expression xmi.id='_9_5_1_874026a_1156736949726_156391_8'/>
+ <UML:Expression xmi.id='_9_5_1_874026a_1156822345619_558280_355'/>
</UML:Attribute.initialValue>
<UML:StructuralFeature.type>
<UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
@@ -1973,7 +1987,7 @@
<value xmi.value='false'/>
</mdElement>
</properties>
- <geometry>30, 50, 135, 171</geometry>
+ <geometry>30, 50, 137, 171</geometry>
</mdElement>
<mdElement elementClass='ClassView' xmi.id='_9_5_1_874026a_1156380806978_363344_2866'>
<elementID xmi.idref='_9_5_1_874026a_1148487426786_832415_417'/>
@@ -2047,9 +2061,9 @@
<elementID xmi.idref='_9_5_1_874026a_1156376533361_245304_893'/>
<zoomFactor xmi.value='1.0'/>
<diagramOpened xmi.value='true'/>
- <diagramWindowBounds>0, 0, 1032, 829</diagramWindowBounds>
- <diagramScrollPositionX xmi.value='0'/>
- <diagramScrollPositionY xmi.value='0'/>
+ <diagramWindowBounds>0, 0, 491, 551</diagramWindowBounds>
+ <diagramScrollPositionX xmi.value='470'/>
+ <diagramScrollPositionY xmi.value='17'/>
<maximized xmi.value='true'/>
<active xmi.value='true'/>
<mdOwnedViews>
@@ -2386,7 +2400,7 @@
<value xmi.value='false'/>
</mdElement>
</properties>
- <geometry>500, 50, 135, 171</geometry>
+ <geometry>500, 50, 137, 171</geometry>
</mdElement>
<mdElement elementClass='AssociationView' xmi.id='_9_5_1_874026a_1156380515860_348271_1849'>
<elementID xmi.idref='_9_5_1_874026a_1156380515860_372385_1848'/>
@@ -2418,28 +2432,28 @@
</mdElement>
<mdElement elementClass='RoleView' xmi.id='_9_5_1_874026a_1156380515860_560935_1857'>
<elementID xmi.idref='_9_5_1_874026a_1156380515860_39877_1846'/>
- <geometry>378, 95, 10, 10</geometry>
+ <geometry>378, 90, 10, 10</geometry>
<mdOwnedViews>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380515860_571422_1858'>
<visible xmi.value='false'/>
- <geometry>378, 85, 30, 15</geometry>
+ <geometry>378, 80, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380515860_307142_1860'>
- <geometry>383, 75, 30, 15</geometry>
+ <geometry>383, 70, 30, 15</geometry>
<text>*</text>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380515860_773999_1862'>
<visible xmi.value='false'/>
- <geometry>378, 85, 30, 15</geometry>
+ <geometry>378, 80, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_874026a_1156380515860_730380_1864'>
<editable xmi.value='false'/>
<visible xmi.value='false'/>
- <geometry>378, 105, 30, 15</geometry>
+ <geometry>378, 100, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380515860_851034_1867'>
<visible xmi.value='false'/>
- <geometry>378, 85, 30, 15</geometry>
+ <geometry>378, 80, 30, 15</geometry>
<text><html>
<body>
<p></p>
@@ -2455,28 +2469,28 @@
</mdElement>
<mdElement elementClass='RoleView' xmi.id='_9_5_1_874026a_1156380515860_267076_1871'>
<elementID xmi.idref='_9_5_1_874026a_1156380515860_435521_1847'/>
- <geometry>500, 95, 10, 10</geometry>
+ <geometry>490, 90, 10, 10</geometry>
<mdOwnedViews>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380515860_658501_1872'>
- <geometry>427, 95, 60, 15</geometry>
+ <geometry>417, 90, 60, 15</geometry>
<text>+submitter</text>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380515860_695009_1874'>
- <geometry>455, 75, 30, 15</geometry>
+ <geometry>445, 70, 30, 15</geometry>
<text>1</text>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380515860_713601_1876'>
<visible xmi.value='false'/>
- <geometry>480, 85, 30, 15</geometry>
+ <geometry>470, 80, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_874026a_1156380515860_2452_1878'>
<editable xmi.value='false'/>
<visible xmi.value='false'/>
- <geometry>480, 105, 30, 15</geometry>
+ <geometry>470, 100, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380515860_841889_1881'>
<visible xmi.value='false'/>
- <geometry>480, 85, 30, 15</geometry>
+ <geometry>470, 80, 30, 15</geometry>
<text><html>
<body>
<p></p>
@@ -2531,28 +2545,28 @@
</mdElement>
<mdElement elementClass='RoleView' xmi.id='_9_5_1_874026a_1156380576797_95513_1952'>
<elementID xmi.idref='_9_5_1_874026a_1156380576797_56809_1941'/>
- <geometry>378, 150, 10, 10</geometry>
+ <geometry>378, 145, 10, 10</geometry>
<mdOwnedViews>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380576797_640495_1953'>
<visible xmi.value='false'/>
- <geometry>378, 140, 30, 15</geometry>
+ <geometry>378, 135, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380576797_939152_1955'>
- <geometry>383, 130, 30, 15</geometry>
+ <geometry>383, 125, 30, 15</geometry>
<text>*</text>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380576797_732895_1957'>
<visible xmi.value='false'/>
- <geometry>378, 140, 30, 15</geometry>
+ <geometry>378, 135, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_874026a_1156380576797_95406_1959'>
<editable xmi.value='false'/>
<visible xmi.value='false'/>
- <geometry>378, 160, 30, 15</geometry>
+ <geometry>378, 155, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380576797_993956_1962'>
<visible xmi.value='false'/>
- <geometry>378, 140, 30, 15</geometry>
+ <geometry>378, 135, 30, 15</geometry>
<text><html>
<body>
<p></p>
@@ -2568,28 +2582,28 @@
</mdElement>
<mdElement elementClass='RoleView' xmi.id='_9_5_1_874026a_1156380576797_767818_1966'>
<elementID xmi.idref='_9_5_1_874026a_1156380576797_466944_1942'/>
- <geometry>500, 150, 10, 10</geometry>
+ <geometry>490, 145, 10, 10</geometry>
<mdOwnedViews>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380576797_140757_1967'>
- <geometry>427, 150, 56, 15</geometry>
+ <geometry>417, 145, 56, 15</geometry>
<text>+approver</text>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380576797_456737_1969'>
- <geometry>455, 130, 30, 15</geometry>
+ <geometry>445, 125, 30, 15</geometry>
<text>0..1</text>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380576797_677520_1971'>
<visible xmi.value='false'/>
- <geometry>480, 140, 30, 15</geometry>
+ <geometry>470, 135, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_874026a_1156380576797_488299_1973'>
<editable xmi.value='false'/>
<visible xmi.value='false'/>
- <geometry>480, 160, 30, 15</geometry>
+ <geometry>470, 155, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156380576797_548544_1976'>
<visible xmi.value='false'/>
- <geometry>480, 140, 30, 15</geometry>
+ <geometry>470, 135, 30, 15</geometry>
<text><html>
<body>
<p></p>
@@ -2630,24 +2644,24 @@
<elementID xmi.idref='_9_5_1_874026a_1156737323213_714933_188'/>
<linkFirstEndID xmi.idref='_9_5_1_874026a_1156380429556_397264_1795'/>
<linkSecondEndID xmi.idref='_9_5_1_874026a_1156737251170_176391_155'/>
- <geometry>635, 128; 780, 128; </geometry>
+ <geometry>637, 128; 780, 128; </geometry>
<linkNameID xmi.idref='_9_5_1_874026a_1156737323223_543280_225'/>
<nameVisible xmi.value='true'/>
<mdOwnedViews>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156737323223_749467_190'>
<editable xmi.value='false'/>
<visible xmi.value='false'/>
- <geometry>693, 99, 30, 15</geometry>
+ <geometry>694, 99, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_874026a_1156737323223_681998_192'>
<editable xmi.value='false'/>
<visible xmi.value='false'/>
- <geometry>693, 141, 30, 15</geometry>
+ <geometry>694, 141, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156737323223_320153_195'>
<editable xmi.value='false'/>
<visible xmi.value='false'/>
- <geometry>335, 0, 30, 15</geometry>
+ <geometry>342, 0, 30, 15</geometry>
<text><html>
<body>
<p></p>
@@ -2656,28 +2670,28 @@
</mdElement>
<mdElement elementClass='RoleView' xmi.id='_9_5_1_874026a_1156737323223_768361_197'>
<elementID xmi.idref='_9_5_1_874026a_1156737323213_674633_186'/>
- <geometry>635, 123, 10, 10</geometry>
+ <geometry>637, 123, 10, 10</geometry>
<mdOwnedViews>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156737323223_91335_198'>
- <geometry>640, 107, 33, 15</geometry>
+ <geometry>642, 107, 33, 15</geometry>
<text>+user</text>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156737323223_406758_200'>
- <geometry>650, 137, 30, 15</geometry>
+ <geometry>652, 137, 30, 15</geometry>
<text>1</text>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156737323223_819992_202'>
<visible xmi.value='false'/>
- <geometry>635, 123, 30, 15</geometry>
+ <geometry>637, 123, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_874026a_1156737323223_925759_204'>
<editable xmi.value='false'/>
<visible xmi.value='false'/>
- <geometry>635, 143, 30, 15</geometry>
+ <geometry>637, 143, 30, 15</geometry>
</mdElement>
<mdElement elementClass='TextBoxView' xmi.id='_9_5_1_874026a_1156737323223_635189_207'>
<visible xmi.value='false'/>
- <geometry>635, 123, 30, 15</geometry>
+ <geometry>637, 123, 30, 15</geometry>
<text><html>
<body>
<p></p>
@@ -2729,7 +2743,7 @@
</mdElement>
<mdElement elementClass='AssociationTextBoxView' xmi.id='_9_5_1_874026a_1156737323223_543280_225'>
<visible xmi.value='false'/>
- <geometry>686, 114, 45, 15</geometry>
+ <geometry>687, 114, 45, 15</geometry>
</mdElement>
</mdOwnedViews>
<linkConstraintID xmi.idref='_9_5_1_874026a_1156737323223_749467_190'/>
@@ -2875,7 +2889,7 @@
<mdElement elementClass='StringProperty'>
<propertyID>BROWSER_LAYOUT</propertyID>
<propertyDescriptionID>BROWSER_LAYOUT_DESCRIPTION</propertyDescriptionID>
- <value>0 13 0 0 0 0 0 0 0 0 0 0 5 70 0 0 3 da 0 0 0 0 0 0 0 9 0 0 0 d 0 44 0 4f 0 43 0 55 0 4d 0 45 0 4e 0 54 0 41 0 54 0 49 0 4f 0 4e 0 0 6e 53 0 0 0 8 0 0 0 1 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 3f 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 6e 53 0 0 0 2 0 0 0 0 0 0 0 0 0 0 5 68 0 0 3 55 0 0 0 8 0 0 0 0 0 0 3f a1 0 0 0 3 0 0 df d6 0 0 6e 53 0 0 b9 47 0 0 0 2 0 0 34 7a 0 0 3f a1 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 d 0 44 0 49 0 41 0 47 0 52 0 41 0 4d 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 dd 75 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 3f 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 dd 75 0 0 0 2 0 0 0 0 0 0 0 0 0 0 5 68 0 0 3 55 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 c 0 5a 0 4f 0 4f 0 4d 0 5f 0 43 0 4f 0 4e 0 54 0 52 0 4f 0 4c 0 0 df d6 0 0 0 8 0 0 0 1 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 3f 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 df d6 0 0 0 2 0 0 0 0 0 0 0 0 0 0 5 68 0 0 3 55 0 0 0 8 0 0 0 0 0 0 3f a1 0 0 0 3 0 0 df d6 0 0 6e 53 0 0 b9 47 0 0 0 2 0 0 34 7a 0 0 3f a1 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 f 0 45 0 58 0 54 0 45 0 4e 0 53 0 49 0 4f 0 4e 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 bf 59 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 3f 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 bf 59 0 0 0 2 0 0 0 0 0 0 0 0 0 0 5 68 0 0 3 55 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 49 0 4e 0 48 0 45 0 52 0 49 0 54 0 41 0 4e 0 43 0 45 0 5f 0 54 0 52 0 45 0 45 0 0 bd c3 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 3f 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 bd c3 0 0 0 2 0 0 0 0 0 0 0 0 0 0 5 68 0 0 3 55 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 0 53 0 45 0 41 0 52 0 43 0 48 0 5f 0 52 0 45 0 53 0 55 0 4c 0 54 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 eb 9a 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 3f 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 eb 9a 0 0 0 2 0 0 0 0 0 0 0 0 0 0 5 68 0 0 3 55 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 f 0 4d 0 45 0 53 0 53 0 41 0 47 0 45 0 53 0 5f 0 57 0 49 0 4e 0 44 0 4f 0 57 0 0 8c eb 0 0 0 2 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 8c eb 0 0 0 0 0 0 0 3c 0 0 0 3c 0 0 0 c8 0 0 0 c8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 a 0 50 0 52 0 4f 0 50 0 45 0 52 0 54 0 49 0 45 0 53 0 0 b9 47 0 0 0 8 0 0 0 1 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 3f 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 b9 47 0 0 0 2 0 0 0 0 0 0 0 0 0 0 5 68 0 0 3 55 0 0 0 8 0 0 0 0 0 0 3f a1 0 0 0 3 0 0 df d6 0 0 6e 53 0 0 b9 47 0 0 0 2 0 0 34 7a 0 0 3f a1 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 43 0 4f 0 4e 0 54 0 41 0 49 0 4e 0 4d 0 45 0 4e 0 54 0 5f 0 54 0 52 0 45 0 45 0 0 2e 63 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 3f 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 2e 63 0 0 0 2 0 0 0 0 0 0 0 0 0 0 5 68 0 0 3 55 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 63 0 0 0 0 0 0 1e 98 0 0 0 1 0 0 4 63 0 0 0 1 0 0 c1 f 0 0 0 2 0 0 4 63 0 0 0 0 0 0 34 7a 0 0 0 2 0 0 4 64 0 0 21 4f 0 0 0 5 0 0 4 65 0 0 0 10 0 43 0 4f 0 4e 0 54 0 41 0 49 0 4e 0 4d 0 45 0 4e 0 54 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 10 0 49 0 4e 0 48 0 45 0 52 0 49 0 54 0 41 0 4e 0 43 0 45 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 d 0 44 0 49 0 41 0 47 0 52 0 41 0 4d 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 f 0 45 0 58 0 54 0 45 0 4e 0 53 0 49 0 4f 0 4e 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 13 0 53 0 45 0 41 0 52 0 43 0 48 0 5f 0 52 0 45 0 53 0 55 0 4c 0 54 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 1 5c 0 0 1 26 0 0 0 0 0 0 4 64 0 0 3f a1 0 0 0 3 0 0 4 65 0 0 0 c 0 5a 0 4f 0 4f 0 4d 0 5f 0 43 0 4f 0 4e 0 54 0 52 0 4f 0 4c 0 0 4 65 0 0 0 d 0 44 0 4f 0 43 0 55 0 4d 0 45 0 4e 0 54 0 41 0 54 0 49 0 4f 0 4e 0 0 4 65 0 0 0 a 0 50 0 52 0 4f 0 50 0 45 0 52 0 54 0 49 0 45 0 53 0 0 1 5c 0 0 1 26 0 0 0 0 0 0 1 5c 0 0 2 50 0 0 4 66 0 0 0 1 0 0 0 19 0 0 0 0 0 0 1 61 0 0 2 50 0 0 1 61 0 0 2 50 0 0 0 3 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 f 0 4d 0 45 0 53 0 53 0 41 0 47 0 45 0 53 0 5f 0 57 0 49 0 4e 0 44 0 4f 0 57 </value>
+ <value>0 13 0 0 0 1 0 0 0 0 0 0 3 53 0 0 2 c4 0 0 0 0 0 0 0 9 0 0 0 d 0 44 0 4f 0 43 0 55 0 4d 0 45 0 4e 0 54 0 41 0 54 0 49 0 4f 0 4e 0 0 6e 53 0 0 0 8 0 0 0 1 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 6e 53 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 3f a1 0 0 0 3 0 0 df d6 0 0 6e 53 0 0 b9 47 0 0 0 2 0 0 34 7a 0 0 3f a1 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 d 0 44 0 49 0 41 0 47 0 52 0 41 0 4d 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 dd 75 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 dd 75 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 c 0 5a 0 4f 0 4f 0 4d 0 5f 0 43 0 4f 0 4e 0 54 0 52 0 4f 0 4c 0 0 df d6 0 0 0 8 0 0 0 1 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 df d6 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 3f a1 0 0 0 3 0 0 df d6 0 0 6e 53 0 0 b9 47 0 0 0 2 0 0 34 7a 0 0 3f a1 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 f 0 45 0 58 0 54 0 45 0 4e 0 53 0 49 0 4f 0 4e 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 bf 59 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 bf 59 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 49 0 4e 0 48 0 45 0 52 0 49 0 54 0 41 0 4e 0 43 0 45 0 5f 0 54 0 52 0 45 0 45 0 0 bd c3 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 bd c3 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 0 53 0 45 0 41 0 52 0 43 0 48 0 5f 0 52 0 45 0 53 0 55 0 4c 0 54 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 eb 9a 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 eb 9a 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 f 0 4d 0 45 0 53 0 53 0 41 0 47 0 45 0 53 0 5f 0 57 0 49 0 4e 0 44 0 4f 0 57 0 0 8c eb 0 0 0 2 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 8c eb 0 0 0 0 0 0 0 3c 0 0 0 3c 0 0 0 c8 0 0 0 c8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 a 0 50 0 52 0 4f 0 50 0 45 0 52 0 54 0 49 0 45 0 53 0 0 b9 47 0 0 0 8 0 0 0 1 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 b9 47 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 3f a1 0 0 0 3 0 0 df d6 0 0 6e 53 0 0 b9 47 0 0 0 2 0 0 34 7a 0 0 3f a1 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 43 0 4f 0 4e 0 54 0 41 0 49 0 4e 0 4d 0 45 0 4e 0 54 0 5f 0 54 0 52 0 45 0 45 0 0 2e 63 0 0 0 8 0 0 0 0 0 0 0 1 0 0 0 f 0 0 0 4 0 0 0 4 0 0 0 8 0 0 1 5c 0 0 1 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 4 0 0 2e 63 0 0 0 2 0 0 0 0 0 0 0 0 0 0 3 4b 0 0 2 3f 0 0 0 8 0 0 0 0 0 0 21 4f 0 0 0 5 0 0 2e 63 0 0 bd c3 0 0 dd 75 0 0 bf 59 0 0 eb 9a 0 0 0 2 0 0 34 7a 0 0 21 4f 0 0 0 0 0 0 0 2 0 0 21 4f 0 0 3f a1 0 0 c1 f 0 0 34 7a 0 0 0 1 0 0 0 2 0 0 34 7a ff ff ff ff 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 63 0 0 0 0 0 0 1e 98 0 0 0 1 0 0 4 63 0 0 0 1 0 0 c1 f 0 0 0 2 0 0 4 63 0 0 0 0 0 0 34 7a 0 0 0 2 0 0 4 64 0 0 21 4f 0 0 0 5 0 0 4 65 0 0 0 10 0 43 0 4f 0 4e 0 54 0 41 0 49 0 4e 0 4d 0 45 0 4e 0 54 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 10 0 49 0 4e 0 48 0 45 0 52 0 49 0 54 0 41 0 4e 0 43 0 45 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 d 0 44 0 49 0 41 0 47 0 52 0 41 0 4d 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 f 0 45 0 58 0 54 0 45 0 4e 0 53 0 49 0 4f 0 4e 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 4 65 0 0 0 13 0 53 0 45 0 41 0 52 0 43 0 48 0 5f 0 52 0 45 0 53 0 55 0 4c 0 54 0 53 0 5f 0 54 0 52 0 45 0 45 0 0 1 5c 0 0 1 26 0 0 0 0 0 0 4 64 0 0 3f a1 0 0 0 3 0 0 4 65 0 0 0 c 0 5a 0 4f 0 4f 0 4d 0 5f 0 43 0 4f 0 4e 0 54 0 52 0 4f 0 4c 0 0 4 65 0 0 0 d 0 44 0 4f 0 43 0 55 0 4d 0 45 0 4e 0 54 0 41 0 54 0 49 0 4f 0 4e 0 0 4 65 0 0 0 a 0 50 0 52 0 4f 0 50 0 45 0 52 0 54 0 49 0 45 0 53 0 0 1 5c 0 0 1 26 0 0 0 0 0 0 1 5c 0 0 2 50 0 0 4 66 0 0 0 1 0 0 0 19 0 0 0 0 0 0 1 61 0 0 2 50 0 0 1 61 0 0 2 50 0 0 0 3 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 f 0 4d 0 45 0 53 0 53 0 41 0 47 0 45 0 53 0 5f 0 57 0 49 0 4e 0 44 0 4f 0 57 </value>
<multiline xmi.value='false'/>
</mdElement>
<mdElement elementClass='StringProperty'>
@@ -2924,7 +2938,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 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>
+ <value>7e 33 f 41 26 59 43 7d 63 41 2d 24 ed 33 2e ce 24 3a 89 e3 50 92 e7 1e f4 2c 46 9a 69 7e 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'>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Database/build-db.bat
Index: build-db.bat
===================================================================
osql -S localhost -E -d TimeTrackerDotNet -i test-data-delete.sql
osql -S localhost -E -d TimeTrackerDotNet -i static-data-delete.sql
osql -S localhost -E -d TimeTrackerDotNet -i static-data-insert.sql
osql -S localhost -E -d TimeTrackerDotNet -i test-data-insert.sql
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Database/static-data-delete.sql
Index: static-data-delete.sql
===================================================================
delete from USER_ROLE;
delete from USERS;
delete from TASK;
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Database/static-data-insert.sql
Index: static-data-insert.sql
===================================================================
SET IDENTITY_INSERT USERS ON
insert into USERS (ID, USERNAME, PASSWORD, FIRST_NAME, LAST_NAME, EMAIL, IS_ACTIVE, CREATION_DATE, COMMENT) values (1, 'nbhatia', 'BiLpFCmanGIhhw6CEmEkz1vAdYs=', 'Naresh', 'Bhatia', 'nb...@no...', 1, '2006/01/01 09:00', null);
insert into USERS (ID, USERNAME, PASSWORD, FIRST_NAME, LAST_NAME, EMAIL, IS_ACTIVE, CREATION_DATE, COMMENT) values (2, 'lcoude', 'BiLpFCmanGIhhw6CEmEkz1vAdYs=', 'Louis', 'Coude', 'lc...@no...', 1, '2006/01/01 09:00', null);
insert into USERS (ID, USERNAME, PASSWORD, FIRST_NAME, LAST_NAME, EMAIL, IS_ACTIVE, CREATION_DATE, COMMENT) values (3, 'ecrutchfield', 'BiLpFCmanGIhhw6CEmEkz1vAdYs=', 'Eric', 'Crutchfield', 'ecr...@no...', 1, '2006/01/01 09:00', null);
insert into USERS (ID, USERNAME, PASSWORD, FIRST_NAME, LAST_NAME, EMAIL, IS_ACTIVE, CREATION_DATE, COMMENT) values (4, 'cmicali', 'BiLpFCmanGIhhw6CEmEkz1vAdYs=', 'Chris', 'Micali', 'cm...@no...', 1, '2006/01/01 09:00', null);
SET IDENTITY_INSERT USERS OFF
SET IDENTITY_INSERT USER_ROLE ON
insert into USER_ROLE (ID, ROLE, USER_FK) values (1, 1, 1);
insert into USER_ROLE (ID, ROLE, USER_FK) values (2, 2, 1);
insert into USER_ROLE (ID, ROLE, USER_FK) values (3, 1, 2);
insert into USER_ROLE (ID, ROLE, USER_FK) values (4, 1, 3);
insert into USER_ROLE (ID, ROLE, USER_FK) values (5, 1, 4);
SET IDENTITY_INSERT USER_ROLE OFF
SET IDENTITY_INSERT TASK ON
insert into TASK (ID, NAME) values (1, 'Research');
insert into TASK (ID, NAME) values (2, 'Development');
insert into TASK (ID, NAME) values (3, 'Testing');
insert into TASK (ID, NAME) values (4, 'Admin');
insert into TASK (ID, NAME) values (5, 'Meeting');
SET IDENTITY_INSERT TASK OFF
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Database/test-data-delete.sql
Index: test-data-delete.sql
===================================================================
delete from TIME_ALLOCATION;
delete from TIMECARD;
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Database/test-data-insert.sql
Index: test-data-insert.sql
===================================================================
SET IDENTITY_INSERT TIMECARD ON
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 1, 2, '2006/05/15', 'Timecard 01', 1, 2);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 2, 2, '2006/05/15', 'Timecard 02', 2, 3);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 3, 2, '2006/05/15', 'Timecard 03', 3, 4);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 4, 2, '2006/05/15', 'Timecard 04', 4, 1);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 5, 3, '2006/05/22', 'Timecard 05', 1, 2);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 6, 3, '2006/05/22', 'Timecard 06', 2, 3);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 7, 3, '2006/05/22', 'Timecard 07', 3, 4);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 8, 3, '2006/05/22', 'Timecard 08', 4, 1);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 9, 1, '2006/05/29', 'Timecard 09', 1, 2);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (10, 1, '2006/05/29', 'Timecard 10', 2, 3);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (11, 1, '2006/05/29', 'Timecard 11', 3, 4);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (12, 1, '2006/05/29', 'Timecard 12', 4, 1);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (13, 0, '2006/06/05', 'Timecard 13', null, 2);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (14, 0, '2006/06/05', 'Timecard 14', null, 3);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (15, 0, '2006/06/05', 'Timecard 15', null, 4);
insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (16, 0, '2006/06/05', 'Timecard 16', null, 1);
SET IDENTITY_INSERT TIMECARD OFF
SET IDENTITY_INSERT TIME_ALLOCATION ON
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values ( 1, '2006/05/15 09:00', '2006/05/15 05:00', 1, 1);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values ( 2, '2006/05/16 09:00', '2006/05/16 05:00', 1, 1);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values ( 3, '2006/05/15 09:00', '2006/05/15 05:00', 2, 2);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values ( 4, '2006/05/16 09:00', '2006/05/16 05:00', 2, 2);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values ( 5, '2006/05/15 09:00', '2006/05/15 05:00', 3, 3);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values ( 6, '2006/05/16 09:00', '2006/05/16 05:00', 3, 3);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values ( 7, '2006/05/15 09:00', '2006/05/15 05:00', 4, 4);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values ( 8, '2006/05/16 09:00', '2006/05/16 05:00', 4, 4);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (11, '2006/05/22 09:00', '2006/05/22 05:00', 5, 5);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (12, '2006/05/23 09:00', '2006/05/23 05:00', 5, 5);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (13, '2006/05/22 09:00', '2006/05/22 05:00', 1, 6);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (14, '2006/05/23 09:00', '2006/05/23 05:00', 1, 6);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (15, '2006/05/22 09:00', '2006/05/22 05:00', 2, 7);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (16, '2006/05/23 09:00', '2006/05/23 05:00', 2, 7);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (17, '2006/05/22 09:00', '2006/05/22 05:00', 3, 8);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (18, '2006/05/23 09:00', '2006/05/23 05:00', 3, 8);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (21, '2006/05/29 09:00', '2006/05/29 05:00', 4, 9);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (22, '2006/05/30 09:00', '2006/05/30 05:00', 4, 9);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (23, '2006/05/29 09:00', '2006/05/29 05:00', 5, 10);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (24, '2006/05/30 09:00', '2006/05/30 05:00', 5, 10);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (25, '2006/05/29 09:00', '2006/05/29 05:00', 1, 11);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (26, '2006/05/30 09:00', '2006/05/30 05:00', 1, 11);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (27, '2006/05/29 09:00', '2006/05/29 05:00', 2, 12);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (28, '2006/05/30 09:00', '2006/05/30 05:00', 2, 12);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (29, '2006/06/05 09:00', '2006/06/05 05:00', 3, 13);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (30, '2006/06/06 09:00', '2006/06/06 05:00', 3, 13);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (31, '2006/06/05 09:00', '2006/06/05 05:00', 4, 14);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (32, '2006/06/06 09:00', '2006/06/06 05:00', 4, 14);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (33, '2006/06/05 09:00', '2006/06/05 05:00', 5, 15);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (34, '2006/06/06 09:00', '2006/06/06 05:00', 5, 15);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (35, '2006/06/05 09:00', '2006/06/05 05:00', 1, 16);
insert into TIME_ALLOCATION (ID, TIME_PERIOD_START_TIME, TIME_PERIOD_END_TIME, TASK_FK, TIMECARD_FK) values (36, '2006/06/06 09:00', '2006/06/06 05:00', 1, 16);
SET IDENTITY_INSERT TIME_ALLOCATION OFF
|
|
From: Chris M. <cm...@us...> - 2006-08-29 02:44:13
|
User: cmicali
Date: 06/08/28 19:44:12
Modified: distribution pom.xml
distribution/src/antrun copy-m2-m1.xml
Log:
- Updated distribution model to work with andromda-plugins
Revision Changes Path
1.2 +0 -99 plugins/distribution/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/distribution/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- pom.xml 23 Aug 2006 21:39:44 -0000 1.1
+++ pom.xml 29 Aug 2006 02:44:12 -0000 1.2
@@ -13,104 +13,11 @@
<description>Provides the assembly of the AndroMDA Plugin distribution</description>
<dependencies>
<!-- Add dependencies here to ensure they're built before the distribution itself -->
- <dependency>
- </dependency>
</dependencies>
<build>
<plugins>
- <!--plugin>
- <groupId>org.andromda.maven.plugins</groupId>
- <artifactId>andromda-distribution-plugin</artifactId>
- <version>${pom.version}</version>
- <executions>
- <execution>
- <id>binary</id>
- <goals>
- <goal>assemble</goal>
- </goals>
- <configuration>
- <name>andromda-bin-${pom.version}</name>
- <artifactDirectory>andromda</artifactDirectory>
- <dependencyDirectory>lib</dependencyDirectory>
- <projectIncludes>
- <include>**/pom.xml</include>
- </projectIncludes>
- <projectExcludes>
- <exclude>distribution/**</exclude>
- </projectExcludes>
- <artifactExcludes>
- <artifact>
- <groupId>org\.andromda\.samples.*</groupId>
- </artifact>
- <artifact>
- <groupId>org\.andromda\.bootstrap.*</groupId>
- </artifact>
- </artifactExcludes>
- <locations>
- <location>
- <path>${pom.basedir}/../samples</path>
- <excludes>
- <exlude>conf/**</exlude>
- <exclude>**/target/**</exclude>
- <exclude>**/CVS/**</exclude>
- <exclude>**/.cvsignore</exclude>
- <exclude>*</exclude>
- <exclude>**/*.log</exclude>
- </excludes>
- <outputPath>samples/</outputPath>
- </location>
- <location>
- <path>${pom.basedir}/../maven/2/andromdapp/target/plugin-install</path>
- <includes>
- <include>**/*.xml</include>
- </includes>
- <outputPath>andromda/</outputPath>
- </location>
- <location>
- <path>${pom.basedir}/../ant/andromda/src/ant/build.xml.vsl</path>
- <outputPath>andromda/org/andromda/ant/build.xml</outputPath>
- </location>
- </locations>
- </configuration>
- </execution>
- <execution>
- <id>source</id>
- <goals>
- <goal>assemble</goal>
- </goals>
- <configuration>
- <name>andromda-src-${pom.version}</name>
- <locations>
- <location>
- <path>${pom.basedir}/../</path>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>**/CVS/**</exclude>
- <exclude>**/.cvsignore</exclude>
- <exclude>**/*.log</exclude>
- </excludes>
- </location>
- </locations>
- </configuration>
- </execution>
- </executions>
- </plugin-->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <!-- set property, do something like this in ~/.m2/settings.xml
- <profiles>
- <profile>
- <id>andromda</id>
- <properties>
- <maven1Repository>/var/maven/repository</maven1Repository>
- <websiteDir>/var/www/andromda</websiteDir>
- </properties>
- </profile>
- </profiles>
- <activeProfiles>
- <activeProfile>andromda</activeProfile>
- </activeProfiles>
- -->
<executions>
<execution>
<phase>install</phase>
@@ -122,12 +29,6 @@
<property name="maven1.repository" value="${maven1Repository}"/>
<property name="maven2.repository" value="${settings.localRepository}"/>
</ant>
- <ant dir="src/antrun" antfile="copy-2-website.xml">
- <property name="website.dir" value="${websiteDir}"/>
- <property name="maven1.repository" value="${maven1Repository}"/>
- <property name="maven2.repository" value="${settings.localRepository}"/>
- <property name="distribution.output.directory" value="${project.build.directory}"/>
- </ant>
<echo message="Copy and install of m2 to m1 artifacts done."/>
</tasks>
</configuration>
1.2 +0 -10 plugins/distribution/src/antrun/copy-m2-m1.xml
Index: copy-m2-m1.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/distribution/src/antrun/copy-m2-m1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- copy-m2-m1.xml 23 Aug 2006 21:39:44 -0000 1.1
+++ copy-m2-m1.xml 29 Aug 2006 02:44:12 -0000 1.2
@@ -27,20 +27,10 @@
from ${maven2.repository}/org/andromda
to ${maven1.repository}/andromda
</echo>
- <copy todir="${maven1.repository}/andromda/uml2" flatten="true" preservelastmodified="true">
- <fileset dir="${maven2.repository}/org/andromda">
- <include name="**/*.uml2"/>
- </fileset>
- </copy>
<copy todir="${maven1.repository}/andromda/jars" flatten="true" preservelastmodified="true">
<fileset dir="${maven2.repository}/org/andromda">
<include name="**/*.jar"/>
</fileset>
</copy>
- <copy todir="${maven1.repository}/andromda/xml.zips" flatten="true" preservelastmodified="true">
- <fileset dir="${maven2.repository}/org/andromda/profiles/uml14">
- <include name="**/*.xml.zip"/>
- </fileset>
- </copy>
</target>
</project>
\ No newline at end of file
|
|
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'>
|
|
From: Chris M. <cm...@us...> - 2006-08-28 04:22:27
|
User: cmicali
Date: 06/08/27 21:22:25
Added: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Database
TestData.sql
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Lib
AndroMDA.NHibernateSupport.dll
Bamboo.Prevalence.dll Castle.DynamicProxy.dll
HashCodeProvider.dll Iesi.Collections.dll
NHibernate.Caches.Prevalence.dll
NHibernate.Caches.SysCache.dll
NHibernate.Nullables2.dll NHibernate.dll
log4net.dll
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Common
Northwind.TimeTracker.Common.csproj
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Common/Properties
AssemblyInfo.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core
Northwind.TimeTracker.Core.csproj
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/Properties
AssemblyInfo.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain
TaskDaoImpl.cs TimeAllocationDaoImpl.cs
TimePeriodImpl.cs TimecardDaoImpl.cs
TimecardImpl.cs UserDaoImpl.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Service
MembershipServiceImpl.cs TimeTrackingServiceImpl.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.SchemaExport
App.config
Northwind.TimeTracker.SchemaExport.csproj
SchemaExport.cs TestDataManager.cs
nhibernate.config
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.SchemaExport/Properties
AssemblyInfo.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Tests
App.config Northwind.TimeTracker.Tests.csproj
nhibernate.config
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Tests/Properties
AssemblyInfo.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web.Common/Membership
DomainMembershipProvider.cs DomainMembershipUser.cs
DomainRoleProvider.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web.Common
Northwind.TimeTracker.Web.Common.csproj
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web.Common/Properties
AssemblyInfo.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.WebServices/App_Code
TimeTrackingService.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.WebServices
TimeTrackingService.asmx Web.config
nhibernate.config
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_Code
DataSourceUtils.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_WebReferences/TimeTrackingService
TimeTrackingService.disco
TimeTrackingService.discomap
TimeTrackingService.wsdl
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web
ApproveTimecards.aspx ApproveTimecards.aspx.cs
Default.aspx Default.aspx.cs EditTimecard.aspx
EditTimecard.aspx.cs Home.aspx Home.aspx.cs
NewTimecardSetup.aspx NewTimecardSetup.aspx.cs
SearchTimecards.aspx SearchTimecards.aspx.cs
Web.config nhibernate.config
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Bin
AndroMDA.NHibernateSupport.dll.refresh
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Layout
Default.master Default.master.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Public
Login.aspx Login.aspx.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Style
global.css
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker
Northwind.TimeTracker.sln pom.xml
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/mda/conf
andromda.xml
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/mda/conf/mappings
MergeMappings.xml
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/mda
pom.xml
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/mda/src/uml
Northwind.TimeTracker.Model.xmi
Log:
- Initial import
Revision Changes Path
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Database/TestData.sql
Index: TestData.sql
===================================================================
USE TimeTrackerDotNet
DELETE FROM USER_ROLE
DELETE FROM TIMETRACKER_USER
SET IDENTITY_INSERT TIMETRACKER_USER ON
-- Insert admin user
INSERT INTO TIMETRACKER_USER
([ID]
,[UserName]
,[FirstName]
,[LastName]
,[Password]
,[Email]
,[IsActive]
,[Comment]
,[CreationDate])
VALUES
(1
,'admin'
,'System'
,'Administrator'
,'XxB9/1M8E4Wo+Cm6mTM7Bl9bLfQ=' -- This is 'admin' encrypted
,'ad...@sa...'
,1
,''
,getdate())
SET IDENTITY_INSERT TIMETRACKER_USER OFF
SET IDENTITY_INSERT USER_ROLE ON
INSERT INTO USER_ROLE
([ID]
,[Role]
,[USER_FK])
VALUES
(1
,1
,1)
SET IDENTITY_INSERT USER_ROLE OFF
GO
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Lib/AndroMDA.NHibernateSupport.dll
<<Binary file>>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Lib/Bamboo.Prevalence.dll
<<Binary file>>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Lib/Castle.DynamicProxy.dll
<<Binary file>>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Lib/HashCodeProvider.dll
<<Binary file>>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Lib/Iesi.Collections.dll
<<Binary file>>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Lib/NHibernate.Caches.Prevalence.dll
<<Binary file>>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Lib/NHibernate.Caches.SysCache.dll
<<Binary file>>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Lib/NHibernate.Nullables2.dll
<<Binary file>>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Lib/NHibernate.dll
<<Binary file>>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Lib/log4net.dll
<<Binary file>>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Common/Northwind.TimeTracker.Common.csproj
Index: Northwind.TimeTracker.Common.csproj
===================================================================
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{8A8C09CD-2D6B-4C95-BB13-BF02E0D82442}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Northwind.TimeTracker.Common</RootNamespace>
<AssemblyName>Northwind.TimeTracker.Common</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AndroMDA.NHibernateSupport, Version=1.0.5.0, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\AndroMDA.NHibernateSupport.dll</HintPath>
</Reference>
<Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\Castle.DynamicProxy.dll</HintPath>
</Reference>
<Reference Include="HashCodeProvider, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7195e0c6089ba840">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\HashCodeProvider.dll</HintPath>
</Reference>
<Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.9.0, Culture=neutral, PublicKeyToken=b32731d11ce58905">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\log4net.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=1.0.2.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\NHibernate.dll</HintPath>
</Reference>
<Reference Include="NHibernate.Caches.SysCache, Version=1.0.2.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\NHibernate.Caches.SysCache.dll</HintPath>
</Reference>
<Reference Include="NHibernate.Nullables2, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\NHibernate.Nullables2.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="target\Northwind\TimeTracker\Domain\Role.cs" />
<Compile Include="target\Northwind\TimeTracker\Domain\TimecardStatus.cs" />
<Compile Include="target\Northwind\TimeTracker\VO\TaskVO.cs" />
<Compile Include="target\Northwind\TimeTracker\VO\TimeAllocationVO.cs" />
<Compile Include="target\Northwind\TimeTracker\VO\TimecardSearchCriteriaVO.cs" />
<Compile Include="target\Northwind\TimeTracker\VO\TimecardSummaryVO.cs" />
<Compile Include="target\Northwind\TimeTracker\VO\TimecardVO.cs" />
<Compile Include="target\Northwind\TimeTracker\VO\TimePeriodVO.cs" />
<Compile Include="target\Northwind\TimeTracker\VO\UserVO.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="src\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Common/Properties/AssemblyInfo.cs
Index: AssemblyInfo.cs
===================================================================
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Northwind.TimeTracker.Common")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Sapient n800c XP Image v1.0")]
[assembly: AssemblyProduct("Northwind.TimeTracker.Common")]
[assembly: AssemblyCopyright("Copyright © Sapient n800c XP Image v1.0 2006")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("835997eb-95f1-41bc-83cb-b667c2c265fa")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/Northwind.TimeTracker.Core.csproj
Index: Northwind.TimeTracker.Core.csproj
===================================================================
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D324A20C-2ECE-4698-9572-FC69DB4BBF13}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Northwind.TimeTracker.Core</RootNamespace>
<AssemblyName>Northwind.TimeTracker.Core</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AndroMDA.NHibernateSupport, Version=1.0.5.0, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\AndroMDA.NHibernateSupport.dll</HintPath>
</Reference>
<Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\Castle.DynamicProxy.dll</HintPath>
</Reference>
<Reference Include="HashCodeProvider, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7195e0c6089ba840">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\HashCodeProvider.dll</HintPath>
</Reference>
<Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.9.0, Culture=neutral, PublicKeyToken=b32731d11ce58905">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\log4net.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=1.0.2.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\NHibernate.dll</HintPath>
</Reference>
<Reference Include="NHibernate.Caches.SysCache, Version=1.0.2.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\NHibernate.Caches.SysCache.dll</HintPath>
</Reference>
<Reference Include="NHibernate.Nullables2, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\NHibernate.Nullables2.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="src\Northwind\TimeTracker\Domain\TaskDaoImpl.cs" />
<Compile Include="src\Northwind\TimeTracker\Domain\TimeAllocationDaoImpl.cs" />
<Compile Include="src\Northwind\TimeTracker\Domain\TimecardDaoImpl.cs" />
<Compile Include="src\Northwind\TimeTracker\Domain\TimecardImpl.cs" />
<Compile Include="src\Northwind\TimeTracker\Domain\TimePeriodImpl.cs" />
<Compile Include="src\Northwind\TimeTracker\Domain\UserDaoImpl.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="src\Northwind\TimeTracker\Service\MembershipServiceImpl.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="src\Northwind\TimeTracker\Service\TimeTrackingServiceImpl.cs" />
<Compile Include="target\Northwind\TimeTracker\Domain\DaoFactory.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\ITaskDao.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\ITimeAllocationDao.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\ITimecardDao.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\IUserDao.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\IUserRoleDao.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\Task.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\TaskDaoBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\TaskImpl.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\TimeAllocation.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\TimeAllocationDaoBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\TimeAllocationImpl.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\Timecard.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\TimecardDaoBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\TimePeriod.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\User.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\UserDaoBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\UserImpl.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\UserRole.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\UserRoleDaoBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\UserRoleDaoImpl.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Domain\UserRoleImpl.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Service\IMembershipService.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Service\ITimeTrackingService.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Service\MembershipServiceBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="target\Northwind\TimeTracker\Service\TimeTrackingServiceBase.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Northwind.TimeTracker.Common\Northwind.TimeTracker.Common.csproj">
<Project>{8A8C09CD-2D6B-4C95-BB13-BF02E0D82442}</Project>
<Name>Northwind.TimeTracker.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="target\Northwind\TimeTracker\Domain\Task.hbm.xml" />
<EmbeddedResource Include="target\Northwind\TimeTracker\Domain\TimeAllocation.hbm.xml" />
<EmbeddedResource Include="target\Northwind\TimeTracker\Domain\Timecard.hbm.xml" />
<EmbeddedResource Include="target\Northwind\TimeTracker\Domain\User.hbm.xml" />
<EmbeddedResource Include="target\Northwind\TimeTracker\Domain\UserRole.hbm.xml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/Properties/AssemblyInfo.cs
Index: AssemblyInfo.cs
===================================================================
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Northwind.TimeTracker.Core")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Sapient n800c XP Image v1.0")]
[assembly: AssemblyProduct("Northwind.TimeTracker.Core")]
[assembly: AssemblyCopyright("Copyright © Sapient n800c XP Image v1.0 2006")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("3b50f310-0d8d-4ec3-a93b-ca440f61609b")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TaskDaoImpl.cs
Index: TaskDaoImpl.cs
===================================================================
// Name: TaskDaoImpl.cs
//
// License text for C# files - Change in mda/conf/mappings/MergeMappings.xml
//
//
// This is only generated once! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
namespace Northwind.TimeTracker.Domain
{
/// <summary>
/// <see cref="Northwind.TimeTracker.Domain.Task"/>
/// </summary>
public class TaskDaoImpl : Northwind.TimeTracker.Domain.TaskDaoBase
{
/// <summary>
/// @see Northwind.TimeTracker.Domain.ITaskDao#ToTaskVO(Northwind.TimeTracker.Domain.Task)
/// </summary>
public override Northwind.TimeTracker.VO.TaskVO ToTaskVO(Northwind.TimeTracker.Domain.Task entity)
{
// put your implementation here
return null;
}
/// <summary>
/// @see Northwind.TimeTracker.Domain.ITaskDao#TaskVOToEntity(Northwind.TimeTracker.VO.TaskVO)
/// </summary>
public override Northwind.TimeTracker.Domain.Task TaskVOToEntity(Northwind.TimeTracker.VO.TaskVO taskVO)
{
// put your implementation here
return null;
}
}
}
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimeAllocationDaoImpl.cs
Index: TimeAllocationDaoImpl.cs
===================================================================
// Name: TimeAllocationDaoImpl.cs
//
// License text for C# files - Change in mda/conf/mappings/MergeMappings.xml
//
//
// This is only generated once! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
namespace Northwind.TimeTracker.Domain
{
/// <summary>
/// <see cref="Northwind.TimeTracker.Domain.TimeAllocation"/>
/// </summary>
public class TimeAllocationDaoImpl : Northwind.TimeTracker.Domain.TimeAllocationDaoBase
{
/// <summary>
/// @see Northwind.TimeTracker.Domain.ITimeAllocationDao#ToTimeAllocationVO(Northwind.TimeTracker.Domain.TimeAllocation)
/// </summary>
public override Northwind.TimeTracker.VO.TimeAllocationVO ToTimeAllocationVO(Northwind.TimeTracker.Domain.TimeAllocation entity)
{
// put your implementation here
return null;
}
/// <summary>
/// @see Northwind.TimeTracker.Domain.ITimeAllocationDao#TimeAllocationVOToEntity(Northwind.TimeTracker.VO.TimeAllocationVO)
/// </summary>
public override Northwind.TimeTracker.Domain.TimeAllocation TimeAllocationVOToEntity(Northwind.TimeTracker.VO.TimeAllocationVO timeAllocationVO)
{
// put your implementation here
return null;
}
}
}
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimePeriodImpl.cs
Index: TimePeriodImpl.cs
===================================================================
// Name: TimePeriodImpl.cs
//
// License text for C# files - Change in mda/conf/mappings/MergeMappings.xml
//
//
// This is only generated once! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
namespace Northwind.TimeTracker.Domain
{
/// <summary>
/// <see cref="Northwind.TimeTracker.Domain.TimePeriod"/>
/// </summary>
[Serializable]
public class TimePeriodImpl
: Northwind.TimeTracker.Domain.TimePeriod
{
}
}
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardDaoImpl.cs
Index: TimecardDaoImpl.cs
===================================================================
// Name: TimecardDaoImpl.cs
//
// License text for C# files - Change in mda/conf/mappings/MergeMappings.xml
//
//
// This is only generated once! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
using NHibernate;
using NHibernate.Expression;
namespace Northwind.TimeTracker.Domain
{
/// <summary>
/// <see cref="Northwind.TimeTracker.Domain.Timecard"/>
/// </summary>
public class TimecardDaoImpl : Northwind.TimeTracker.Domain.TimecardDaoBase
{
/// <summary>
/// @see Northwind.TimeTracker.Domain.ITimecardDao#findByCriteria(Northwind.TimeTracker.VO.TimecardSearchCriteriaVO)
/// </summary>
protected override System.Collections.IList HandleFindByCriteria(Northwind.TimeTracker.VO.TimecardSearchCriteriaVO criteria)
{
ICriteria timecardCriteria = this.Session
.CreateCriteria(typeof(TimecardImpl))
.SetFetchMode("Sumbitter", FetchMode.Join)
.SetFetchMode("Approver", FetchMode.Join);
if (criteria.SubmitterId.HasValue)
{
timecardCriteria.CreateCriteria("Submitter").Add(Expression.Eq("Id", criteria.SubmitterId.Value));
}
if (criteria.ApproverId.HasValue)
{
timecardCriteria.CreateCriteria("Approver").Add(Expression.Eq("Id", criteria.SubmitterId.Value));
}
if (criteria.Status != null && criteria.Status.Length > 0)
{
timecardCriteria.Add(Expression.In("Status", criteria.Status));
}
if (criteria.StartDateMin.HasValue)
{
timecardCriteria.Add(Expression.Ge("StartDate", criteria.StartDateMin.Value));
}
if (criteria.StartDateMax.HasValue)
{
timecardCriteria.Add(Expression.Le("StartDate", criteria.StartDateMax.Value));
}
return timecardCriteria.List();
}
public void CopyTimecardToTimecardSummaryVO(Northwind.TimeTracker.VO.TimecardSummaryVO valueObject, Northwind.TimeTracker.Domain.Timecard entity)
{
valueObject.Comments = entity.Comments;
valueObject.Id = entity.Id;
valueObject.StartDate = entity.StartDate;
valueObject.Status = entity.Status;
valueObject.ApproverName = entity.Approver.FirstName + " " + entity.Approver.LastName;
valueObject.SubmitterName = entity.Submitter.FirstName + " " + entity.Submitter.LastName;
}
/// <summary>
/// @see Northwind.TimeTracker.Domain.ITimecardDao#ToTimecardVO(Northwind.TimeTracker.Domain.Timecard)
/// </summary>
public override Northwind.TimeTracker.VO.TimecardVO ToTimecardVO(Northwind.TimeTracker.Domain.Timecard entity)
{
// Entity to VO conversion
Northwind.TimeTracker.VO.TimecardVO valueObject = new Northwind.TimeTracker.VO.TimecardVO();
CopyTimecardToTimecardSummaryVO(valueObject, entity);
// valueObject.Allocations
return valueObject;
}
/// <summary>
/// @see Northwind.TimeTracker.Domain.ITimecardDao#TimecardVOToEntity(Northwind.TimeTracker.VO.TimecardVO)
/// </summary>
public override Northwind.TimeTracker.Domain.Timecard TimecardVOToEntity(Northwind.TimeTracker.VO.TimecardVO timecardVO)
{
// VO to entity conversion
Northwind.TimeTracker.Domain.Timecard entity = Northwind.TimeTracker.Domain.Timecard.Factory.newInstance();
entity.Comments = timecardVO.Comments;
entity.Id = timecardVO.Id;
entity.StartDate = timecardVO.StartDate;
entity.Status = timecardVO.Status;
// entity.Allocations
// entity.Approver
// entity.Submitter
return entity;
}
/// <summary>
/// @see Northwind.TimeTracker.Domain.ITimecardDao#ToTimecardSummaryVO(Northwind.TimeTracker.Domain.Timecard)
/// </summary>
public override Northwind.TimeTracker.VO.TimecardSummaryVO ToTimecardSummaryVO(Northwind.TimeTracker.Domain.Timecard entity)
{
// Entity to VO conversion
Northwind.TimeTracker.VO.TimecardSummaryVO valueObject = new Northwind.TimeTracker.VO.TimecardSummaryVO();
CopyTimecardToTimecardSummaryVO(valueObject, entity);
return valueObject;
}
/// <summary>
/// @see Northwind.TimeTracker.Domain.ITimecardDao#TimecardSummaryVOToEntity(Northwind.TimeTracker.VO.TimecardSummaryVO)
/// </summary>
public override Northwind.TimeTracker.Domain.Timecard TimecardSummaryVOToEntity(Northwind.TimeTracker.VO.TimecardSummaryVO timecardSummaryVO)
{
// VO to entity conversion
Northwind.TimeTracker.Domain.Timecard entity = Northwind.TimeTracker.Domain.Timecard.Factory.newInstance();
entity.Comments = timecardSummaryVO.Comments;
entity.Id = timecardSummaryVO.Id;
entity.StartDate = timecardSummaryVO.StartDate;
entity.Status = timecardSummaryVO.Status;
// entity.Allocations
// entity.Approver
// entity.Submitter
return entity;
}
}
}
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardImpl.cs
Index: TimecardImpl.cs
===================================================================
// Name: TimecardImpl.cs
//
// License text for C# files - Change in mda/conf/mappings/MergeMappings.xml
//
//
// This is only generated once! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
namespace Northwind.TimeTracker.Domain
{
/// <summary>
/// <see cref="Northwind.TimeTracker.Domain.Timecard"/>
/// </summary>
[Serializable]
public class TimecardImpl
: Northwind.TimeTracker.Domain.Timecard
{
/// <summary>
/// <see cref="Northwind.TimeTracker.Domain.Timecard#addTimeAllocation(Northwind.TimeTracker.Domain.TimeAllocation)"/>
/// </summary>
public override void AddTimeAllocation(Northwind.TimeTracker.Domain.TimeAllocation timeAllocation)
{
//${toDoTag} implement public void addTimeAllocation(Northwind.TimeTracker.Domain.TimeAllocation timeAllocation)
throw new NotImplementedException("Northwind.TimeTracker.Domain.Timecard.addTimeAllocation(Northwind.TimeTracker.Domain.TimeAllocation timeAllocation) Not implemented!");
}
}
}
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/UserDaoImpl.cs
Index: UserDaoImpl.cs
===================================================================
// Name: UserDaoImpl.cs
// license-header cs merge-point
//
// This is only generated once! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
using Iesi.Collections;
using Northwind.TimeTracker.VO;
namespace Northwind.TimeTracker.Domain
{
/// <summary>
/// @see MembershipExample.Domain.User
/// </summary>
public class UserDaoImpl : UserDaoBase
{
/// <summary>
/// @see MembershipExample.Domain.IUserDao#ToUserVO(MembershipExample.Domain.User)
/// </summary>
public override UserVO ToUserVO(User entity)
{
if (entity == null) { return null; }
string[] roles = new string[entity.Roles.Count];
int i = 0;
foreach (UserRole role in entity.Roles)
{
roles[i++] = role.Role.ToString();
}
UserVO userVO = new UserVO(entity.Id,
entity.UserName,
entity.Email,
entity.IsActive,
entity.Comment,
entity.CreationDate,
roles);
return userVO;
}
/// <summary>
/// @see MembershipExample.Domain.IUserDao#UserVOToEntity(MembershipExample.VO.UserVO)
/// </summary>
public override User UserVOToEntity(UserVO userVO)
{
if (userVO == null) { return null; }
// VO to entity conversion
User entity = User.Factory.newInstance();
entity.Id = userVO.Id;
entity.UserName = userVO.UserName;
entity.Email = userVO.Email;
entity.IsActive = userVO.IsActive;
entity.Comment = userVO.Comment;
entity.CreationDate = userVO.CreationDate;
return entity;
}
}
}
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Service/MembershipServiceImpl.cs
Index: MembershipServiceImpl.cs
===================================================================
// Name: MembershipServiceImpl.cs
// license-header cs merge-point
//
// This is only generated once! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
using System.Collections;
using NHibernate;
using AndroMDA.NHibernateSupport;
using Northwind.TimeTracker.VO;
using Northwind.TimeTracker.Domain;
namespace Northwind.TimeTracker.Service
{
/// <summary>
/// @see MembershipExample.Service.MembershipService
/// </summary>
public class MembershipServiceImpl : MembershipServiceBase
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(MembershipServiceImpl));
/// <summary>
/// @see MembershipExample.Service.MembershipService#CreateUser(User)
/// </summary>
protected override void HandleCreateUser(UserVO userVo, string password)
{
User entity = this.UserDao.UserVOToEntity(userVo);
entity.Password = password;
this.UserDao.Create(entity);
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#GetUserNameByEmail(string email)
/// </summary>
protected override string HandleGetUserNameByEmail(string email)
{
ISession session = SessionManagerFactory.SessionManager.Session;
IQuery query = session.CreateQuery("SELECT user.UserName FROM UserImpl user WHERE user.Email = :email");
query.SetParameter("email", email);
return (string)query.UniqueResult();
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#GetUserIdByUsername(string username)
/// </summary>
protected override long HandleGetUserIdByUsername(string username)
{
ISession session = SessionManagerFactory.SessionManager.Session;
IQuery query = session.CreateQuery("SELECT user.Id FROM UserImpl user WHERE user.UserName = :username");
query.SetParameter("username", username);
return (long)query.UniqueResult();
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#GetUser(String, bool)
/// </summary>
protected override UserVO HandleGetUser(String username)
{
ISession session = SessionManagerFactory.SessionManager.Session;
IQuery query = session.CreateQuery("FROM UserImpl user WHERE user.UserName = :username");
query.SetParameter("username", username);
IList users = query.List();
if (users.Count == 1)
{
return this.UserDao.ToUserVO((User)users[0]);
}
else if (users.Count == 0)
{
return null;
}
else
{
throw new Exception("More than one user was found with the same username");
}
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#GetUser(long, bool)
/// </summary>
protected override UserVO HandleGetUser(long userId)
{
User u = UserDao.Load(userId);
return this.UserDao.ToUserVO(u);
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#GetAllUsers(int, int)
/// </summary>
protected override System.Collections.IList HandleGetAllUsers(int pageIndex, int pageSize)
{
ISession session = SessionManagerFactory.SessionManager.Session;
IQuery query = session.CreateQuery("from UserImpl");
query.SetFirstResult(pageIndex);
query.SetMaxResults(pageSize);
return this.UserDao.ToUserVOList(query.List());
}
private bool RoleIsInList(string[] roleList, Role roleType)
{
foreach (string rolestring in roleList)
{
if (rolestring.Equals(roleType.ToString()))
{
return true;
}
}
return false;
}
private UserRole RoleIsInList(Iesi.Collections.ISet set, string rolestring)
{
foreach (UserRole role in set)
{
if (rolestring.Equals(role.Role.ToString()))
{
return role;
}
}
return null;
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#UpdateUser(User)
/// </summary>
protected override void HandleUpdateUser(UserVO membershipUser)
{
User entity = this.UserDao.Load(membershipUser.Id);
entity.Comment = membershipUser.Comment;
entity.Email = membershipUser.Email;
entity.IsActive = membershipUser.IsActive;
// Synchronize roles
if (membershipUser.Roles != null)
{
ArrayList rolesToRemove = new ArrayList();
foreach (UserRole role in entity.Roles)
{
if (!RoleIsInList(membershipUser.Roles, role.Role))
{
rolesToRemove.Add(role);
}
}
foreach (UserRole role in rolesToRemove)
{
entity.Roles.Remove(role);
}
foreach (string rolestring in membershipUser.Roles)
{
UserRole role = RoleIsInList(entity.Roles, rolestring);
if (role == null)
{
role = UserRole.Factory.newInstance();
role.Role = (Role)Enum.Parse(typeof(Role), rolestring);
role.User = entity;
entity.Roles.Add(role);
}
}
}
this.UserDao.Update(entity);
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#UpdatePassword(String, String, String)
/// </summary>
protected override bool HandleUpdatePassword(string username, string oldPassword, string newPassword)
{
ISession session = SessionManagerFactory.SessionManager.Session;
IQuery query = session.CreateQuery("FROM UserImpl user WHERE user.UserName = :username AND user.Password = :password");
query.SetParameter("username", username);
query.SetParameter("password", oldPassword);
IList users = query.List();
if (users.Count != 1)
{
return false;
}
User entity = (User)users[0];
entity.Password = newPassword;
this.UserDao.Update(entity);
return true;
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#DeleteUser(String)
/// </summary>
protected override void HandleDeleteUser(String username)
{
long userid = HandleGetUserIdByUsername(username);
this.UserDao.Remove(userid);
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#FindUsersByEmail(String, int, int)
/// </summary>
protected override System.Collections.IList HandleFindUsersByEmail(String emailToMatch, int pageIndex, int pageSize)
{
ISession session = SessionManagerFactory.SessionManager.Session;
IQuery query = session.CreateQuery("FROM UserImpl user WHERE user.Email LIKE :email");
query.SetParameter("email", emailToMatch);
return this.UserDao.ToUserVOList(query.List());
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#FindUsersByName(String, int, int)
/// </summary>
protected override System.Collections.IList HandleFindUsersByName(String usernameToMatch, int pageIndex, int pageSize)
{
ISession session = SessionManagerFactory.SessionManager.Session;
IQuery query = session.CreateQuery("FROM UserImpl user WHERE user.UserName LIKE :username");
query.SetParameter("username", usernameToMatch);
return this.UserDao.ToUserVOList(query.List());
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#ValidateUser(String, String)
/// </summary>
protected override UserVO HandleValidateUser(String username, String password)
{
ISession session = SessionManagerFactory.SessionManager.Session;
IQuery query = session.CreateQuery("FROM UserImpl user WHERE user.UserName = :username AND user.Password = :password");
query.SetParameter("username", username);
query.SetParameter("password", password);
IList users = query.List();
if (users.Count == 1)
{
return this.UserDao.ToUserVO((User)users[0]);
}
else if (users.Count == 0)
{
return null;
}
else
{
throw new Exception("More than one user was found with the same username and password combination");
}
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#GetRolesForUser(long? userId)
/// </summary>
protected override Role[] HandleGetRolesForUser(long userId)
{
ISession session = SessionManagerFactory.SessionManager.Session;
IQuery query = session.CreateQuery("FROM UserRoleImpl role WHERE role.User.Id = :userid");
query.SetParameter("userid", userId);
IList results = query.List();
Role[] roles = new Role[results.Count];
for (int i = 0; i < results.Count; i++)
{
roles[i] = ((UserRole)results[i]).Role;
}
return roles;
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#GetRolesForUser(string username)
/// </summary>
protected override Role[] HandleGetRolesForUser(string username)
{
ISession session = SessionManagerFactory.SessionManager.Session;
IQuery query = session.CreateQuery("FROM UserRoleImpl role WHERE role.User.UserName = :username");
query.SetParameter("username", username);
IList results = query.List();
Role[] roles = new Role[results.Count];
for (int i = 0; i < results.Count; i++)
{
roles[i] = ((UserRole)results[i]).Role;
}
return roles;
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#GetUsernamesInRole(RoleType role)
/// </summary>
protected override string[] HandleGetUsernamesInRole(Role role)
{
ISession session = SessionManagerFactory.SessionManager.Session;
IQuery query = session.CreateQuery("SELECT role.User.UserName FROM UserRoleImpl role WHERE role.Role = :roletype");
query.SetParameter("roletype", (int)role);
IList usernameList = query.List();
Array usernames = Array.CreateInstance(typeof(string), usernameList.Count);
usernameList.CopyTo(usernames, 0);
return (string[])usernames;
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#FindUsernamesInRole(RoleType role, string usernameToMatch)
/// </summary>
protected override string[] HandleFindUsernamesInRole(Role role, string usernameToMatch)
{
ISession session = SessionManagerFactory.SessionManager.Session;
IQuery query = session.CreateQuery("SELECT role.User.UserName FROM UserRoleImpl role WHERE role.Role = :roletype AND role.User.UserName LIKE :usernameToMatch");
query.SetParameter("roletype", (int)role);
query.SetParameter("usernameToMatch", usernameToMatch);
IList usernameList = query.List();
Array usernames = Array.CreateInstance(typeof(string), usernameList.Count);
usernameList.CopyTo(usernames, 0);
return (string[])usernames;
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#IsUserInRole(User user, RoleType role)
/// </summary>
protected override bool HandleIsUserInRole(UserVO user, Role role)
{
foreach (string currole in user.Roles)
{
if (currole.Equals(role.ToString()))
{
return true;
}
}
return false;
}
/// <summary>
/// @see MembershipExample.Service.MembershipService#IsUserInRole(string username, RoleType role)
/// </summary>
protected override bool HandleIsUserInRole(string username, Role role)
{
ISession session = SessionManagerFactory.SessionManager.Session;
IQuery query = session.CreateQuery("SELECT role.Id FROM UserRoleImpl role WHERE role.User.UserName = :username AND role.Role = :roletype");
query.SetParameter("username", username);
query.SetParameter("roletype", (int)role);
IList roles = query.List();
return roles.Count > 0;
}
}
}
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Service/TimeTrackingServiceImpl.cs
Index: TimeTrackingServiceImpl.cs
===================================================================
// Name: TimeTrackingServiceImpl.cs
//
// License text for C# files - Change in mda/conf/mappings/MergeMappings.xml
//
//
// This is only generated once! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
using NHibernate;
using NHibernate.Expression;
using AndroMDA.NHibernateSupport;
using Northwind.TimeTracker.Domain;
using System.Collections;
using Northwind.TimeTracker.VO;
namespace Northwind.TimeTracker.Service
{
/// <summary>
/// @see Northwind.TimeTracker.Service.TimeTrackingService
/// </summary>
public class TimeTrackingServiceImpl
: Northwind.TimeTracker.Service.TimeTrackingServiceBase
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(TimeTrackingServiceImpl));
public ISession Session
{
get { return SessionManagerFactory.SessionManager.Session; }
}
/// <summary>
/// @see Northwind.TimeTracker.Service.TimeTrackingService#findTimecards(Northwind.TimeTracker.VO.TimecardSearchCriteriaVO)
/// </summary>
protected override Northwind.TimeTracker.VO.TimecardSummaryVO[] HandleFindTimecards(Northwind.TimeTracker.VO.TimecardSearchCriteriaVO criteria)
{
IList timecards = this.TimecardDao.FindByCriteria(criteria);
IList timecardVOs = this.TimecardDao.ToTimecardSummaryVOList(timecards);
TimecardSummaryVO[] voArray = new TimecardSummaryVO[timecardVOs.Count];
timecardVOs.CopyTo(voArray, 0);
return voArray;
}
}
}
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.SchemaExport/App.config
Index: App.config
===================================================================
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
</configSections>
<log4net>
<appender name="NHibernateLog" type="log4net.Appender.RollingFileAppender">
<file value="NHibernate.log" />
<appendToFile value="false" />
<rollingStyle value="Size" />
<maxSizeRollBackups value="10" />
<maximumFileSize value="1MB" />
<staticLogFileName value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%d{HH:mm:ss.fff} [%t] %-5p %c - %m%n" />
</layout>
</appender>
<!-- levels: DEBUG, INFO, WARN, ERROR, FATAL -->
<root>
<level value="WARN"/>
<appender-ref ref="NHibernateLog"/>
</root>
<logger name="NHibernate.SQL">
<level value="DEBUG" />
</logger>
</log4net>
<appSettings>
<add key="nhibernate.config" value="nhibernate.config" />
<add key="schema.create.file" value="schema-create.sql"/>
<add key="schema.drop.file" value="schema-drop.sql"/>
</appSettings>
</configuration>
1.1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.SchemaExport/Northwind.TimeTracker.SchemaExport.csproj
Index: Northwind.TimeTracker.SchemaExport.csproj
===================================================================
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{68DC4A1E-5025-4299-99E1-DF8F2A3498F0}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Northwind.TimeTracker.SchemaExport</RootNamespace>
<AssemblyName>Northwind.TimeTracker.SchemaExport</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AndroMDA.NHibernateSupport, Version=1.0.5.0, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\AndroMDA.NHibernateSupport.dll</HintPath>
</Reference>
<Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\Castle.DynamicProxy.dll</HintPath>
</Reference>
<Reference Include="HashCodeProvider, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7195e0c6089ba840">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\HashCodeProvider.dll</HintPath>
</Reference>
<Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.9.0, Culture=neutral, PublicKeyToken=b32731d11ce58905">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\log4net.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=1.0.2.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\NHibernate.dll</HintPath>
</Reference>
<Reference Include="NHibernate.Caches.SysCache, Version=1.0.2.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\NHibernate.Caches.SysCache.dll</HintPath>
</Reference>
<Reference Include="NHibernate.Nullables2, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\NHibernate.Nullables2.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SchemaExport.cs" />
<Compile Include="TestDataManager.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="App.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="nhibernate.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Northwind.TimeTracker.Common\Northwind.TimeTracker.Common.csproj">
<Project>{8A8C09CD-2D6B-4C95-BB13-BF02E0D82442}</Project>
<Name>Northwind.TimeTracker.Common</Name>
</ProjectReference>
<ProjectReference Include="..\Northwind.TimeTracker.Core\Northwind.TimeTracker.Core.csproj">
<Project>{D324A20C-2ECE-4698-9572-FC69DB4BBF13}</Project>
<Name>Northwind.TimeTracker.Core</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2006-08-28 03:45:50
|
User: cmicali Date: 06/08/27 20:45:49 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.WebServices/App_Code - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-28 03:45:49
|
User: cmicali Date: 06/08/27 20:45:49 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.WebServices/App_Data - New directory |
