Menu
▾
▴
[Andromda-cvs] SF.net SVN: andromda:[14881] trunk/andromda-documentation/samples/ timetracker
|
From: <wal...@us...> - 2011-02-21 10:35:06
|
Revision: 14881
http://andromda.svn.sourceforge.net/andromda/?rev=14881&view=rev
Author: walterim
Date: 2011-02-21 10:34:57 +0000 (Mon, 21 Feb 2011)
Log Message:
-----------
Timetracker converted to JSF, deploying in JBoss 5.1
Modified Paths:
--------------
trunk/andromda-documentation/samples/timetracker/app/pom.xml
trunk/andromda-documentation/samples/timetracker/app/src/main/sql/test-data-insert.sql
trunk/andromda-documentation/samples/timetracker/common/pom.xml
trunk/andromda-documentation/samples/timetracker/core/pom.xml
trunk/andromda-documentation/samples/timetracker/mda/pom.xml
trunk/andromda-documentation/samples/timetracker/mda/src/main/config/andromda.xml
trunk/andromda-documentation/samples/timetracker/mda/src/main/config/mappings/WebMergeMappings.xml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/UML_Standard_Profile.MagicDraw_Profile.DSL_Customization.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/UML_Standard_Profile.MagicDraw_Profile.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/UML_Standard_Profile.Validation_Profile.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/andromda-webservice.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/andromda-xml.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/org.andromda.profile.common.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/org.andromda.profile.messaging.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/org.andromda.profile.meta.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/org.andromda.profile.persistence.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/org.andromda.profile.presentation.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/org.andromda.profile.process.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/org.andromda.profile.service.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/timetracker.mdr
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/timetracker.uml
trunk/andromda-documentation/samples/timetracker/pom.xml
trunk/andromda-documentation/samples/timetracker/web/pom.xml
trunk/andromda-documentation/samples/timetracker/web/src/main/java/org/andromda/timetracker/web/timecardsearch/SearchControllerImpl.java
trunk/andromda-documentation/samples/timetracker/web/src/test/resources/testng.xml
Added Paths:
-----------
trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TaskDaoImpl.java
trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TimeAllocationDaoImpl.java
trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TimePeriodImpl.java
trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TimecardImpl.java
trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/UserRoleDaoImpl.java
trunk/andromda-documentation/samples/timetracker/mda/log4j.xml
trunk/andromda-documentation/samples/timetracker/mda/src/main/config/mappings/JavaMappings.xml
trunk/andromda-documentation/samples/timetracker/mda/src/main/config/mappings/SpringMergeMappings.xml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml/timetracker-md165.xml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/UML_Standard_Profile.UML_Standard_Profile.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/org.andromda.profile.webservice.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/org.andromda.profile.xml.profile.uml
trunk/andromda-documentation/samples/timetracker/mda/src/main/uml2/timetracker.xml
trunk/andromda-documentation/samples/timetracker/web/src/main/java/org/andromda/timetracker/domain/
trunk/andromda-documentation/samples/timetracker/web/src/main/java/org/andromda/timetracker/domain/crud/
trunk/andromda-documentation/samples/timetracker/web/src/main/java/org/andromda/timetracker/domain/crud/TaskControllerImpl.java
trunk/andromda-documentation/samples/timetracker/web/src/main/java/org/andromda/timetracker/domain/crud/UserControllerImpl.java
trunk/andromda-documentation/samples/timetracker/web/src/main/java/org/andromda/timetracker/web/timecarddetails/
trunk/andromda-documentation/samples/timetracker/web/src/main/java/org/andromda/timetracker/web/timecarddetails/TimecardControllerImpl.java
trunk/andromda-documentation/samples/timetracker/web/src/main/java/org/andromda/timetracker/web/timetrackerhome/
trunk/andromda-documentation/samples/timetracker/web/src/main/java/org/andromda/timetracker/web/timetrackerhome/HomeControllerImpl.java
trunk/andromda-documentation/samples/timetracker/web/src/main/webapp/
trunk/andromda-documentation/samples/timetracker/web/src/main/webapp/css/
trunk/andromda-documentation/samples/timetracker/web/src/main/webapp/css/custom.css
Removed Paths:
-------------
trunk/andromda-documentation/samples/timetracker/app/src/main/application/
trunk/andromda-documentation/samples/timetracker/web/src/main/java/org/andromda/timetracker/web/security/
trunk/andromda-documentation/samples/timetracker/web/src/main/jsp/
Modified: trunk/andromda-documentation/samples/timetracker/app/pom.xml
===================================================================
--- trunk/andromda-documentation/samples/timetracker/app/pom.xml 2011-02-21 10:28:40 UTC (rev 14880)
+++ trunk/andromda-documentation/samples/timetracker/app/pom.xml 2011-02-21 10:34:57 UTC (rev 14881)
@@ -15,36 +15,12 @@
<groupId>${project.groupId}</groupId>
<artifactId>timetracker-common</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>${project.groupId}</groupId>
- <artifactId>timetracker-mda</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.andromda.profiles.uml14</groupId>
- <artifactId>andromda-profile</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>timetracker-core</artifactId>
<version>${project.version}</version>
<type>ejb</type>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -53,32 +29,9 @@
<type>war</type>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
- <!-- These two get included in ear archive. collections is already in JBoss common\lib, mysql is already in war -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.14</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
<finalName>${application.id}-${project.version}</finalName>
@@ -97,11 +50,13 @@
<plugins>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
- <version>2.4.2</version>
+ <version>2.5</version>
<configuration>
+ <generateApplicationXml>true</generateApplicationXml>
+ <includeJar>false</includeJar>
+ <defaultLibBundleDir>lib</defaultLibBundleDir>
<includes>**/*.xml</includes>
<excludes>**/jboss-app.xml</excludes>
- <earSourceExcludes>**/commons-collections*.jar,**/mysql*.jar,**/ehcache-1.2.3.jar</earSourceExcludes>
<version>1.4</version>
<modules>
<jarModule>
@@ -118,18 +73,11 @@
<artifactId>timetracker-web</artifactId>
<contextRoot>/${application.id}</contextRoot>
</webModule>
- <!-- Exclude these from the ear artifact -->
- <jarModule>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <excluded>true</excluded>
- </jarModule>
- <jarModule>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <excluded>true</excluded>
- </jarModule>
</modules>
+ <jboss>
+ <version>5</version>
+ <loader-repository>org.richfaces.examples:loader=${project.build.finalName}</loader-repository>
+ </jboss>
</configuration>
</plugin>
<plugin>
@@ -152,4 +100,36 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <!-- This profile here will allow you to specify -Ddeploy=link in order deploy an exploded ear using symbolic links,
+ this allows you to easily edit things like jsp, xhtml, etc and just build the web module without having
+ to deploy the ear -->
+ <profile>
+ <id>link</id>
+ <activation>
+ <property>
+ <name>deploy</name>
+ <value>link</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.andromda.maven.plugins</groupId>
+ <artifactId>andromdapp-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>link</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <deployLocation>${jboss.home}/server/default/deploy</deployLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Modified: trunk/andromda-documentation/samples/timetracker/app/src/main/sql/test-data-insert.sql
===================================================================
--- trunk/andromda-documentation/samples/timetracker/app/src/main/sql/test-data-insert.sql 2011-02-21 10:28:40 UTC (rev 14880)
+++ trunk/andromda-documentation/samples/timetracker/app/src/main/sql/test-data-insert.sql 2011-02-21 10:34:57 UTC (rev 14881)
@@ -1,22 +1,22 @@
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 1, 'Approved', '2006/05/15', 'Timecard 01', 1, 2);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 2, 'Approved', '2006/05/15', 'Timecard 02', 2, 3);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 3, 'Approved', '2006/05/15', 'Timecard 03', 3, 4);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 4, 'Approved', '2006/05/15', 'Timecard 04', 4, 1);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 1, 'APPROVED', '2006/05/15', 'Timecard 01', 1, 2);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 2, 'APPROVED', '2006/05/15', 'Timecard 02', 2, 3);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 3, 'APPROVED', '2006/05/15', 'Timecard 03', 3, 4);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 4, 'APPROVED', '2006/05/15', 'Timecard 04', 4, 1);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 5, 'Rejected', '2006/05/22', 'Timecard 05', 1, 2);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 6, 'Rejected', '2006/05/22', 'Timecard 06', 2, 3);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 7, 'Rejected', '2006/05/22', 'Timecard 07', 3, 4);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 8, 'Rejected', '2006/05/22', 'Timecard 08', 4, 1);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 5, 'REJECTED', '2006/05/22', 'Timecard 05', 1, 2);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 6, 'REJECTED', '2006/05/22', 'Timecard 06', 2, 3);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 7, 'REJECTED', '2006/05/22', 'Timecard 07', 3, 4);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 8, 'REJECTED', '2006/05/22', 'Timecard 08', 4, 1);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 9, 'Submitted', '2006/05/29', 'Timecard 09', 1, 2);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (10, 'Submitted', '2006/05/29', 'Timecard 10', 2, 3);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (11, 'Submitted', '2006/05/29', 'Timecard 11', 3, 4);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (12, 'Submitted', '2006/05/29', 'Timecard 12', 4, 1);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values ( 9, 'SUBMITTED', '2006/05/29', 'Timecard 09', 1, 2);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (10, 'SUBMITTED', '2006/05/29', 'Timecard 10', 2, 3);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (11, 'SUBMITTED', '2006/05/29', 'Timecard 11', 3, 4);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (12, 'SUBMITTED', '2006/05/29', 'Timecard 12', 4, 1);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (13, 'Draft', '2006/06/05', 'Timecard 13', null, 2);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (14, 'Draft', '2006/06/05', 'Timecard 14', null, 3);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (15, 'Draft', '2006/06/05', 'Timecard 15', null, 4);
-insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (16, 'Draft', '2006/06/05', 'Timecard 16', null, 1);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (13, 'DRAFT', '2006/06/05', 'Timecard 13', null, 2);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (14, 'DRAFT', '2006/06/05', 'Timecard 14', null, 3);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (15, 'DRAFT', '2006/06/05', 'Timecard 15', null, 4);
+insert into TIMECARD (ID, STATUS, START_DATE, COMMENTS, APPROVER_FK, SUBMITTER_FK) values (16, 'DRAFT', '2006/06/05', 'Timecard 16', null, 1);
commit;
Modified: trunk/andromda-documentation/samples/timetracker/common/pom.xml
===================================================================
--- trunk/andromda-documentation/samples/timetracker/common/pom.xml 2011-02-21 10:28:40 UTC (rev 14880)
+++ trunk/andromda-documentation/samples/timetracker/common/pom.xml 2011-02-21 10:34:57 UTC (rev 14881)
@@ -20,20 +20,30 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
</dependency>
</dependencies>
<build>
+ <!-- To change from default src/main/java and src/test/java - doesn't work for Cobertura>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>src-test</testSourceDirectory -->
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Modified: trunk/andromda-documentation/samples/timetracker/core/pom.xml
===================================================================
--- trunk/andromda-documentation/samples/timetracker/core/pom.xml 2011-02-21 10:28:40 UTC (rev 14880)
+++ trunk/andromda-documentation/samples/timetracker/core/pom.xml 2011-02-21 10:34:57 UTC (rev 14881)
@@ -8,7 +8,7 @@
<version>3.4-SNAPSHOT</version>
</parent>
<artifactId>timetracker-core</artifactId>
- <packaging>ejb</packaging>
+ <packaging>jar</packaging>
<name>TimeTracker Core Business Tier</name>
<dependencies>
<dependency>
@@ -43,6 +43,10 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
<!-- Uncomment below if using JDBC or Test features>
<dependency>
<groupId>org.springframework</groupId>
@@ -57,51 +61,43 @@
<artifactId>spring-test</artifactId>
</dependency-->
<dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </dependency>
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>3.3.2.GA</version>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.5.6-Final</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- <version>2.3.1</version>
- <scope>runtime</scope>
+ <artifactId>ehcache</artifactId>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.2</version>
- <scope>runtime</scope>
+ <artifactId>cglib-nodep</artifactId>
</dependency>
- <!-- Don't include these in the war or ear. JTA is already there, commons-collections causes Classloader conflicts -->
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.14</version>
- <scope>provided</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
@@ -118,17 +114,30 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-j2ee</artifactId>
</dependency>
- <!-- commented out because the groovy jar does not have a pom and it makes maven fail -->
- <!--
<dependency>
<groupId>org.andromda</groupId>
<artifactId>andromda-script-wrappers</artifactId>
<scope>provided</scope>
</dependency>
- -->
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -190,24 +199,15 @@
</dependencies>
</plugin>
<plugin>
- <artifactId>maven-ejb-plugin</artifactId>
- <version>2.2.1</version>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- <generateClient>true</generateClient>
- <excludes>
- <exclude>**/*.ref</exclude>
- </excludes>
- </configuration>
+ <artifactId>maven-jar-plugin</artifactId>
</plugin>
</plugins>
<resources>
<resource>
- <directory>target/src</directory>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>target/src/main/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
Added: trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TaskDaoImpl.java
===================================================================
--- trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TaskDaoImpl.java (rev 0)
+++ trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TaskDaoImpl.java 2011-02-21 10:34:57 UTC (rev 14881)
@@ -0,0 +1,84 @@
+// Generated by: hibernate/SpringHibernateDaoImpl.vsl in andromda-spring-cartridge.
+// license-header java merge-point
+/**
+ * This is only generated once! It will never be overwritten.
+ * You can (and have to!) safely modify it by hand.
+ */
+package org.andromda.timetracker.domain;
+
+import org.andromda.timetracker.vo.TaskVO;
+
+/**
+ * @see Task
+ */
+public class TaskDaoImpl
+ extends TaskDaoBase
+{
+ /**
+ * @inheritDoc
+ */
+ public void toTaskVO(
+ Task source,
+ TaskVO target)
+ {
+ // TODO verify behavior of toTaskVO
+ super.toTaskVO(source, target);
+ }
+
+
+ /**
+ * @inheritDoc
+ */
+ public TaskVO toTaskVO(final Task entity)
+ {
+ // TODO verify behavior of toTaskVO
+ return super.toTaskVO(entity);
+ }
+
+
+ /**
+ * Retrieves the entity object that is associated with the specified value object
+ * from the object store. If no such entity object exists in the object store,
+ * a new, blank entity is created
+ */
+ private Task loadTaskFromTaskVO(TaskVO taskVO)
+ {
+ // TODO implement loadTaskFromTaskVO
+ throw new UnsupportedOperationException("org.andromda.timetracker.domain.loadTaskFromTaskVO(TaskVO) not yet implemented.");
+
+ /* A typical implementation looks like this:
+ Task task = this.load(taskVO.getId());
+ if (task == null)
+ {
+ task = Task.Factory.newInstance();
+ }
+ return task;
+ */
+ }
+
+
+ /**
+ * @inheritDoc
+ */
+ public Task taskVOToEntity(TaskVO taskVO)
+ {
+ // TODO verify behavior of taskVOToEntity
+ Task entity = this.loadTaskFromTaskVO(taskVO);
+ this.taskVOToEntity(taskVO, entity, true);
+ return entity;
+ }
+
+
+ /**
+ * @inheritDoc
+ */
+ public void taskVOToEntity(
+ TaskVO source,
+ Task target,
+ boolean copyIfNull)
+ {
+ // TODO verify behavior of taskVOToEntity
+ super.taskVOToEntity(source, target, copyIfNull);
+ }
+
+}
\ No newline at end of file
Added: trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TimeAllocationDaoImpl.java
===================================================================
--- trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TimeAllocationDaoImpl.java (rev 0)
+++ trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TimeAllocationDaoImpl.java 2011-02-21 10:34:57 UTC (rev 14881)
@@ -0,0 +1,84 @@
+// Generated by: hibernate/SpringHibernateDaoImpl.vsl in andromda-spring-cartridge.
+// license-header java merge-point
+/**
+ * This is only generated once! It will never be overwritten.
+ * You can (and have to!) safely modify it by hand.
+ */
+package org.andromda.timetracker.domain;
+
+import org.andromda.timetracker.vo.TimeAllocationVO;
+
+/**
+ * @see TimeAllocation
+ */
+public class TimeAllocationDaoImpl
+ extends TimeAllocationDaoBase
+{
+ /**
+ * @inheritDoc
+ */
+ public void toTimeAllocationVO(
+ TimeAllocation source,
+ TimeAllocationVO target)
+ {
+ // TODO verify behavior of toTimeAllocationVO
+ super.toTimeAllocationVO(source, target);
+ }
+
+
+ /**
+ * @inheritDoc
+ */
+ public TimeAllocationVO toTimeAllocationVO(final TimeAllocation entity)
+ {
+ // TODO verify behavior of toTimeAllocationVO
+ return super.toTimeAllocationVO(entity);
+ }
+
+
+ /**
+ * Retrieves the entity object that is associated with the specified value object
+ * from the object store. If no such entity object exists in the object store,
+ * a new, blank entity is created
+ */
+ private TimeAllocation loadTimeAllocationFromTimeAllocationVO(TimeAllocationVO timeAllocationVO)
+ {
+ // TODO implement loadTimeAllocationFromTimeAllocationVO
+ throw new UnsupportedOperationException("org.andromda.timetracker.domain.loadTimeAllocationFromTimeAllocationVO(TimeAllocationVO) not yet implemented.");
+
+ /* A typical implementation looks like this:
+ TimeAllocation timeAllocation = this.load(timeAllocationVO.getId());
+ if (timeAllocation == null)
+ {
+ timeAllocation = TimeAllocation.Factory.newInstance();
+ }
+ return timeAllocation;
+ */
+ }
+
+
+ /**
+ * @inheritDoc
+ */
+ public TimeAllocation timeAllocationVOToEntity(TimeAllocationVO timeAllocationVO)
+ {
+ // TODO verify behavior of timeAllocationVOToEntity
+ TimeAllocation entity = this.loadTimeAllocationFromTimeAllocationVO(timeAllocationVO);
+ this.timeAllocationVOToEntity(timeAllocationVO, entity, true);
+ return entity;
+ }
+
+
+ /**
+ * @inheritDoc
+ */
+ public void timeAllocationVOToEntity(
+ TimeAllocationVO source,
+ TimeAllocation target,
+ boolean copyIfNull)
+ {
+ // TODO verify behavior of timeAllocationVOToEntity
+ super.timeAllocationVOToEntity(source, target, copyIfNull);
+ }
+
+}
\ No newline at end of file
Added: trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TimePeriodImpl.java
===================================================================
--- trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TimePeriodImpl.java (rev 0)
+++ trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TimePeriodImpl.java 2011-02-21 10:34:57 UTC (rev 14881)
@@ -0,0 +1,24 @@
+// license-header java merge-point
+/**
+ * This is only generated once! It will never be overwritten.
+ * You can (and have to!) safely modify it by hand.
+ * Generated by: HibernateEmbeddedValueImpl.vsl in andromda-hibernate-cartridge.
+ */
+package org.andromda.timetracker.domain;
+
+import java.io.Serializable;
+
+/**
+ * @see TimePeriod
+ */
+public class TimePeriodImpl
+ extends TimePeriod
+ implements Serializable
+{
+
+ /**
+ * The serial version UID of this class. Needed for serialization.
+ */
+ private static final long serialVersionUID = -708617510741626676L;
+
+}
\ No newline at end of file
Added: trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TimecardImpl.java
===================================================================
--- trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TimecardImpl.java (rev 0)
+++ trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/TimecardImpl.java 2011-02-21 10:34:57 UTC (rev 14881)
@@ -0,0 +1,29 @@
+// license-header java merge-point
+/**
+ * This is only generated once! It will never be overwritten.
+ * You can (and have to!) safely modify it by hand.
+ * Generated by: HibernateEntityImpl.vsl in andromda-hibernate-cartridge.
+ */
+package org.andromda.timetracker.domain;
+
+/**
+ * @see Timecard
+ */
+public class TimecardImpl
+ extends Timecard
+{
+ /**
+ * The serial version UID of this class. Needed for serialization.
+ */
+ private static final long serialVersionUID = -450260575900550958L;
+
+ /**
+ * @see Timecard#addTimeAllocation(TimeAllocation)
+ */
+ public void addTimeAllocation(TimeAllocation timeAllocation)
+ {
+ // TODO implement public void addTimeAllocation(TimeAllocation timeAllocation)
+ throw new UnsupportedOperationException("org.andromda.timetracker.domain.Timecard.addTimeAllocation(TimeAllocation timeAllocation) Not implemented!");
+ }
+
+}
\ No newline at end of file
Added: trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/UserRoleDaoImpl.java
===================================================================
--- trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/UserRoleDaoImpl.java (rev 0)
+++ trunk/andromda-documentation/samples/timetracker/core/src/main/java/org/andromda/timetracker/domain/UserRoleDaoImpl.java 2011-02-21 10:34:57 UTC (rev 14881)
@@ -0,0 +1,84 @@
+// Generated by: hibernate/SpringHibernateDaoImpl.vsl in andromda-spring-cartridge.
+// license-header java merge-point
+/**
+ * This is only generated once! It will never be overwritten.
+ * You can (and have to!) safely modify it by hand.
+ */
+package org.andromda.timetracker.domain;
+
+import org.andromda.timetracker.vo.UserRoleVO;
+
+/**
+ * @see UserRole
+ */
+public class UserRoleDaoImpl
+ extends UserRoleDaoBase
+{
+ /**
+ * @inheritDoc
+ */
+ public void toUserRoleVO(
+ UserRole source,
+ UserRoleVO target)
+ {
+ // TODO verify behavior of toUserRoleVO
+ super.toUserRoleVO(source, target);
+ }
+
+
+ /**
+ * @inheritDoc
+ */
+ public UserRoleVO toUserRoleVO(final UserRole entity)
+ {
+ // TODO verify behavior of toUserRoleVO
+ return super.toUserRoleVO(entity);
+ }
+
+
+ /**
+ * Retrieves the entity object that is associated with the specified value object
+ * from the object store. If no such entity object exists in the object store,
+ * a new, blank entity is created
+ */
+ private UserRole loadUserRoleFromUserRoleVO(UserRoleVO userRoleVO)
+ {
+ // TODO implement loadUserRoleFromUserRoleVO
+ throw new UnsupportedOperationException("org.andromda.timetracker.domain.loadUserRoleFromUserRoleVO(UserRoleVO) not yet implemented.");
+
+ /* A typical implementation looks like this:
+ UserRole userRole = this.load(userRoleVO.getId());
+ if (userRole == null)
+ {
+ userRole = UserRole.Factory.newInstance();
+ }
+ return userRole;
+ */
+ }
+
+
+ /**
+ * @inheritDoc
+ */
+ public UserRole userRoleVOToEntity(UserRoleVO userRoleVO)
+ {
+ // TODO verify behavior of userRoleVOToEntity
+ UserRole entity = this.loadUserRoleFromUserRoleVO(userRoleVO);
+ this.userRoleVOToEntity(userRoleVO, entity, true);
+ return entity;
+ }
+
+
+ /**
+ * @inheritDoc
+ */
+ public void userRoleVOToEntity(
+ UserRoleVO source,
+ UserRole target,
+ boolean copyIfNull)
+ {
+ // TODO verify behavior of userRoleVOToEntity
+ super.userRoleVOToEntity(source, target, copyIfNull);
+ }
+
+}
\ No newline at end of file
Added: trunk/andromda-documentation/samples/timetracker/mda/log4j.xml
===================================================================
--- trunk/andromda-documentation/samples/timetracker/mda/log4j.xml (rev 0)
+++ trunk/andromda-documentation/samples/timetracker/mda/log4j.xml 2011-02-21 10:34:57 UTC (rev 14881)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- the log configuration file for the AndroMDA project -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ============================================
+ Append error messages to a local error log
+ ============================================ -->
+ <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="andromda.log"/>
+ <!-- Added HHmm so that new file with minute timestamp is created on each MDA run -->
+ <param name="DatePattern" value="MMdd-HH"/>
+ <param name="Threshold" value="DEBUG"/>
+ <param name="Append" value="false"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================================
+ Append messages to the console
+ ================================ -->
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="INFO"/>
+ <param name="Target" value="System.out"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+
+ <!-- ==================
+ Limit categories
+ ================== -->
+
+ <category name="org.apache">
+ <priority value="WARN" />
+ </category>
+
+ <category name="org.apache.cxf">
+ <priority value="DEBUG" />
+ </category>
+
+ <category name="org.springframework">
+ <priority value="DEBUG" />
+ </category>
+
+ <category name="org.eclipse">
+ <priority value="DEBUG" />
+ </category>
+
+ <category name="org.andromda">
+ <priority value="DEBUG" />
+ </category>
+
+ <category name="org.andromda.core.metafacades">
+ <priority value="DEBUG" />
+ </category>
+
+ <category name="org.andromda.core.configuration">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.andromda.namespaces.webservice">
+ <priority value="DEBUG" />
+ </category>
+
+ <!--category name="org.andromda.namespaces.java">
+ <priority value="DEBUG" />
+ </category-->
+
+ <category name="org.andromda.cartridges">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.andromda.cartridges.webservice">
+ <priority value="DEBUG" />
+ </category>
+
+ <category name="org.andromda.cartridges.java">
+ <priority value="DEBUG" />
+ </category>
+
+ <category name="org.andromda.templateengines">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.andromda.translation">
+ <priority value="INFO" />
+ </category>
+
+ <!-- =========================
+ Setup the Root category
+ ========================= -->
+ <root>
+ <priority value="DEBUG" />
+ <appender-ref ref="FILE"/>
+ <appender-ref ref="CONSOLE"/>
+ </root>
+
+</log4j:configuration>
Modified: trunk/andromda-documentation/samples/timetracker/mda/pom.xml
===================================================================
--- trunk/andromda-documentation/samples/timetracker/mda/pom.xml 2011-02-21 10:28:40 UTC (rev 14880)
+++ trunk/andromda-documentation/samples/timetracker/mda/pom.xml 2011-02-21 10:34:57 UTC (rev 14881)
@@ -1,6 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!-- These settings apply specifically to the andromda code generation process. To generate code without
+ compiling or testing or packaging, run mvn install from /mda instead of from the root directory. -->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.andromda.timetracker</groupId>
@@ -12,17 +14,12 @@
<name>TimeTracker MDA</name>
<dependencies>
<dependency>
- <groupId>org.andromda.profiles.emf.uml22</groupId>
- <artifactId>andromda-common</artifactId>
- <version>${andromda.version}</version>
- <type>profile.uml</type>
+ <groupId>org.andromda.profiles.uml2</groupId>
+ <artifactId>andromda-profile</artifactId>
+ <version>${project.version}</version>
+ <type>xml.zip</type>
<scope>runtime</scope>
</dependency>
- <!--dependency>
- <groupId>org.andromda.profiles.uml14</groupId>
- <artifactId>andromda-profile</artifactId>
- <type>xml.zip</type>
- </dependency-->
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-spring-cartridge</artifactId>
@@ -43,21 +40,50 @@
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
- <artifactId>andromda-bpm4struts-cartridge</artifactId>
+ <artifactId>andromda-jsf-cartridge</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-validation-library</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>eclipse</id>
+ <build>
+ <plugins>
+ <!-- This will overwrite top level .project and .classpath each time.
+ The maven Eclipse plugin in mda/pom.xml does a better job anyway. See mda/eclipse.bat.-->
+ <plugin>
+ <groupId>org.andromda.maven.plugins</groupId>
+ <artifactId>andromdapp-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>app/pom.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<build>
- <sourceDirectory>${project.basedir}/src/main/uml</sourceDirectory>
+ <sourceDirectory>${project.basedir}/src/main/uml2</sourceDirectory>
<plugins>
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
@@ -78,28 +104,31 @@
</plugins>
</build>
<properties>
- <!--<model.uri>file:${project.build.sourceDirectory}/timetracker.xmi</model.uri>-->
- <model.uri>file:${project.basedir}/src/main/uml/timetracker.xmi</model.uri>
+ <!-- Avoid JDK6 XJC runtime error on wdsl2java from conflicting Jaxb2.2 -->
+ <cxf.version>2.2.12</cxf.version>
+ <!-- Versioned independently from CXF core -->
+ <cxf.xjc.version>2.3.0</cxf.xjc.version>
+ <model.uri>file:${project.basedir}/src/main/uml2/timetracker.uml</model.uri>
<filter></filter>
<validation>true</validation>
- <failValidation>false</failValidation>
+ <!-- ant script location for temp copy of resources -->
+ <andromda.project>${project.basedir}/..</andromda.project>
<conf.dir>${project.basedir}/src/main/config</conf.dir>
<!-- cartridge output locations -->
- <common.generated.dir>${project.basedir}/../common/target/src</common.generated.dir>
- <core.generated.dir>${project.basedir}/../core/target/src</core.generated.dir>
+ <common.generated.dir>${project.basedir}/../common/target/src/main/java</common.generated.dir>
+ <common.manual.dir>${project.basedir}/../common/src/main/java</common.manual.dir>
+ <core.generated.dir>${project.basedir}/../core/target/src/main/java</core.generated.dir>
<core.manual.dir>${project.basedir}/../core/src/main/java</core.manual.dir>
- <core.manual.test.resources>${project.basedir}/../core/src/test/resources</core.manual.test.resources>
- <core.generated.test.dir>${project.basedir}/../core/target/src</core.generated.test.dir>
- <core.manual.test.dir>${project.basedir}/../core/src/test/java</core.manual.test.dir>
- <web.generated.dir>${project.basedir}/../web/target/src</web.generated.dir>
+ <core.manual.java.dir>${project.basedir}/../core/src/main/java</core.manual.java.dir>
+ <web.generated.dir>${project.basedir}/../web/target</web.generated.dir>
+ <web.generated.java.dir>${web.generated.dir}/src/main/java</web.generated.java.dir>
+ <web.generated.web.dir>${web.generated.dir}/src/main/webapp</web.generated.web.dir>
<web.manual.dir>${project.basedir}/../web/src/main</web.manual.dir>
+ <web.manual.web.dir>${web.manual.dir}/webapp</web.manual.web.dir>
<web.manual.java.dir>${web.manual.dir}/java</web.manual.java.dir>
- <application.config.dir>${project.basedir}/../app/src/main/config</application.config.dir>
- <application.metainf.dir>${project.basedir}/../app/src/main/application/META-INF</application.metainf.dir>
<!-- hibernate configuration -->
- <!-- default strategy to use when using inheritance -->
+ <!-- default strategy to use when using inhertiance -->
<hibernate.inheritance.strategy>subclass</hibernate.inheritance.strategy>
- <hibernate.db.showSql>true</hibernate.db.showSql>
<!-- hibernate generator class to use for identifiers -->
<hibernate.generatorClass>native</hibernate.generatorClass>
</properties>
Modified: trunk/andromda-documentation/samples/timetracker/mda/src/main/config/andromda.xml
===================================================================
--- trunk/andromda-documentation/samples/timetracker/mda/src/main/config/andromda.xml 2011-02-21 10:28:40 UTC (rev 14880)
+++ trunk/andromda-documentation/samples/timetracker/mda/src/main/config/andromda.xml 2011-02-21 10:34:57 UTC (rev 14881)
@@ -1,36 +1,48 @@
<andromda xmlns="http://andromda.org/core/configuration">
+ <!-- See http://docs.andromda.org/configuration.html for andromda.xml properties documentation -->
<properties>
<property name="modelValidation">${validation}</property>
- <property name="failOnValidationErrors">${failValidation}</property>
+ <property name="xmlValidation">true</property>
+ <property name="failOnValidationErrors">true</property>
+ <!-- Comma separated list of cartridges to be processed by namespace name, such as java,webservice. Empty = true = process all -->
<property name="cartridgeFilter">${filter}</property>
+ <!-- Debug andromda processing using example log4j.xml file -->
+ <!--property name="loggingConfigurationUri">file:${project.basedir}/log4j.xml</property-->
</properties>
+ <!-- Server will load and validate model in the background automatically when anything changes.
+ To start server from mda directory: mvn andromda:start-server.
+ Leave commented, or else AndroMDA will try to connect each time.>
<server>
<host>localhost</host>
<port>4447</port>
- </server>
+ </server -->
<repositories>
<repository name="emf-uml22">
<models>
<model type="emf-uml22">
- <uri>file:${project.basedir}/src/main/uml2/timetracker.uml</uri>
- <moduleSearchLocations>
- <location patterns="*.uml">${project.basedir}/src/main/uml2</location>
- <!--uri>file:${project.basedir}/src/main/uml/timetracker-rsm75.emx</uri>
- <moduleSearchLocations>
- <location patterns="**/${andromda.version}/**/*-${andromda.version}.uml">${settings.localRepository}/org/andromda/profiles/emf/uml22</location>
- <location patterns="**/${andromda.version}/**/*-${andromda.version}.profile.uml">${settings.localRepository}/org/andromda/profiles/emf/uml22</location>
- <location patterns="**/${andromda.version}/**/*-${andromda.version}.library.uml">${settings.localRepository}/org/andromda/profiles/emf/uml22</location>
- <location patterns="andromda*.uml,UML_*.uml">${project.basedir}/src/main/uml2</location-->
- <!--repository name="netBeansMDR">
- <models>
- <model>
<uri>${model.uri}</uri>
+ <!-- List any additional referenced models needed for code generation here, even if already referenced internally within the model file -->
+ <!--uri>file:${project.basedir}/uml/AdditionalModel.emx</uri-->
<moduleSearchLocations>
- <location patterns="**/src/main/uml/*.xml.zip">${project.basedir}/../../../../profiles/uml-1.4</location>
- <location patterns="**/${andromda.version}/*.xml.zip">${settings.localRepository}/org/andromda/profiles/uml14</location>
- <location patterns="**/*.xml">jar:file:${settings.localRepository}/org/omg/profiles/uml14/UML_Standard_Profile/1.0/UML_Standard_Profile-1.0.jar!/</location>
- <location patterns="**/*.xml.zip">${settings.localRepository}/org/andromda/profiles/uml14</location-->
+ <location patterns="**/*.uml,**/*.e*x">${project.basedir}/src/main/uml</location>
+ <location patterns="**/${andromda.version}/*.e*x">${settings.localRepository}/org/andromda/profiles/emf/rsm75</location>
+ <location patterns="**/${andromda.version}/*.uml">${settings.localRepository}/org/andromda/profiles/emf/uml22</location>
</moduleSearchLocations>
+ <!-- JSF needs to disable these validations because there are situations where we can't use native
+ types in required (multiplicy > 0) parameters or VO attibutes-->
+ <constraints>
+ <constraint enforce="false">**::wrapped primitive attribute should not be required</constraint>
+ <constraint enforce="false">**::wrapped primitive parameter should not be required</constraint>
+ </constraints>
+ <!-- Can filter in/out specific model packages (in UML notation) to generate code from (default true=process all) -->
+ <!--modelPackages>
+ <modelPackage process="false">org::andromda::sample::notprocessed</modelPackage>
+ </modelPackages-->
+ <!-- Can filter in/out specific andromda model validation constraints (default true=validate all) -->
+ <!--constraints enforceAll="true">
+ <constraint enforce="false">org::andromda::metafacades::uml::Entity::entities can only generalize other entities</constraint>
+ <constraint enforce="false">org::andromda::metafacades::uml::Entity::entity must have at least one primary key</constraint>
+ </constraints-->
</model>
</models>
</repository>
@@ -57,10 +69,11 @@
<!-- See http://www.andromda.org/docs/andromda-metafacades/andromda-uml-metafacades/andromda-metafacades-emf-uml2/namespace.html -->
<namespace name="default">
<properties>
- <!-- Use enums, strongly typed collections with templates, and @annotation markups>
+ <!-- Use enums, strongly typed collections with templates, and @annotation markups -->
<property name="enableTemplating">true</property>
<property name="enableAnnotations">true</property>
- <property name="typeSafeEnumsEnabled">true</property -->
+ <property name="typeSafeEnumsEnabled">true</property>
+ <!-- Replaces default JavaMappings with customized mappings which extend Java, for PrimitiveTypes etc. -->
<property name="languageMappingsUri">Java</property>
<property name="wrapperMappingsUri">JavaWrapper</property>
<property name="sqlMappingsUri">${sql.mappings}</property>
@@ -75,11 +88,21 @@
<property name="enumerationNameMask">none</property>
<property name="entityNameMask">none</property>
<property name="entityPropertyNameMask">none</property>
- <property name="parameterNameMask">none</property-->
+ <property name="parameterNameMask">none</property -->
<property name="enumerationLiteralNameMask">upperunderscore</property>
<property name="hibernateVersion">3</property>
+ <property name="persistenceContainerName">jboss</property>
+ <!-- Override default @todo to set to Eclipse default>
+ <property name="toDoTag">TODO</property -->
+ <!-- Automatically makes English names plural (generally adds s if missing).
+ default=true, set to false if using non-English models or Jaxb/CXF 2.0 or JAXB simpleBindingMode=false.>
+ <property name="pluralizeAssociationEndNames">true</property>
+ <property name="pluralizeAttributeNames">true</property>
+ <property name="pluralizeParameterNames">true</property -->
+ <property name="xmlAttributes">false</property>
</properties>
</namespace>
+ <!-- See http://docs.andromda.org/andromda-cartridges/andromda-spring-cartridge/namespace.html -->
<namespace name="spring">
<properties>
<property name="dataSource">${dataSource}</property>
@@ -87,27 +110,25 @@
<property name="password">${jdbc.password}</property>
<property name="driver">${jdbc.driver}</property>
<property name="connectionUrl">${jdbc.url}</property>
- <property name="hibernateDialect">${hibernate.dialect}</property>
- <property name="hibernateShowSql">${hibernate.db.showSql}</property>
<property name="hibernateHbm2DDLAuto">update</property>
<property name="hibernateQueryUseNamedParameters">true</property>
<property name="hibernateEnableCache">false</property>
<property name="sessionFactory">org.springframework.orm.hibernate3.LocalSessionFactoryBean</property>
<property name="localTransactionManager">org.springframework.orm.hibernate3.HibernateTransactionManager</property>
- <property name="hibernateCacheProvider">org.hibernate.cache.EhCacheProvider</property>
+ <property name="hibernateCacheProvider">net.sf.ehcache.hibernate.EhCacheProvider</property>
<property name="hibernateQueryCacheFactory">org.hibernate.cache.StandardQueryCacheFactory</property>
<property name="mergeMappingsUri">file:${conf.dir}/mappings/SpringMergeMappings.xml</property>
<property name="hibernateInheritanceStrategy">${hibernate.inheritance.strategy}</property>
<property name="springTypesPackage">${application.package}</property>
<property name="daos">${core.generated.dir}</property>
- <property name="dao-impls">${core.manual.dir}</property>
+ <property name="dao-impls">${core.manual.java.dir}</property>
<property name="spring-configuration">${core.generated.dir}</property>
<property name="services">${core.generated.dir}</property>
- <property name="service-impls">${core.manual.dir}</property>
+ <property name="service-impls">${core.manual.java.dir}</property>
<property name="service-interfaces">${common.generated.dir}</property>
<property name="criteria">${common.generated.dir}</property>
<property name="value-objects">${common.generated.dir}</property>
- <property name="enableSpringTransactionsWhenEjbsEnabled">false</property>
+ <property name="enableSpringTransactionsWhenEjbsEnabled">true</property>
<!-- to remove any dependency on EJB, comment the following property -->
<property name="session-ejbs">${core.generated.dir}</property>
<!-- uncomment to enable EJB security
@@ -115,6 +136,7 @@
-->
</properties>
</namespace>
+ <!-- See http://docs.andromda.org/andromda-cartridges/andromda-hibernate-cartridge/namespace.html -->
<namespace name="hibernate">
<properties>
<property name="hibernateEnableCache">false</property>
@@ -125,7 +147,7 @@
<property name="hibernateAggregationCascade">delete</property>
<property name="hibernateDefaultCascade">none</property>
<property name="entities">${core.generated.dir}</property>
- <property name="entity-impls">${core.manual.dir}</property>
+ <property name="entity-impls">${core.manual.java.dir}</property>
<property name="entity-mappings">${core.generated.dir}</property>
<property name="user-types">${core.generated.dir}</property>
<property name="customTypesPackage">${application.package}</property>
@@ -133,32 +155,39 @@
<property name="cache">${core.generated.dir}</property>
</properties>
</namespace>
+ <!-- See http://docs.andromda.org/andromda-cartridges/andromda-java-cartridge/namespace.html -->
<namespace name="java">
<properties>
+ <property name="generateEqualPropertiesMethod">true</property>
<property name="enumerations">${common.generated.dir}</property>
<property name="exceptions">${common.generated.dir}</property>
<property name="value-objects">${common.generated.dir}</property>
<property name="interfaces">${common.generated.dir}</property>
</properties>
</namespace>
- <namespace name="bpm4struts">
+ <!-- See http://docs.andromda.org/andromda-cartridges/andromda-jsf-cartridge/namespace.html -->
+ <namespace name="jsf">
<properties>
- <property name="defaultDateFormat">MM/dd/yyyy</property>
- <property name="normalizeMessages">true</property>
- <property name="forms">${web.generated.dir}</property>
- <property name="pages">${web.generated.dir}</property>
- <property name="actions">${web.generated.dir}</property>
- <property name="controllers">${web.generated.dir}</property>
+ <property name="applicationName">${application.name}</property>
+ <property name="forms">${web.generated.java.dir}</property>
+ <property name="views">${web.generated.web.dir}</property>
+ <property name="managed-beans">${web.gen...
[truncated message content] |