Menu
▾
▴
andromda-cvs — CVS sends an email when a developer commits sth.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(28) |
Mar
(48) |
Apr
(182) |
May
(54) |
Jun
(4) |
Jul
(42) |
Aug
(38) |
Sep
(49) |
Oct
(54) |
Nov
(70) |
Dec
(76) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(249) |
Feb
(417) |
Mar
(898) |
Apr
(436) |
May
(463) |
Jun
(454) |
Jul
(444) |
Aug
(829) |
Sep
(424) |
Oct
(409) |
Nov
(464) |
Dec
(624) |
| 2005 |
Jan
(696) |
Feb
(561) |
Mar
(686) |
Apr
(630) |
May
(613) |
Jun
(577) |
Jul
(511) |
Aug
(389) |
Sep
(374) |
Oct
(357) |
Nov
(891) |
Dec
(819) |
| 2006 |
Jan
(413) |
Feb
(190) |
Mar
(255) |
Apr
(83) |
May
(229) |
Jun
(125) |
Jul
(219) |
Aug
(394) |
Sep
(62) |
Oct
(153) |
Nov
(86) |
Dec
(97) |
| 2007 |
Jan
(239) |
Feb
(97) |
Mar
(60) |
Apr
(73) |
May
(77) |
Jun
(73) |
Jul
(67) |
Aug
(16) |
Sep
(15) |
Oct
(12) |
Nov
(6) |
Dec
(12) |
| 2008 |
Jan
(8) |
Feb
(7) |
Mar
(42) |
Apr
(45) |
May
(16) |
Jun
(1) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
(31) |
Aug
(6) |
Sep
(1) |
Oct
(102) |
Nov
(83) |
Dec
(114) |
| 2010 |
Jan
(132) |
Feb
(83) |
Mar
(62) |
Apr
(63) |
May
(91) |
Jun
(40) |
Jul
(99) |
Aug
(90) |
Sep
(27) |
Oct
(38) |
Nov
(14) |
Dec
(36) |
| 2011 |
Jan
(62) |
Feb
(162) |
Mar
(43) |
Apr
(55) |
May
(60) |
Jun
(30) |
Jul
(22) |
Aug
(3) |
Sep
(3) |
Oct
(37) |
Nov
(8) |
Dec
(2) |
| 2012 |
Jan
(8) |
Feb
(6) |
Mar
(1) |
Apr
(10) |
May
(12) |
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2013 |
Jan
(1) |
Feb
(5) |
Mar
|
Apr
(6) |
May
(3) |
Jun
(10) |
Jul
(7) |
Aug
(10) |
Sep
(8) |
Oct
(2) |
Nov
(7) |
Dec
(3) |
| 2014 |
Jan
(5) |
Feb
(12) |
Mar
|
Apr
(3) |
May
|
Jun
(2) |
Jul
|
Aug
(2) |
Sep
(4) |
Oct
|
Nov
|
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
|
From: <wal...@us...> - 2015-11-24 17:44:40
|
Revision: 15446
http://sourceforge.net/p/andromda/svn/15446
Author: walterim
Date: 2015-11-24 17:44:37 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Adapting the tests to the latest corrections
Modified Paths:
--------------
trunk/cartridges/andromda-spring/src/test/expected/cartridge-output.zip
trunk/cartridges/andromda-spring/src/test/expected/cartridge-outputUML2.zip
Modified: trunk/cartridges/andromda-spring/src/test/expected/cartridge-output.zip
===================================================================
(Binary files differ)
Modified: trunk/cartridges/andromda-spring/src/test/expected/cartridge-outputUML2.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2015-11-24 17:44:10
|
Revision: 15445
http://sourceforge.net/p/andromda/svn/15445
Author: walterim
Date: 2015-11-24 17:44:07 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Allowing the search be cached
Modified Paths:
--------------
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearch.vsl
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearch.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearch.vsl 2015-11-24 17:43:42 UTC (rev 15444)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearch.vsl 2015-11-24 17:44:07 UTC (rev 15445)
@@ -96,6 +96,7 @@
this.configuration = new ${criteriaSearchBaseName}Configuration();
this.resultType = resultTypeIn;
this.rootCriteria = session.createCriteria(this.resultType);
+ this.rootCriteria.setCacheable(true);
this.childCriteriaMap = new HashMap<String, ${hibernateUtils.basePackage}.Criteria>();
this.orderList = new ArrayList<CriteriaSearchParameter>();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2015-11-24 17:43:45
|
Revision: 15444
http://sourceforge.net/p/andromda/svn/15444
Author: walterim
Date: 2015-11-24 17:43:42 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Correcting the evict when the ancestor has associations.
Modified Paths:
--------------
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoBase.vsl
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl 2015-11-24 17:43:10 UTC (rev 15443)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl 2015-11-24 17:43:42 UTC (rev 15444)
@@ -324,7 +324,7 @@
{
criteria.add(Restrictions.ilike("$member.name", example.${member.getterName}(), $matchMode));
}
-#elseif ($member.type.dateType)
+#elseif ($member.type.dateType && $member.type.timeType)
{
// we check whether or not the user supplied time information within this particular date argument
// if he/she didn't we assume he/she wishes to search in the scope of the entire day
@@ -375,6 +375,7 @@
#end
criteria.addOrder(org.hibernate.criterion.Order.asc("${manageable.displayAttribute.name}"));
+ criteria.setCacheable(true);
return criteria.list();
}
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoBase.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoBase.vsl 2015-11-24 17:43:10 UTC (rev 15443)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoBase.vsl 2015-11-24 17:43:42 UTC (rev 15444)
@@ -1,3 +1,15 @@
+##==== Local Macros
+#macro(renderEvictCollection $theEntity)
+#if($theEntity.generalization)
+#renderEvictCollection($theEntity.generalization)
+#end
+#foreach ($sourceEnd in $theEntity.associationEnds)
+#if ($sourceEnd.navigable && $sourceEnd.many)
+ cache.evictCollectionRegion("${sourceEnd.otherEnd.type.fullyQualifiedEntityImplementationName}.${sourceEnd.name}");
+#end
+#end
+#end
+##=========================
#if ($recordType.equalsIgnoreCase("dao"))
#set ($generatedFile = "${entity.packagePath}/${entity.daoBaseName}.java")
#if ($hibernateVersion.startsWith("4"))
@@ -230,8 +242,19 @@
#else
#set ($xmlIndent = "")
#end
+#if($enableCaching)
+#set ($oldXmlIndent = $xmlIndent)
+$oldXmlIndent try{
+#set ($xmlIndent = " $xmlIndent")
+#end
$xmlIndent final Object entity =#if($hibernate4) this.sessionFactory.getCurrentSession()#else this.getHibernateTemplate()#end.get(${entity.fullyQualifiedEntityImplementationName}.class, $argument);
$xmlIndent return transformEntity(transform, ($entity.fullyQualifiedName)entity);
+#if($enableCaching)
+$oldXmlIndent }catch(org.hibernate.WrongClassException exc){
+$oldXmlIndent //No display error message caused by the cache L2 hibernate as stated in https://hibernate.atlassian.net/browse/HHH-4953 and https://hibernate.atlassian.net/browse/HHH-9028
+$oldXmlIndent return null;
+$oldXmlIndent }
+#end
#if ($hibernateUtils.xmlPersistenceActive)
}
#end
@@ -299,6 +322,7 @@
criteria.setFirstResult(this.calculateFirstResult(pageNumber, pageSize));
criteria.setMaxResults(pageSize);
}
+ criteria.setCacheable(true);
final java.util.Collection#if($enableTemplating)<?>#end results = criteria.list();
this.transformEntities(transform, results);
return results;
@@ -311,6 +335,7 @@
criteria.setFirstResult(this.calculateFirstResult(pageNumber, pageSize));
criteria.setMaxResults(pageSize);
}
+ criteria.setCacheable(true);
final java.util.Collection#if($enableTemplating)<?>#end results = criteria.list();
this.transformEntities(transform, results);
return results;
@@ -338,7 +363,21 @@
return firstResult;
}
+#if($enableCaching)
/**
+ * evict all the dependent collections to avoid 'id not found' refers to https://hibernate.atlassian.net/browse/HHH-4910
+ * should not be generated when using hibernate annotations
+ */
+ protected void evictAllReferencingCollections()
+ {
+ final org.hibernate.Cache cache=this.sessionFactory.getCache();
+ if(cache != null){
+#renderEvictCollection($entity)
+ }
+ }
+
+#end
+ /**
* prePersist event - This method is called before creating the entity
* @param $argumentName $entity.fullyQualifiedName
*/
@@ -523,6 +562,12 @@
//prePersist event
_prePersist($argumentName);
+#if($enableCaching)
+ //evict all the dependent collections to avoid 'id not found' refers to https://hibernate.atlassian.net/browse/HHH-4910
+ //should not be generated when using hibernate annotations
+ evictAllReferencingCollections();
+
+#end
#if ($hibernateUtils.xmlPersistenceActive)
#set ($identifierProperty = "identifier")
#if($identifierTypePrimitive)
@@ -716,6 +761,12 @@
//preUpdate event
_preUpdate($argumentName);
+#if($enableCaching)
+ //evict all the dependent collections to avoid 'id not found' refers to https://hibernate.atlassian.net/browse/HHH-4910
+ //should not be generated when using hibernate annotations
+ evictAllReferencingCollections();
+
+#end
#if($hibernate4) this.sessionFactory.getCurrentSession()#else this.getHibernateTemplate()#end.update($argumentName);
//postUpdate event
@@ -815,7 +866,13 @@
//preRemove event
_preRemove($argumentName);
- #if($hibernate4) this.sessionFactory.getCurrentSession()#else this.getHibernateTemplate()#end.delete($argumentName);
+#if($enableCaching)
+ //evict all the dependent collections to avoid 'id not found' refers to https://hibernate.atlassian.net/browse/HHH-4910
+ //should not be generated when using hibernate annotations
+ evictAllReferencingCollections();
+
+#end
+ #if($hibernate4) this.sessionFactory.getCurrentSession()#else this.getHibernateTemplate()#end.delete($argumentName);
//postRemove event
_postRemove($argumentName);
@@ -899,6 +956,12 @@
//preRemove event
_preRemove(entity);
+#if($enableCaching)
+ //evict all the dependent collections to avoid 'id not found' refers to https://hibernate.atlassian.net/browse/HHH-4910
+ //should not be generated when using hibernate annotations
+ evictAllReferencingCollections();
+
+#end
#if($hibernate4) this.sessionFactory.getCurrentSession()#else this.getHibernateTemplate()#end.delete(entity);
//postRemove event
@@ -1137,9 +1200,9 @@
#if ($enableTemplating)
$h3tab @SuppressWarnings({ "unchecked", "rawtypes" })
#end
-$h3tab java.util.Set results = new java.util.LinkedHashSet(queryObject.list());
+$h3tab java.util.Set results = new java.util.LinkedHashSet(queryObject.setCacheable(true).list());
#else
-$h3tab java.util.List results = queryObject.list();
+$h3tab java.util.List results = queryObject.setCacheable(true).list();
#end
#if (!($finder.returnType.collectionType || $finder.many))
$h3tab Object result = null;
@@ -1826,7 +1889,7 @@
final int transform, int pageNumber, int pageSize)
{
#if ($hibernate4)
- final ${hibernateUtils.basePackage}.ScrollableResults scrollableResults = queryObject.scroll();
+ final ${hibernateUtils.basePackage}.ScrollableResults scrollableResults = queryObject.setCacheable(true).scroll();
scrollableResults.last();
int totalCount = scrollableResults.getRowNumber();
totalCount = totalCount >= 0 ? totalCount + 1 : 0;
@@ -1839,7 +1902,7 @@
#if ($enableTemplating)
@SuppressWarnings("rawtypes")
#end
- java.util.Collection results = new java.util.ArrayList(queryObject.list());
+ java.util.Collection results = new java.util.ArrayList(queryObject.setCacheable(true).list());
transformEntities(transform, results);
return new ${fullyQualifiedPagingResultName}(results.toArray(new Object[results.size()]), totalCount);
#else
@@ -1855,7 +1918,7 @@
queryObject.setMaxResults(pageSize);
}
// Unchecked transformation because Set object is reused, cannot be strongly typed.
- java.util.Collection results = new java.util.ArrayList(queryObject.list());
+ java.util.Collection results = new java.util.ArrayList(queryObject.setCacheable(true).list());
transformEntities(transform, results);
return new ${fullyQualifiedPagingResultName}(results.toArray(new Object[results.size()]), totalCount);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2015-11-24 17:43:12
|
Revision: 15443
http://sourceforge.net/p/andromda/svn/15443
Author: walterim
Date: 2015-11-24 17:43:10 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Correcting the context variable name
Modified Paths:
--------------
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext.xml.vsl
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext.xml.vsl 2015-11-24 17:42:30 UTC (rev 15442)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext.xml.vsl 2015-11-24 17:43:10 UTC (rev 15443)
@@ -99,7 +99,7 @@
<prop key="hibernate.query.substitutions">$hibernateQuerySubstitutions</prop>
#end
#if ($enableCaching)
- <prop key="hibernate.cache.use_query_cache">$hibernateEnableCache</prop>
+ <prop key="hibernate.cache.use_query_cache">$enableCaching</prop>
#end
#if ($stringUtils.isNotBlank($hibernateCacheProvider))
<prop key="hibernate.cache.provider_class">$hibernateCacheProvider</prop>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2015-11-24 17:42:32
|
Revision: 15442
http://sourceforge.net/p/andromda/svn/15442
Author: walterim
Date: 2015-11-24 17:42:30 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Correction in autocomplete behavior when using two words in search
Modified Paths:
--------------
trunk/cartridges/andromda-jsf2/src/main/resources/resources/components/primefaces/autoCompleteNew.xhtml
Modified: trunk/cartridges/andromda-jsf2/src/main/resources/resources/components/primefaces/autoCompleteNew.xhtml
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/resources/resources/components/primefaces/autoCompleteNew.xhtml 2015-11-24 17:41:42 UTC (rev 15441)
+++ trunk/cartridges/andromda-jsf2/src/main/resources/resources/components/primefaces/autoCompleteNew.xhtml 2015-11-24 17:42:30 UTC (rev 15442)
@@ -30,7 +30,7 @@
<c:set var="valueSetter" value="#{baseName}_setValue" />
<p:panelGrid columns="2" rendered="#{cc.attrs.rendered}" styleClass="padding_autocompletenew">
<p:autoComplete id="autoComplete" value="#{cc.attrs.value}" label="#{cc.attrs.label}" completeMethod="#{cc.attrs.completeMethod}" required="#{cc.attrs.required}"
- var="#{cc.attrs.var}" itemValue="#{cc.attrs.itemValue}" itemLabel="#{cc.attrs.itemLabel}" dropdown="true" multiple="#{cc.attrs.multiple}" forceSelection="#{cc.attrs.forceSelection}"
+ var="#{cc.attrs.var}" itemValue="#{cc.attrs.itemValue}" itemLabel="#{cc.attrs.itemLabel}" dropdown="#{not cc.attrs.readonly}" multiple="#{cc.attrs.multiple}" forceSelection="#{cc.attrs.forceSelection}"
queryDelay="#{cc.attrs.queryDelay}" readonly="#{cc.attrs.readonly}">
<f:converter converterId="#{cc.attrs.converter}" />
<cc:insertChildren />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2015-11-24 17:41:44
|
Revision: 15441
http://sourceforge.net/p/andromda/svn/15441
Author: walterim
Date: 2015-11-24 17:41:42 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Creating default index names
Modified Paths:
--------------
trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate3/usertypes/HibernateEnumType.vsl
trunk/cartridges/andromda-hibernate/src/test/expected/cartridge-output.zip
trunk/cartridges/andromda-hibernate/src/test/expected/cartridge-outputUML2.zip
Modified: trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate3/usertypes/HibernateEnumType.vsl
===================================================================
--- trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate3/usertypes/HibernateEnumType.vsl 2015-11-24 17:41:24 UTC (rev 15440)
+++ trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate3/usertypes/HibernateEnumType.vsl 2015-11-24 17:41:42 UTC (rev 15441)
@@ -22,8 +22,13 @@
* A Hibernate UserType for Java5 enumerations. Taken from
* <a href="http://www.hibernate.org/272.html">Java 5 EnumUserType</a>.
*/
-public class $className implements EnhancedUserType, ParameterizedType
+public class $className implements Serializable, EnhancedUserType, ParameterizedType
{
+ /**
+ * The serial version UID of this class. Needed for serialization.
+ */
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings({ "rawtypes" })
private Class<Enum> enumClass;
Modified: trunk/cartridges/andromda-hibernate/src/test/expected/cartridge-output.zip
===================================================================
(Binary files differ)
Modified: trunk/cartridges/andromda-hibernate/src/test/expected/cartridge-outputUML2.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2015-11-24 17:41:26
|
Revision: 15440
http://sourceforge.net/p/andromda/svn/15440
Author: walterim
Date: 2015-11-24 17:41:24 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Creating default index names
Modified Paths:
--------------
trunk/cartridges/andromda-hibernate/src/main/java/org/andromda/cartridges/hibernate/metafacades/HibernateAssociationEndLogicImpl.java
trunk/cartridges/andromda-hibernate/src/main/java/org/andromda/cartridges/hibernate/metafacades/HibernateEntityLogicImpl.java
Modified: trunk/cartridges/andromda-hibernate/src/main/java/org/andromda/cartridges/hibernate/metafacades/HibernateAssociationEndLogicImpl.java
===================================================================
--- trunk/cartridges/andromda-hibernate/src/main/java/org/andromda/cartridges/hibernate/metafacades/HibernateAssociationEndLogicImpl.java 2015-03-13 14:48:59 UTC (rev 15439)
+++ trunk/cartridges/andromda-hibernate/src/main/java/org/andromda/cartridges/hibernate/metafacades/HibernateAssociationEndLogicImpl.java 2015-11-24 17:41:24 UTC (rev 15440)
@@ -849,4 +849,31 @@
}
return owning;
}
+
+
+
+ /**
+ * returns a default index name
+ */
+ @Override
+ public String getColumnIndex()
+ {
+ String returnValue = super.getColumnIndex();
+
+ HibernateEntityLogicImpl entity=(HibernateEntityLogicImpl)this.getOtherEnd().getType();
+
+ if(returnValue == null){
+ final String sufix=entity.nextIndexSuffix();
+ returnValue = EntityMetafacadeUtils.getSqlNameFromTaggedValue(
+ entity.getTableName(),
+ this,
+ UMLProfile.TAGGEDVALUE_PERSISTENCE_COLUMN,
+ (short)30, // d\xE1 pau - Short.valueOf((String)this.getConfiguredProperty(UMLMetafacadeProperties.MAX_SQL_NAME_LENGTH)),
+ sufix,
+ this.getConfiguredProperty(UMLMetafacadeProperties.SQL_NAME_SEPARATOR),
+ this.getConfiguredProperty(UMLMetafacadeProperties.SHORTEN_SQL_NAMES_METHOD));
+ }
+
+ return returnValue;
+ }
}
\ No newline at end of file
Modified: trunk/cartridges/andromda-hibernate/src/main/java/org/andromda/cartridges/hibernate/metafacades/HibernateEntityLogicImpl.java
===================================================================
--- trunk/cartridges/andromda-hibernate/src/main/java/org/andromda/cartridges/hibernate/metafacades/HibernateEntityLogicImpl.java 2015-03-13 14:48:59 UTC (rev 15439)
+++ trunk/cartridges/andromda-hibernate/src/main/java/org/andromda/cartridges/hibernate/metafacades/HibernateEntityLogicImpl.java 2015-11-24 17:41:24 UTC (rev 15440)
@@ -869,4 +869,12 @@
{
return ObjectUtils.toString(this.getConfiguredProperty(SEQUENCE_IDENTIFIER_SUFFIX));
}
+
+ //keeps fk index unique
+ int lastIndexCounter=1;
+
+ protected String nextIndexSuffix(){
+ lastIndexCounter++;
+ return String.valueOf(lastIndexCounter);
+ }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2015-03-13 14:49:13
|
Revision: 15439
http://sourceforge.net/p/andromda/svn/15439
Author: walterim
Date: 2015-03-13 14:48:59 +0000 (Fri, 13 Mar 2015)
Log Message:
-----------
Better support to master/detail
Modified Paths:
--------------
trunk/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityLogicImpl.java
trunk/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml
trunk/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/namespace.xml
trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl
trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/SearchFilter.java.vsl
trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/crud/Form.java.vsl
trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/primefaces/crud/view.xhtml.vsl
trunk/cartridges/andromda-jsf2/src/uml2/JSF2MetafacadeModel.uml
trunk/cartridges/andromda-jsf2/src/uml2/JSF2MetafacadeModel.xml.zip
trunk/cartridges/andromda-jsf2/src/uml2/org.andromda.profile.andromda-meta.profile.uml
Added Paths:
-----------
trunk/cartridges/andromda-jsf2/src/uml2/UML_Standard_Profile.Dependency_Matrix_Profile.profile.uml
trunk/cartridges/andromda-jsf2/src/uml2/UML_Standard_Profile.MagicDraw_Profile.DSL_Customization.profile.uml
trunk/cartridges/andromda-jsf2/src/uml2/UML_Standard_Profile.MagicDraw_Profile.Traceability_customization.profile.uml
trunk/cartridges/andromda-jsf2/src/uml2/UML_Standard_Profile.MagicDraw_Profile.profile.uml
trunk/cartridges/andromda-jsf2/src/uml2/UML_Standard_Profile.StandardProfileL2.profile.uml
trunk/cartridges/andromda-jsf2/src/uml2/UML_Standard_Profile.StandardProfileL3.profile.uml
trunk/cartridges/andromda-jsf2/src/uml2/UML_Standard_Profile.Validation_Profile.profile.uml
Modified: trunk/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityLogicImpl.java
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityLogicImpl.java 2015-03-13 14:48:06 UTC (rev 15438)
+++ trunk/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityLogicImpl.java 2015-03-13 14:48:59 UTC (rev 15439)
@@ -8,6 +8,7 @@
import org.andromda.cartridges.jsf2.JSFGlobals;
import org.andromda.cartridges.jsf2.JSFProfile;
import org.andromda.cartridges.jsf2.JSFUtils;
+import org.andromda.metafacades.uml.UMLProfile;
import org.andromda.metafacades.uml.DependencyFacade;
import org.andromda.metafacades.uml.ManageableEntityAssociationEnd;
import org.andromda.metafacades.uml.ManageableEntityAttribute;
@@ -552,7 +553,7 @@
{
for(ManageableEntityAttribute attr: getManageableAttributes())
{
- if(attr.isDisplay() && !attr.getType().isBlobType())
+ if(attr.isDisplay() && !attr.getType().isBlobType() && !attr.getType().isClobType())
{
searchAttributes.add((JSFManageableEntityAttribute)attr);
}
@@ -871,4 +872,25 @@
}
return editAttributes;
}
+
+ /**
+ * @return manageableDetailsAssociations
+ * @see org.andromda.cartridges.jsf2.metafacades.JSFManageableEntity#getManageableDetailsAssociations()
+ */
+ @Override
+ protected Collection<ManageableEntityAssociationEnd> handleGetManageableDetailsAssociationsEnds()
+ {
+ final Collection<ManageableEntityAssociationEnd> manageableDetailsAssociationsEnds = new ArrayList<ManageableEntityAssociationEnd>();
+
+ for(ManageableEntityAssociationEnd associationEnd: (Collection<ManageableEntityAssociationEnd>)this.getManageableAssociationEnds())
+ {
+ if(associationEnd.isMany() && associationEnd.getType().hasStereotype(UMLProfile.STEREOTYPE_MANAGEABLE) &&
+ associationEnd.getOtherEnd().isNavigable() && associationEnd.getOtherEnd().isComposition())
+ {
+ manageableDetailsAssociationsEnds.add(associationEnd);
+ }
+ }
+
+ return manageableDetailsAssociationsEnds;
+ }
}
Modified: trunk/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml 2015-03-13 14:48:06 UTC (rev 15438)
+++ trunk/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml 2015-03-13 14:48:59 UTC (rev 15439)
@@ -71,6 +71,7 @@
<property reference="controllerScope"/>
<property reference="navigationBeanScope"/>
<property reference="trimInputStrings"/>
+ <property reference="crudDetailsSuffix"/>
<!-- cartridge-property merge-point -->
Modified: trunk/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/namespace.xml
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/namespace.xml 2015-03-13 14:48:06 UTC (rev 15438)
+++ trunk/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/namespace.xml 2015-03-13 14:48:59 UTC (rev 15439)
@@ -531,6 +531,12 @@
The suffix to append to the names of generated value objects used in CRUD (manageable entities).
</documentation>
</property>
+ <property name="crudDetailsSuffix">
+ <default>Details</default>
+ <documentation>
+ The suffix to append to the names of generated details (in compositions) elements used in CRUD (manageable entities).
+ </documentation>
+ </property>
<property name="crudConfirmationMessages">
<default>true</default>
<documentation>
@@ -538,7 +544,7 @@
</documentation>
</property>
<property name="trimInputStrings">
- <default>true</default>
+ <default>false</default>
<documentation>
Trim form entered strings;
</documentation>
Modified: trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl 2015-03-13 14:48:06 UTC (rev 15438)
+++ trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl 2015-03-13 14:48:59 UTC (rev 15439)
@@ -21,6 +21,8 @@
#set($identifierType = $manageable.fullyQualifiedIdentifierTypeName)
#end
#end
+import org.primefaces.component.datatable.DataTable;
+
/**
* Java Server Faces Controller of the ${manageable.name} CRUD management.
*/
@@ -144,9 +146,22 @@
form.${member.setterName}(vo.${member.getterName}());
#end
+#foreach ($member in $manageable.manageableDetailsAssociationsEnds)
+#set($loadDetailMethodName = "load${stringUtils.upperCamelCaseName(${member.name})}${crudDetailsSuffix}")
+ ${loadDetailMethodName}(${manageable.identifierName});
+#end
+
form.setEditState(true);
}
+#foreach ($member in $manageable.manageableDetailsAssociationsEnds)
+#set($loadDetailMethodName = "load${stringUtils.upperCamelCaseName($member.name)}${crudDetailsSuffix}")
+ public void ${loadDetailMethodName}(${identifierType} ${manageable.identifierName}) throws Exception
+ {
+ this.getForm().${member.setterName}${crudDetailsSuffix}(${member.type.manageablePackageName}.${member.type.controllerName}.instance().readByFilter("${member.otherEnd.name}", ${manageable.identifierName}));
+ }
+
+#end
/**
* The cancel edit action
*
@@ -235,7 +250,11 @@
form.${member.setterName}(null);
#end
#end
-
+#if (!$manageable.manageableDetailsAssociationsEnds.empty)
+#foreach ($member in $manageable.manageableDetailsAssociationsEnds)
+ form.${member.setterName}${crudDetailsSuffix}(null);
+#end
+#end
//is it filtered? if so, set the property with the filter value
final String filterAttribute=this.getFilterAttribute();
if(filterAttribute != null)
@@ -380,10 +399,22 @@
this.setLastPostedFormClientId(FORM_BEAN_NAME);
final ${manageable.formBeanType} form = this.getForm();
this.doSearch(form);
+ setResultToFirstPage();
return null;
}
+ private static final String DATA_TABLE_SEARCH_NAME="searchResult";
+
/**
+ * Sets the resulta datatable to the first page
+ */
+ protected void setResultToFirstPage(){
+ //Set page to 0 after call search
+ DataTable dataTable = (DataTable) JsfUtils.findComponentInRoot(":"+FORM_BEAN_NAME+":"+DATA_TABLE_SEARCH_NAME);
+ dataTable.setFirst(0);
+ }
+
+ /**
* Executes the search action.
*
* @param form the associated form
@@ -565,10 +596,11 @@
public java.util.Collection<${manageable.valueObjectClassName}> readByFilter(${manageable.searchFilterName} filter) throws Exception
{
final $searchExampleClassName searchExample = new ${searchExampleClassName}();
-#foreach ($member in $manageable.manageableMembers)
-#if (!$member.inputFile && !$member.needsFileUpload)
- searchExample.${member.setterName}(filter.${member.getterName}());
+#foreach ($field in $manageable.manageableSearchAttributes)
+ searchExample.${field.setterName}(filter.${field.getterName}());
#end
+#foreach ($member in $manageable.manageableAssociationEnds)
+ searchExample.${member.setterName}(filter.${member.getterName}());
#end
final java.util.Collection<${manageable.valueObjectClassName}> result = ${manageable.manageableServiceAccessorCall}.searchByExample(searchExample);
Modified: trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/SearchFilter.java.vsl
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/SearchFilter.java.vsl 2015-03-13 14:48:06 UTC (rev 15438)
+++ trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/SearchFilter.java.vsl 2015-03-13 14:48:59 UTC (rev 15439)
@@ -28,8 +28,7 @@
*/
private static final long serialVersionUID = ${manageable.searchFilterSerialVersionUID}L;
-#foreach ($field in $manageable.manageableAttributes)
-#if (!$field.inputFile && !$field.needsFileUpload)
+#foreach ($field in $manageable.manageableSearchAttributes)
#setFieldWrapperTypeName($field $fieldWrapperTypeName)
private $fieldWrapperTypeName $field.name=null;
@@ -68,7 +67,6 @@
#end
#end
-#end
#foreach ($member in $manageable.manageableAssociationEnds)
#setAssociatonEndType($member $fieldType $fieldTypeName)
private $fieldTypeName $member.name;
@@ -105,18 +103,24 @@
#end
public ${manageable.searchFilterName} loadFromStringsMap(final java.util.Map<String,String> source)
{
-#foreach ($field in $manageable.manageableMembers)
+#foreach ($field in $manageable.manageableSearchAttributes)
if(source.containsKey("${field.name}"))
{
this.${field.setterName}(source.get("${field.name}"));
}
+#end
+#foreach ($member in $manageable.manageableAssociationEnds)
+ if(source.containsKey("${member.name}"))
+ {
+ this.${member.setterName}(source.get("${member.name}"));
+ }
#end
return this;
}
public ${manageable.searchFilterName} loadFromObjectsMap(final java.util.Map<String,Object> source)
{
-#foreach ($field in $manageable.manageableAttributes)
+#foreach ($field in $manageable.manageableSearchAttributes)
#setFieldWrapperTypeName($field $fieldWrapperTypeName)
if(source.containsKey("${field.name}"))
{
Modified: trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/crud/Form.java.vsl
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/crud/Form.java.vsl 2015-03-13 14:48:06 UTC (rev 15438)
+++ trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/crud/Form.java.vsl 2015-03-13 14:48:59 UTC (rev 15439)
@@ -189,8 +189,8 @@
#end
#if (!$manageable.manageableAssociationEnds.empty)
-
// Manageable associationEnds in $manageable.name
+
#end
#foreach ($member in $manageable.manageableAssociationEnds)
#if($member.type.manageable)
@@ -258,7 +258,31 @@
}
#end
+ // Master/detail view helpers
+#foreach ($member in $manageable.manageableDetailsAssociationsEnds)
+#set($fullyQualifiedDetailValueObjectName = "${member.type.manageablePackageName}.${member.type.valueObjectClassName}")
+#set($detailsCollectionType="java.util.Collection<${fullyQualifiedDetailValueObjectName}>")
+#set($detailsName="${member.name}${crudDetailsSuffix}")
+ private $detailsCollectionType $detailsName;
+
+ /**
+ * The collection of ${fullyQualifiedDetailValueObjectName}.
+ */
+ public $detailsCollectionType ${member.getterName}${crudDetailsSuffix}()
+ {
+ return this.$detailsName;
+ }
+
+ /**
+ * The collection of ${fullyQualifiedDetailValueObjectName}.
+ */
+ public void ${member.setterName}${crudDetailsSuffix}($detailsCollectionType ${detailsName}In)
+ {
+ this.$detailsName = ${detailsName}In;
+ }
+
+#end
#renderCopyFrom($manageable.formBeanClassName $manageable.manageableAttributes $manageable.manageableAssociationEnds)
/**
Modified: trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/primefaces/crud/view.xhtml.vsl
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/primefaces/crud/view.xhtml.vsl 2015-03-13 14:48:06 UTC (rev 15438)
+++ trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/primefaces/crud/view.xhtml.vsl 2015-03-13 14:48:59 UTC (rev 15439)
@@ -210,21 +210,22 @@
## master/detail
#if($field.otherEnd.navigable && $field.otherEnd.composition && $field.many)
#set($detailManageable = $field.type)
+#set($loadDetailMethodName = "load${stringUtils.upperCamelCaseName($field.name)}${crudDetailsSuffix}")
<p:outputLabel id="${field.name}_table_label" for="${field.name}_table" value="#{messages['$field.messageKey']}:"/>
- <p:dataTable id="${field.name}_table" var="row" value="#{${detailManageable.controllerBeanName}.readByFilter('${field.otherEnd.name}',${formName}.${manageable.identifierName})}" rows="10" paginator="true" paginatorPosition="top" paginatorAlwaysVisible="false" emptyMessage="#{messages['empty.result.set']}">
+ <p:dataTable id="${field.name}_table" var="row" value="#{${formName}.${field.name}${crudDetailsSuffix}}" rows="10" paginator="true" paginatorPosition="top" paginatorAlwaysVisible="false" emptyMessage="#{messages['empty.result.set']}">
<p:column style="width:0px;">
<p:panelGrid columns="2">
<p:commandButton id="loadAction" icon="ui-icon-pencil" title="#{messages['action.edit']}" immediate="true" process="@this" update="@form"
onclick="${formName}_${field.name}_dialog_show('${detailManageable.actionFullPath}.${facesServletExtension}?_useCaseParameter._dialog=true&_useCaseParameter._crudAction=edit&_useCaseParameter.editId=#{row.${detailManageable.identifierName}}&_useCaseParameter.filterAttribute=${field.otherEnd.name}&_useCaseParameter.filterValue=#{${formName}.${manageable.identifierName}}',${field.name}_tableUpdate); return false;"/>
- <p:commandButton id="deleteAction" icon="ui-icon-trash" title="#{messages['action.delete']}" action="#{${detailManageable.controllerBeanName}.delete(row.${detailManageable.identifierName})}" immediate="true" process="@this" update="${field.name}_table"
- onclick="return confirm('#{messages['confirm.delete.this']} #{messages['${detailManageable.viewTitleKey}']}');" />
+ <p:commandButton id="deleteAction" icon="ui-icon-trash" title="#{messages['action.delete']}" actionListener="#{${detailManageable.controllerBeanName}.delete(row.${detailManageable.identifierName})}" immediate="true" process="@this" update="${field.name}_table"
+ action="#{${manageable.controllerBeanName}.${loadDetailMethodName}(${formName}.${manageable.identifierName})}" onclick="return confirm('#{messages['confirm.delete.this']} #{messages['${detailManageable.viewTitleKey}']}');" />
</p:panelGrid>
</p:column>
#renderTableColumnsPrimeFaces($detailManageable " ")
</p:dataTable>
<p:panelGrid columns="3">
<ajsfc:useCaseDialog id="${field.name}_dialog"/>
- <p:remoteCommand name="${field.name}_tableUpdate" update="${field.name}_table" immediate="true" global="false"/>
+ <p:remoteCommand name="${field.name}_tableUpdate" update="${field.name}_table" immediate="true" global="false" actionListener="#{${manageable.controllerBeanName}.${loadDetailMethodName}(${formName}.${manageable.identifierName})}"/>
<p:commandButton id="${field.name}_newAction" icon="ui-icon-plus" title="#{messages['action.new']}" immediate="true" process="@this" update="@form"
onclick="if(_crudCheckCurrentSaved(#{${formName}.${manageable.identifierName}})) ${formName}_${field.name}_dialog_show('${detailManageable.actionFullPath}.${facesServletExtension}?_useCaseParameter._dialog=true&_useCaseParameter._crudAction=create&_useCaseParameter.filterAttribute=${field.otherEnd.name}&_useCaseParameter.filterValue=#{${formName}.${manageable.identifierName}}',${field.name}_tableUpdate); return false;"/>
</p:panelGrid>
Modified: trunk/cartridges/andromda-jsf2/src/uml2/JSF2MetafacadeModel.uml
===================================================================
--- trunk/cartridges/andromda-jsf2/src/uml2/JSF2MetafacadeModel.uml 2015-03-13 14:48:06 UTC (rev 15438)
+++ trunk/cartridges/andromda-jsf2/src/uml2/JSF2MetafacadeModel.uml 2015-03-13 14:48:59 UTC (rev 15439)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:MagicDrawProfile="http:///schemas/MagicDrawProfile/_L4VsMKtREeKjhumzzu9zmg/0" xmlns:Standard="http://www.eclipse.org/uml2/schemas/Standard/1" xmlns:andromdameta="http:///schemas/andromdameta/_L4O-gKtREeKjhumzzu9zmg/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/2.0.0/UML" xsi:schemaLocation="http:///schemas/MagicDrawProfile/_L4VsMKtREeKjhumzzu9zmg/0 UML_Standard_Profile.MagicDraw_Profile.profile.uml#_L4doZKtREeKjhumzzu9zmg http://www.eclipse.org/uml2/schemas/Standard/1 pathmap://UML_PROFILES/Standard.profile.uml#_yzU58YinEdqtvbnfB2L_5w http:///schemas/andromdameta/_L4O-gKtREeKjhumzzu9zmg/0 org.andromda.profile.andromda-meta.profile.uml#_L4eQiatREeKjhumzzu9zmg">
+<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:MagicDrawProfile="http:///schemas/MagicDrawProfile/_f87PwDtQEeSWJepu4WCdUQ/0" xmlns:Standard="http://www.eclipse.org/uml2/schemas/Standard/1" xmlns:andromdameta="http:///schemas/andromdameta/_f8bggDtQEeSWJepu4WCdUQ/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/2.0.0/UML" xsi:schemaLocation="http:///schemas/MagicDrawProfile/_f87PwDtQEeSWJepu4WCdUQ/0 UML_Standard_Profile.MagicDraw_Profile.profile.uml#_f9hsvDtQEeSWJepu4WCdUQ http://www.eclipse.org/uml2/schemas/Standard/1 pathmap://UML_PROFILES/Standard.profile.uml#_yzU58YinEdqtvbnfB2L_5w http:///schemas/andromdameta/_f8bggDtQEeSWJepu4WCdUQ/0 org.andromda.profile.andromda-meta.profile.uml#_f9zZlTtQEeSWJepu4WCdUQ">
<uml:Model xmi:id="eee_1045467100313_135436_1" name="JSFMetafacadeModel" viewpoint="">
<ownedComment xmi:id="_d860307_1071503001754_461086_1" body="Author:BohlenMa.
Created:15.12.03 16:37.
Title:.
Comment:.
" annotatedElement="eee_1045467100313_135436_1"/>
<packageImport xmi:id="_0primitiveTypesJSFMetafacadeModel">
@@ -8,370 +8,1138 @@
<packageImport xmi:id="_0javaPrimitiveTypesJSFMetafacadeModel">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/JavaPrimitiveTypes.library.uml#_0"/>
</packageImport>
- <packagedElement xmi:type="uml:Package" xmi:id="magicdraw_uml_standard_profile_v_0001" name="UML Standard Profile">
- <ownedComment xmi:id="_be00301_1078843546940_242228_131" body="UML Standard Profile contains UML metamodel (metaclasses without properties and associations), StandardProfileL2 and StandardProfileL3 from UML specification, Standard UML stereotypes defined in annex C of UML specification.
Profile also includes validation suites for UML model correctness and completeness checking, and stereotypes used by MagicDraw internally." annotatedElement="magicdraw_uml_standard_profile_v_0001"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_17_0_6_8fd0290_1366636810498_634162_2802" name="org.andromda.profile"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_24400562_1073745791623_230940_134" name="org.andromda.cartridges.jsf2.metafacades">
+ <packagedElement xmi:type="uml:Class" xmi:id="_9_0_2_12ab03bf_1120956099656_251066_301" name="JSFControllerOperation">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1120969117906_808687_317" body="Represents an operation for a JSF controller." annotatedElement="_9_0_2_12ab03bf_1120956099656_251066_301"/>
+ <generalization xmi:id="_9_0_2_12ab03bf_1121019457671_962712_422" isSubstitutable="true" general="_9_0_2_12ab03bf_1120167314500_763531_126"/>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121019745203_606691_433" name="fullyQualifiedFormPath" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121019747078_577343_438" body="The fully qualified path of the form file." annotatedElement="_9_0_2_12ab03bf_1121019745203_606691_433"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121017764781_105569_337" name="fullyQualifiedFormName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121019061562_14614_349" body="The fully qualified form name." annotatedElement="_9_0_2_12ab03bf_1121017764781_105569_337"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121017764781_596416_335" name="formName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121019061562_349656_345" body="The form name the corresponds to this controller operation." annotatedElement="_9_0_2_12ab03bf_1121017764781_596416_335"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121700242687_801430_0" name="formCall" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121700248234_547858_6" body="The operation call that takes the appropriate form as an argument." annotatedElement="_9_0_2_12ab03bf_1121700242687_801430_0"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121700846250_486084_93" name="formSignature" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121700872609_775573_97" body="The controller operation signature that takes the appropriate form (if this operation has at least one form field) as an argument." annotatedElement="_9_0_2_12ab03bf_1121700846250_486084_93"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121967378640_829452_494" name="implementationFormSignature" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121967380656_623663_497" body="The controller implementation operation signature that takes the appropriate form (if this operation has at least one form field) as an argument." annotatedElement="_9_0_2_12ab03bf_1121967378640_829452_494"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_9_0_2_12ab03bf_1121046740953_610306_551" name="JSFView">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121046951000_751132_580" body="Represents a JSF view for a front-end application." annotatedElement="_9_0_2_12ab03bf_1121046740953_610306_551"/>
+ <generalization xmi:id="_9_0_2_12ab03bf_1121046775140_418797_567" isSubstitutable="true" general="_9_0_2_12ab03bf_1122481800031_890384_216"/>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121046822515_410382_578" name="path" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121046951000_361648_582" body="The full path of the view resources (i.e. the JSP page)." annotatedElement="_9_0_2_12ab03bf_1121046822515_410382_578"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121885608703_410931_250" name="titleKey" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121885618515_456879_254" body="A resource message key suited for the view's title." annotatedElement="_9_0_2_12ab03bf_1121885608703_410931_250"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121885672234_377698_255" name="titleValue" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121885673812_873197_258" body="A default resource message value suited for the page's title." annotatedElement="_9_0_2_12ab03bf_1121885672234_377698_255"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121885904734_796044_259" name="messageKey" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121885914187_173556_262" body="The default resource message key for this view." annotatedElement="_9_0_2_12ab03bf_1121885904734_796044_259"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121886034390_196077_263" name="documentationKey" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121886036296_490729_266" body="A resource message key suited for the page's documentation." annotatedElement="_9_0_2_12ab03bf_1121886034390_196077_263"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121886320515_981486_267" name="documentationValue" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121886325343_636189_272" body="A resource message value suited for the view's documentation." annotatedElement="_9_0_2_12ab03bf_1121886320515_981486_267"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121886320515_76042_268" name="messageValue" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121886325343_484931_274" body="A displayable version of this view's name." annotatedElement="_9_0_2_12ab03bf_1121886320515_76042_268"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1124055484000_615403_182" name="fullyQualifiedPopulator" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1124055513796_95259_194" body="The fully qualified name of this view's form populator." annotatedElement="_9_0_2_12ab03bf_1124055484000_615403_182"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1124055509796_908228_184" name="populator" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1124055513796_23781_196" body="The name of the form populator for this view." annotatedElement="_9_0_2_12ab03bf_1124055509796_908228_184"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1124058224218_894259_268" name="populatorPath" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1124058448515_240905_271" body="The path to the form populator." annotatedElement="_9_0_2_12ab03bf_1124058224218_894259_268"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1124230508234_910453_166" name="populatorRequired" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1124230509875_806767_176" body="Indicates if a populator is required for this view." annotatedElement="_9_0_2_12ab03bf_1124230508234_910453_166"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1124746809218_235066_259" name="validationRequired" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1124746811906_643906_262" body="Indicates whether or not at least one parameter of an outgoing action in this view requires validation." annotatedElement="_9_0_2_12ab03bf_1124746809218_235066_259"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1125759702843_45836_150" name="popup" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1125759704578_229200_153" body="Indicates if this view represents a popup." annotatedElement="_9_0_2_12ab03bf_1125759702843_45836_150"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1126222601984_842519_0" name="nonTableVariablesPresent" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1126222604015_885887_16" body="Indicates whether or not any non-table view variables are present in this view." annotatedElement="_9_0_2_12ab03bf_1126222601984_842519_0"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1126288727343_273403_265" name="hasNameOfUseCase" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1126288784671_758751_270" body="Indicates whether or not this view has the same name as the use case in which it is contained." annotatedElement="_9_0_2_12ab03bf_1126288727343_273403_265"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_5_1_12ab03bf_1128044370734_396264_0" name="formKey" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_5_1_12ab03bf_1128044394718_801206_18" body="The key that stores the form in which information is passed from one action to another." annotatedElement="_9_5_1_12ab03bf_1128044370734_396264_0"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_5_1_12ab03bf_1148064985687_187582_0" name="fromOutcome" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_5_1_12ab03bf_1148064988390_774692_19" body="The name that corresponds to the from-outcome in an navigational rule." annotatedElement="_9_5_1_12ab03bf_1148064985687_187582_0"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_8fd0290_1173027136293_144751_172" name="needsFileUpload" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true"/>
+ <ownedAttribute xmi:id="_9_0_8fd0290_1339267008158_867934_0" name="fullyQualifiedPageObjectClassPath" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_8fd0290_1339267077451_828001_23" body="" annotatedElement="_9_0_8fd0290_1339267008158_867934_0"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_8fd0290_1339267048908_10451_3" name="pageObjectClassName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_8fd0290_1339267077452_861817_27" body="" annotatedElement="_9_0_8fd0290_1339267048908_10451_3"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_8fd0290_1339268040961_598905_0" name="pageObjectBeanName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_8fd0290_1339268479489_162028_6" body="" annotatedElement="_9_0_8fd0290_1339268040961_598905_0"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_8fd0290_1339268152029_585856_2" name="fullyQualifiedPageObjectClassName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_8fd0290_1339268479489_281986_8" body="" annotatedElement="_9_0_8fd0290_1339268152029_585856_2"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121802886359_412365_183" name="forwards" visibility="public" type="_9_0_2_12ab03bf_1121395727890_956704_2933" isOrdered="true" isReadOnly="true" association="_9_0_2_12ab03bf_1121802886359_321706_184">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121802995796_686237_234" body="Gets the forwards which can be targgeted from this view." annotatedElement="_9_0_2_12ab03bf_1121802886359_412365_183"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_17_0_6_8fd0290_1366636814439_370374_2855" name="" value="*"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_17_0_6_8fd0290_1366636814438_28881_2854" name=""/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_5_1_12ab03bf_1129243940046_729256_12" name="backingValueVariables" visibility="public" type="_9_0_2_12ab03bf_1121887007140_658808_322" isOrdered="true" association="_9_5_1_12ab03bf_1129243940046_957841_13">
+ <ownedComment xmi:id="_9_5_1_12ab03bf_1129243992703_588537_71" body="All variables that have backing value." annotatedElement="_9_5_1_12ab03bf_1129243940046_729256_12"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_17_0_6_8fd0290_1366636814496_934352_2875" name="" value="*"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_17_0_6_8fd0290_1366636814496_334462_2874" name=""/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1124056890640_240665_266" name="formActions" visibility="public" type="_9_0_2_12ab03bf_1121129959140_437795_0" isOrdered="true" isReadOnly="true" association="_9_0_2_12ab03bf_1124056890656_359584_267">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1124056645625_693795_264" body="All actions that have forms associated with them." annotatedElement="_9_0_2_12ab03bf_1124056890640_240665_266"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_17_0_6_8fd0290_1366636814471_950947_2867" name="" value="*"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_17_0_6_8fd0290_1366636814471_112230_2866" name=""/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1122742749093_663407_540" name="actionForwards" visibility="public" type="_9_0_2_12ab03bf_1121129959140_437795_0" isOrdered="true" isReadOnly="true" association="_9_0_2_12ab03bf_1122742749093_573635_541">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1122742762968_413447_544" body="All those forwards that are actions." annotatedElement="_9_0_2_12ab03bf_1122742749093_663407_540"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_17_0_6_8fd0290_1366636814465_686532_2861" name="" value="*"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_17_0_6_8fd0290_1366636814465_718677_2860" name=""/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_9_0_2_12ab03bf_1121129959140_437795_0" name="JSFAction">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121130089859_573026_83" body="Represents an action taken during a "front-end" event execution on a JSF application." annotatedElement="_9_0_2_12ab03bf_1121129959140_437795_0"/>
+ <generalization xmi:id="_9_0_2_12ab03bf_1121130078203_559841_72" isSubstitutable="true" general="_9_0_2_12ab03bf_1120792857812_717688_419"/>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121017764781_122274_334" name="formImplementationName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121019061562_824451_343" body="The name of the form implementation." annotatedElement="_9_0_2_12ab03bf_1121017764781_122274_334"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121029565500_805833_441" name="formBeanName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121029570312_126698_444" body="The name of the bean under which the form is stored." annotatedElement="_9_0_2_12ab03bf_1121029565500_805833_441"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121017764781_465059_336" name="fullyQualifiedFormImplementationName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121019061562_997897_347" body="The fully qualified name of the form implementation." annotatedElement="_9_0_2_12ab03bf_1121017764781_465059_336"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121019745203_551112_434" name="fullyQualifiedFormImplementationPath" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121019747093_841036_440" body="The fully qualified path of the form implementation." annotatedElement="_9_0_2_12ab03bf_1121019745203_551112_434"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121192540968_731877_179" name="formScope" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121192546625_472315_186" body="The scope of the JSF form (request, session,application,etc)." annotatedElement="_9_0_2_12ab03bf_1121192540968_731877_179"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121315049203_50560_187" name="formImplementationInterfaceList" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121315052812_544323_190" body="A comma separated list of all the form interfaces which the form implementation implements." annotatedElement="_9_0_2_12ab03bf_1121315049203_50560_187"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121397989250_869050_3077" name="path" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121397991343_352217_3080" body="The path to this action." annotatedElement="_9_0_2_12ab03bf_1121397989250_869050_3077"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121398075984_529636_3081" name="pathRoot" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121398077953_626366_3084" body="The path's root." annotatedElement="_9_0_2_12ab03bf_1121398075984_529636_3081"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121898551156_723412_368" name="messageKey" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121898644953_654880_371" body="The default resource message key for this action." annotatedElement="_9_0_2_12ab03bf_1121898551156_723412_368"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121902091406_586383_454" name="documentationKey" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121902134937_986036_460" body="A resource message key suited for the action''s documentation." annotatedElement="_9_0_2_12ab03bf_1121902091406_586383_454"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121902106906_985211_456" name="documentationValue" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121902134937_894812_462" body="The resource messsage value suited for the action''s documentation." annotatedElement="_9_0_2_12ab03bf_1121902106906_985211_456"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121961935671_327294_481" name="triggerName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121961946031_581512_488" body="The name of the trigger that triggers that action." annotatedElement="_9_0_2_12ab03bf_1121961935671_327294_481"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121998281250_654016_505" name="viewFragmentPath" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121998283546_167186_508" body="The path to the view fragment corresponding to this action" annotatedElement="_9_0_2_12ab03bf_1121998281250_654016_505"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1122563336812_210719_0" name="tableLinkName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1122563483078_232049_104" body="The name of the table link specified for this action." annotatedElement="_9_0_2_12ab03bf_1122563336812_210719_0"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1122563528625_361287_105" name="tableLinkColumnName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1122563578218_97973_110" body="The name of the column targetted by this action." annotatedElement="_9_0_2_12ab03bf_1122563528625_361287_105"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1122563576453_185549_107" name="tableLink" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1122563578218_102855_112" body="Indicates if a table link name has been specified and it properly targets a table page-variable from the input page." annotatedElement="_9_0_2_12ab03bf_1122563576453_185549_107"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1122592600125_374842_281" name="hyperlink" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1122592603265_146357_284" body="Indicates whether or not this action is represented by clicking on a hyperlink." annotatedElement="_9_0_2_12ab03bf_1122592600125_374842_281"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1122746598781_149275_604" name="actionClassName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1122746703250_84770_609" body="The name of the action class that executes this action." annotatedElement="_9_0_2_12ab03bf_1122746598781_149275_604"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1122746688515_457698_606" name="fullyQualifiedActionClassPath" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1122746703250_574516_611" body="The fully qualified path to the action class that execute this action." annotatedElement="_9_0_2_12ab03bf_1122746688515_457698_606"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1122766607984_930141_612" name="controllerAction" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1122766748156_922666_617" body="The name of the action on the controller that executions this action." annotatedElement="_9_0_2_12ab03bf_1122766607984_930141_612"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1122770742015_230981_620" name="fullyQualifiedActionClassName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1122770786078_116772_625" body="The fully qualified name of the action class that execute this action." annotatedElement="_9_0_2_12ab03bf_1122770742015_230981_620"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1122906001625_861200_629" name="resettable" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1122906007453_869495_632" body="Indicates whether or not the values passed along with this action can be reset or not." annotatedElement="_9_0_2_12ab03bf_1122906001625_861200_629"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1123253720562_190317_294" name="formKey" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1123253728968_312954_297" body="The key that stores the form in which information is passed from one action to another." annotatedElement="_9_0_2_12ab03bf_1123253720562_190317_294"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1124149500734_295841_119" name="tableAction" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1124149502703_173614_145" body="Indicates that this action works on all rows of the table from the table link relation." annotatedElement="_9_0_2_12ab03bf_1124149500734_295841_119"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1124747122046_264114_265" name="validationRequired" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1124747127500_706614_268" body="Indicates whether or not at least one parameter on this action requires validation." annotatedElement="_9_0_2_12ab03bf_1124747122046_264114_265"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1125616466453_535950_105" name="popup" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1125616479281_779353_133" body="Indicates if this action forwards to a popup. Only applied when the target is a final state pointing to another use case." annotatedElement="_9_0_2_12ab03bf_1125616466453_535950_105"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1125890570859_845540_123" name="formResetRequired" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1125890576031_422134_152" body="Indicates if at least one parameter on the form requires being reset." annotatedElement="_9_0_2_12ab03bf_1125890570859_845540_123"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1125938337437_336600_153" name="formReset" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1125938341234_201038_156" body="Whether or not the entire form should be reset (all action parameters on the form)." annotatedElement="_9_0_2_12ab03bf_1125938337437_336600_153"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_5_1_12ab03bf_1128783973359_103590_0" name="formImplementationGetter" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_5_1_12ab03bf_1128783976031_929854_31" body="The signature of the accessor method that returns the form implementation instance." annotatedElement="_9_5_1_12ab03bf_1128783973359_103590_0"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_5_1_12ab03bf_1128882029921_124090_0" name="formSerialVersionUID" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_5_1_12ab03bf_1128882035000_782493_33" body="The calcuated serial version UID for this action's form." annotatedElement="_9_5_1_12ab03bf_1128882029921_124090_0"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_5_1_12ab03bf_1148061111265_91306_3" name="finalStateTarget" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_5_1_12ab03bf_1148061159546_44612_38" body="Indicates whether or not a final state is the target of this action." annotatedElement="_9_5_1_12ab03bf_1148061111265_91306_3"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_5_1_12ab03bf_1148066077406_268194_109" name="fromOutcome" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_5_1_12ab03bf_1148066080531_741699_144" body="The name that corresponds to the from-outcome in an navigational rule." annotatedElement="_9_5_1_12ab03bf_1148066077406_268194_109"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_5_1_12ab03bf_1156178309125_554511_137" name="warningMessagesPresent" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_5_1_12ab03bf_1156178336015_914200_146" body="Whether or not any warning messages are present." annotatedElement="_9_5_1_12ab03bf_1156178309125_554511_137"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_5_1_12ab03bf_1156178309140_645089_138" name="warningMessages" visibility="public" type="_9_0_1fe00f9_1119336925531_817948_60" isReadOnly="true">
+ <ownedComment xmi:id="_9_5_1_12ab03bf_1156178336015_486960_148" body="Any messages used to indicate a warning." annotatedElement="_9_5_1_12ab03bf_1156178309140_645089_138"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_5_1_12ab03bf_1156178309140_985399_139" name="successMessagesPresent" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_5_1_12ab03bf_1156178336015_575190_150" body="Indicates whether or not any success messags are present." annotatedElement="_9_5_1_12ab03bf_1156178309140_985399_139"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_5_1_12ab03bf_1156178309140_463421_140" name="successMessages" visibility="public" type="_9_0_1fe00f9_1119336925531_817948_60" isReadOnly="true">
+ <ownedComment xmi:id="_9_5_1_12ab03bf_1156178336015_325784_152" body="Messages used to indicate successful execution." annotatedElement="_9_5_1_12ab03bf_1156178309140_463421_140"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_8fd0290_1196855344151_116864_30" name="needsFileUpload" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true"/>
+ <ownedAttribute xmi:id="_9_0_8fd0290_1283619435889_224323_0" name="triggerMethodName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_8fd0290_1283619528383_455008_2" body="The name of the method to be executed when this action is triggered." annotatedElement="_9_0_8fd0290_1283619435889_224323_0"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_8fd0290_1333364431926_458757_0" name="dialog" visibility="public" type="_9_0_1fe00f9_1119336925531_736816_6" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_8fd0290_1333364551085_2736_3" body="Indicates if this action forwards to a dialog (use case runs in different conversation scope). Only applied when the target is a final state pointing to another use case." annotatedElement="_9_0_8fd0290_1333364431926_458757_0"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1122563747500_791156_114" name="tableLinkParameter" visibility="public" type="_9_0_2_12ab03bf_1121887007140_658808_322" isReadOnly="true" association="_9_0_2_12ab03bf_1122563747500_41702_115">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1122563965125_31293_155" body="If the action is a table link then this property represents the table to which is being linked." annotatedElement="_9_0_2_12ab03bf_1122563747500_791156_114"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1124035510015_450825_137" name="hiddenParameters" visibility="public" type="_9_0_2_12ab03bf_1121887007140_658808_322" isOrdered="true" isReadOnly="true" association="_9_0_2_12ab03bf_1124035510015_780910_138">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1124035578484_8680_181" body="All parameters that are of hidden input type." annotatedElement="_9_0_2_12ab03bf_1124035510015_450825_137"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_17_0_6_8fd0290_1366636814470_443919_2865" name="" value="*"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_17_0_6_8fd0290_1366636814470_96279_2864" name=""/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_9_0_2_12ab03bf_1121377580440_489284_2626" name="JSFController">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121378836002_816292_2657" body="Represents a controller for a JSF application." annotatedElement="_9_0_2_12ab03bf_1121377580440_489284_2626"/>
+ <generalization xmi:id="_9_0_2_12ab03bf_1121377640971_232089_2642" isSubstitutable="true" general="_9_0_2_12ab03bf_1120167034531_347865_28"/>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121378825799_752253_2653" name="implementationName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121378836018_400023_2659" body="The implementation name of this controller." annotatedElement="_9_0_2_12ab03bf_1121378825799_752253_2653"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121378825815_674068_2654" name="fullyQualifiedImplementationName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121378836018_790989_2661" body="The fully qualified implementation name of this controller." annotatedElement="_9_0_2_12ab03bf_1121378825815_674068_2654"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121379684065_454496_2662" name="fullyQualifiedImplementationPath" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121379723236_879892_2665" body="The fully qualified path to the controller implemention file." annotatedElement="_9_0_2_12ab03bf_1121379684065_454496_2662"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121380077393_137410_2666" name="beanName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121380079690_743357_2669" body="The bean name of this controller (this is what is stored in the JSF configuration file)." annotatedElement="_9_0_2_12ab03bf_1121380077393_137410_2666"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_8fd0290_1230573928943_207150_0" name="controllerSerialVersionUID" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_8fd0290_1230573951344_334941_2" body="The calculated serial version UID for this controller." annotatedElement="_9_0_8fd0290_1230573928943_207150_0"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_8fd0290_1334932986284_974948_206" name="allServices" visibility="public" type="_9_0_1fe00f9_1119336925531_331753_26" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_8fd0290_1334933053401_569552_214" body="All services the controller needs." annotatedElement="_9_0_8fd0290_1334932986284_974948_206"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_8fd0290_1334932470923_116913_43" name="servicesPackagesReferences" visibility="public" type="_d860307_1071505297814_60220_1019" isOrdered="true" isReadOnly="true" association="_9_0_8fd0290_1334932470923_439911_44">
+ <ownedComment xmi:id="_9_0_8fd0290_1334932558640_914636_89" body="References to packages containing services this controller depends" annotatedElement="_9_0_8fd0290_1334932470923_116913_43"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_17_0_6_8fd0290_1366636814535_546425_2883" name="" value="*"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_17_0_6_8fd0290_1366636814534_564729_2882" name=""/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_5_1_12ab03bf_1128289118531_895857_305" name="sessionObjectReferences" visibility="public" type="_d860307_1071505297814_60220_1019" isOrdered="true" isReadOnly="true" association="_9_5_1_12ab03bf_1128289118531_989553_306">
+ <ownedComment xmi:id="_9_5_1_12ab03bf_1128289193640_352933_348" body="All dependencies to VOs to be kept in the session." annotatedElement="_9_5_1_12ab03bf_1128289118531_895857_305"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_17_0_6_8fd0290_1366636814495_284872_2873" name="" value="*"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_17_0_6_8fd0290_1366636814495_872096_2872" name=""/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_9_0_2_12ab03bf_1121395464593_689720_2822" name="JSFFinalState">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121395552265_177472_2851" body="Represents a final state in a JSF use case." annotatedElement="_9_0_2_12ab03bf_1121395464593_689720_2822"/>
+ <generalization xmi:id="_9_0_2_12ab03bf_1121395500171_577059_2838" isSubstitutable="true" general="_9_0_2_12ab03bf_1120835338500_225560_590"/>
+ <ownedAttribute xmi:id="_9_0_2_12ab03bf_1121395538984_661011_2849" name="path" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_2_12ab03bf_1121395552265_709618_2853" body="The path to which this final state points." annotatedElement="_9_0_2_12ab03bf_1121395538984_661011_2849"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_8fd0290_1333800558483_31793_0" name="targetControllerFullyQualifiedName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_8fd0290_1333800636980_443837_4" body="The target controller to which this final state points." annotatedElement="_9_0_8fd0290_1333800558483_31793_0"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_9_0_8fd0290_1333800559826_977527_1" name="targetControllerBeanName" visibility="public" type="_9_0_1fe00f9_1119336925531_364079_66" isReadOnly="true">
+ <ownedComment xmi:id="_9_0_8fd0290_1333800636981_442873_6" body="The controller bean ...
[truncated message content] |
|
From: <wal...@us...> - 2015-03-13 14:48:18
|
Revision: 15438
http://sourceforge.net/p/andromda/svn/15438
Author: walterim
Date: 2015-03-13 14:48:06 +0000 (Fri, 13 Mar 2015)
Log Message:
-----------
Some treatment to uploaded files in cruds
Modified Paths:
--------------
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceBase.vsl
trunk/cartridges/andromda-spring/src/test/expected/cartridge-output.zip
trunk/cartridges/andromda-spring/src/test/expected/cartridge-outputUML2.zip
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl 2014-12-12 23:31:12 UTC (rev 15437)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl 2015-03-13 14:48:06 UTC (rev 15438)
@@ -318,7 +318,8 @@
if(example != null)
{
#foreach ($member in $manageable.manageableAttributes)
- if (example.${member.getterName}() != null)
+#if (!$member.inputFile && !$member.needsFileUpload)
+ if (#if($member.type.stringType) org.apache.commons.lang.StringUtils.isNotEmpty(example.${member.getterName}())#else example.${member.getterName}() != null#end)
#if ($member.type.stringType)
{
criteria.add(Restrictions.ilike("$member.name", example.${member.getterName}(), $matchMode));
@@ -353,6 +354,7 @@
}
#end
#end
+#end
#foreach ($member in $manageable.manageableAssociationEnds)
#if ($member.many)
if (example.${member.getterName}() != null && example.${member.getterName}().length > 0)
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceBase.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceBase.vsl 2014-12-12 23:31:12 UTC (rev 15437)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceBase.vsl 2015-03-13 14:48:06 UTC (rev 15438)
@@ -54,8 +54,10 @@
final $searchExampleClassName searchExample=new $searchExampleClassName();
#foreach ($member in $manageable.manageableMembers)
+#if (!$member.inputFile && !$member.needsFileUpload)
searchExample.${member.setterName}(${member.name});
#end
+#end
return searchExample;
}
Modified: trunk/cartridges/andromda-spring/src/test/expected/cartridge-output.zip
===================================================================
(Binary files differ)
Modified: trunk/cartridges/andromda-spring/src/test/expected/cartridge-outputUML2.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cwb...@us...> - 2014-12-12 23:31:20
|
Revision: 15437
http://sourceforge.net/p/andromda/svn/15437
Author: cwbrandon
Date: 2014-12-12 23:31:12 +0000 (Fri, 12 Dec 2014)
Log Message:
-----------
Fix Map usage that causes errors in a multi-threaded environment
Modified Paths:
--------------
trunk/andromda-core/src/main/java/org/andromda/core/common/Introspector.java
Modified: trunk/andromda-core/src/main/java/org/andromda/core/common/Introspector.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/common/Introspector.java 2014-10-17 22:09:20 UTC (rev 15436)
+++ trunk/andromda-core/src/main/java/org/andromda/core/common/Introspector.java 2014-12-12 23:31:12 UTC (rev 15437)
@@ -6,7 +6,9 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
+
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.log4j.Logger;
@@ -262,11 +264,6 @@
}
/**
- * Cache for a class's write methods.
- */
- private final Map<Class, Map<String, Method>> writeMethodsCache = new HashMap<Class, Map<String, Method>>();
-
- /**
* Gets the writable method for the property.
*
* @param object the object from which to retrieve the property method.
@@ -277,34 +274,8 @@
final Object object,
final String name)
{
- Method writeMethod = null;
- final Class objectClass = object.getClass();
- Map<String, Method> classWriteMethods = this.writeMethodsCache.get(objectClass);
- if (classWriteMethods == null)
- {
- classWriteMethods = new HashMap<String, Method>();
- }
- else
- {
- writeMethod = classWriteMethods.get(name);
- }
- if (writeMethod == null)
- {
- final PropertyDescriptor descriptor = this.getPropertyDescriptor(
- object.getClass(),
- name);
- writeMethod = descriptor != null ? descriptor.getWriteMethod() : null;
- if (writeMethod != null)
- {
- classWriteMethods.put(
- name,
- writeMethod);
- this.writeMethodsCache.put(
- objectClass,
- classWriteMethods);
- }
- }
- return writeMethod;
+ final PropertyDescriptor descriptor = getPropertyDescriptor(object.getClass(), name);
+ return descriptor != null ? descriptor.getWriteMethod() : null;
}
/**
@@ -342,11 +313,6 @@
}
/**
- * Cache for a class's read methods.
- */
- private final Map<Class, Map<String, Method>> readMethodsCache = new HashMap<Class, Map<String, Method>>();
-
- /**
* Gets the readable method for the property.
*
* @param object the object from which to retrieve the property method.
@@ -357,40 +323,14 @@
final Object object,
final String name)
{
- Method readMethod = null;
- final Class objectClass = object.getClass();
- Map<String, Method> classReadMethods = this.readMethodsCache.get(objectClass);
- if (classReadMethods == null)
- {
- classReadMethods = new HashMap<String, Method>();
- }
- else
- {
- readMethod = classReadMethods.get(name);
- }
- if (readMethod == null)
- {
- final PropertyDescriptor descriptor = this.getPropertyDescriptor(
- object.getClass(),
- name);
- readMethod = descriptor != null ? descriptor.getReadMethod() : null;
- if (readMethod != null)
- {
- classReadMethods.put(
- name,
- readMethod);
- this.readMethodsCache.put(
- objectClass,
- classReadMethods);
- }
- }
- return readMethod;
+ final PropertyDescriptor descriptor = getPropertyDescriptor(object.getClass(), name);
+ return descriptor != null ? descriptor.getReadMethod() : null;
}
/**
* The cache of property descriptors.
*/
- private final Map<Class, Map<String, PropertyDescriptor>> propertyDescriptorsCache = new HashMap<Class, Map<String, PropertyDescriptor>>();
+ private final Map<Class, Map<String, PropertyDescriptor>> propertyDescriptorsCache = new ConcurrentHashMap<Class, Map<String, PropertyDescriptor>>();
/**
* The pattern for property names.
@@ -427,10 +367,8 @@
final PropertyDescriptor[] descriptors =
java.beans.Introspector.getBeanInfo(type).getPropertyDescriptors();
final int descriptorNumber = descriptors.length;
- for (int ctr = 0; ctr < descriptorNumber; ctr++)
+ for (PropertyDescriptor descriptor : descriptors)
{
- final PropertyDescriptor descriptor = descriptors[ctr];
-
// - handle names that start with a lowercased letter and have an uppercase as the second letter
final String compareName =
propertyNamePattern.matcher(name).matches() ? StringUtils.capitalize(name) : name;
@@ -474,10 +412,20 @@
}
/**
- * Prevents stack-over-flows by storing the objects that
- * are currently being evaluated within {@link #internalGetProperty(Object, String)}.
+ * Attempts to get the value of the property with <code>name</code> on the
+ * given <code>object</code> (throws an exception if the property
+ * is not readable on the object).
+ *
+ * @param object the object from which to retrieve the property.
+ * @param name the name of the property
+ * @return the resulting property value
*/
- private final Map<Object, String> evaluatingObjects = new HashMap<Object, String>();
+ private Object internalGetProperty(
+ final Object object,
+ final String name)
+ {
+ return internalGetProperty(object, name, new HashMap<Object, String>());
+ }
/**
* Attempts to get the value of the property with <code>name</code> on the
@@ -486,20 +434,22 @@
*
* @param object the object from which to retrieve the property.
* @param name the name of the property
+ * @param evaluatingObjects prevents stack-over-flow by storing the objects that are currently being evaluated.
* @return the resulting property value
*/
private Object internalGetProperty(
final Object object,
- final String name)
+ final String name,
+ final Map<Object, String> evaluatingObjects)
{
Object property = null;
// - prevent stack overflows by checking to make sure
// we aren't entering any circular evaluations
- final Object value = this.evaluatingObjects.get(object);
+ final Object value = evaluatingObjects.get(object);
if (value == null || !value.equals(name))
{
- this.evaluatingObjects.put(
+ evaluatingObjects.put(
object,
name);
if (object != null || StringUtils.isNotBlank(name))
@@ -520,7 +470,7 @@
}
catch (Throwable throwable)
{
- if (throwable.getCause()!=null)
+ if (throwable.getCause() != null)
{
throwable = throwable.getCause();
}
@@ -539,7 +489,6 @@
}
}
}
- this.evaluatingObjects.remove(object);
}
return property;
}
@@ -560,7 +509,7 @@
{
if (object != null || (StringUtils.isNotBlank(name)))
{
- Class expectedType = null;
+ Class expectedType;
if (value != null && object != null)
{
final PropertyDescriptor descriptor = this.getPropertyDescriptor(
@@ -604,24 +553,18 @@
public void shutdown()
{
this.propertyDescriptorsCache.clear();
- this.writeMethodsCache.clear();
- this.readMethodsCache.clear();
- this.evaluatingObjects.clear();
Introspector.instance = null;
}
/**
- * @see java.lang.Object#toString()
+ * @see Object#toString()
*/
@Override
public String toString()
{
StringBuilder builder = new StringBuilder();
- builder.append(super.toString()).append(" [writeMethodsCache=").append(this.writeMethodsCache)
- .append(", readMethodsCache=").append(this.readMethodsCache)
- .append(", propertyDescriptorsCache=").append(this.propertyDescriptorsCache)
- .append(", propertyNamePattern=").append(this.propertyNamePattern)
- .append(", evaluatingObjects=").append(this.evaluatingObjects).append("]");
+ builder.append(super.toString()).append(" [propertyDescriptorsCache=").append(this.propertyDescriptorsCache)
+ .append(", propertyNamePattern=").append(this.propertyNamePattern).append("]");
return builder.toString();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-09-06 23:14:03
|
Revision: 15429
http://sourceforge.net/p/andromda/svn/15429
Author: walterim
Date: 2014-09-06 23:14:00 +0000 (Sat, 06 Sep 2014)
Log Message:
-----------
No need to add the attribute as a filter when the type is file.
Modified Paths:
--------------
trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/SearchFilter.java.vsl
Modified: trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/SearchFilter.java.vsl
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/SearchFilter.java.vsl 2014-09-06 23:13:04 UTC (rev 15428)
+++ trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/SearchFilter.java.vsl 2014-09-06 23:14:00 UTC (rev 15429)
@@ -29,6 +29,7 @@
private static final long serialVersionUID = ${manageable.searchFilterSerialVersionUID}L;
#foreach ($field in $manageable.manageableAttributes)
+#if (!$field.inputFile && !$field.needsFileUpload)
#setFieldWrapperTypeName($field $fieldWrapperTypeName)
private $fieldWrapperTypeName $field.name=null;
@@ -66,6 +67,7 @@
}
#end
+#end
#end
#foreach ($member in $manageable.manageableAssociationEnds)
#setAssociatonEndType($member $fieldType $fieldTypeName)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-09-06 23:13:07
|
Revision: 15428
http://sourceforge.net/p/andromda/svn/15428
Author: walterim
Date: 2014-09-06 23:13:04 +0000 (Sat, 06 Sep 2014)
Log Message:
-----------
Removing unneeded comment.
Modified Paths:
--------------
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudSearchExample.vsl
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudSearchExample.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudSearchExample.vsl 2014-09-06 23:12:04 UTC (rev 15427)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudSearchExample.vsl 2014-09-06 23:13:04 UTC (rev 15428)
@@ -1,4 +1,3 @@
-##TODO review the 'replace' and use a metafacade
#set ($generatedFile = "${manageable.manageableSearchExampleFullPath}.java")
##
## START TEMPLATE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-09-06 23:12:07
|
Revision: 15427
http://sourceforge.net/p/andromda/svn/15427
Author: walterim
Date: 2014-09-06 23:12:04 +0000 (Sat, 06 Sep 2014)
Log Message:
-----------
Added a new namespace property to generate constants with properties names (fixing template).
Modified Paths:
--------------
trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/GlobalMacros.vm
Modified: trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/GlobalMacros.vm
===================================================================
--- trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/GlobalMacros.vm 2014-09-06 23:09:47 UTC (rev 15426)
+++ trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/GlobalMacros.vm 2014-09-06 23:12:04 UTC (rev 15427)
@@ -421,6 +421,10 @@
#set ($visibility="private")
#end
#if ($target.navigable || ($associationEnd.child && $entity.foreignHibernateGeneratorClass))
+#if ($generateAttributeNameConstant)
+ public static final String ${attributeNameConstantPrefix}${target.name}="${target.name}";
+
+#end
#if ($target.many)
$visibility $target.getterSetterTypeName $target.name = $target.collectionTypeImplementation;
#else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-09-06 23:09:50
|
Revision: 15426
http://sourceforge.net/p/andromda/svn/15426
Author: walterim
Date: 2014-09-06 23:09:47 +0000 (Sat, 06 Sep 2014)
Log Message:
-----------
Added tomcat as an embedded server option.
Modified Paths:
--------------
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/META-INF/andromdapp/andromdapp.xml
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/CXF/pom.xml.vsl
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/core/pom.xml.vsl
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/src/main/config/andromda.xml.vsl
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/pom.xml.vsl
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/context.xml.vsl
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/pom.xml.vsl
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/webservice/pom.xml.vsl
trunk/samples/conf/andromdapp/animal-quiz/configuration.xml
trunk/samples/conf/andromdapp/car-rental-system/configuration.xml
trunk/samples/conf/andromdapp/crud/configuration.xml
trunk/samples/conf/andromdapp/online-store/configuration.xml
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/META-INF/andromdapp/andromdapp.xml
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/META-INF/andromdapp/andromdapp.xml 2014-09-03 21:06:58 UTC (rev 15425)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/META-INF/andromdapp/andromdapp.xml 2014-09-06 23:09:47 UTC (rev 15426)
@@ -420,16 +420,17 @@
<response>multipart</response>
</responses>
</prompt>
- <prompt id="embeddedJetty" setResponseAsTrue="true">
- <text>Would you like to use the embedded Jetty web server (Maven plugin)?</text>
- <shortText>Use the Jetty web server</shortText>
+ <prompt id="embeddedWebServer" setResponseAsTrue="true">
+ <text>Would you like to use an embedded web server (Maven plugin - enter 'none' if you don't want to use one)?</text>
+ <shortText>Use an embedded web server</shortText>
<preconditions type="or">
- <condition id="jsfApplicationType" equal="standalone"/>
+ <condition id="applicationType" equal="war"/>
<condition id="webserviceStack" equal="cxf"/>
</preconditions>
- <responses type="java.lang.Boolean">
- <response>yes</response>
- <response>no</response>
+ <responses>
+ <response>tomcat</response>
+ <response>jetty</response>
+ <response>none</response>
</responses>
</prompt>
<!-- This determines dependency versions, which dependencies are bundled or provided, jee version, and which configuration files are created >
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/CXF/pom.xml.vsl
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/CXF/pom.xml.vsl 2014-09-03 21:06:58 UTC (rev 15425)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/CXF/pom.xml.vsl 2014-09-06 23:09:47 UTC (rev 15426)
@@ -178,14 +178,12 @@
</executions>
</plugin>
#end
+#if ($jetty || $tomcat)
+#if ($jetty)
<!-- See http://wiki.eclipse.org/Jetty/Reference and http://docs.codehaus.org/display/JETTY/Maven+Jetty+Plugin -->
<!-- Must start webservice server project from CXF client project in order to execute all phases properly in a single project -->
<!-- All phases before test-compile executed twice, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=342643 -->
-#if ($embeddedJetty)
<plugin>
-#else
- <!--plugin>
-#end
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
@@ -225,14 +223,40 @@
</goals>
</execution>
</executions>
- </plugin#if (!$embeddedJetty)--#end>
+ </plugin>
<!-- Run integration tests *ITCase.java against running Jetty server in the webservice project -->
<!-- See http://docs.codehaus.org/display/MAVENUSER/Maven+and+Integration+Testing -->
-#if ($embeddedJetty)
+#elseif ($tomcat)
<plugin>
-#else
- <!--plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <configuration>
+ <port>${service.port}</port>
+ <warDirectory>target/${project.build.finalName}</warDirectory>
+ <ignorePackaging>true</ignorePackaging>
+ </configuration>
+ <executions>
+ <execution>
+ <id>tomcat-run</id>
+ <goals>
+ <goal>run-war</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <fork>false</fork>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tomcat-shutdown</id>
+ <goals>
+ <goal>shutdown</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
#end
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe-plugin.version}</version>
@@ -256,7 +280,8 @@
</goals>
</execution>
</executions>
- </plugin#if (!$embeddedJetty)--#end>
+ </plugin>
+#end
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/core/pom.xml.vsl
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/core/pom.xml.vsl 2014-09-03 21:06:58 UTC (rev 15425)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/core/pom.xml.vsl 2014-09-06 23:09:47 UTC (rev 15426)
@@ -64,7 +64,7 @@
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
-#if ($embeddedJetty)
+#if ($tomcat || $jetty)
<!-- Uncomment below if using JDBC or Test features>
<dependency>
<groupId>org.springframework</groupId>
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/src/main/config/andromda.xml.vsl
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/src/main/config/andromda.xml.vsl 2014-09-03 21:06:58 UTC (rev 15425)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/src/main/config/andromda.xml.vsl 2014-09-06 23:09:47 UTC (rev 15426)
@@ -292,11 +292,11 @@
#if ($groovy)
<property name="implementationLanguage">groovy</property>
#end
-#if ($embeddedJetty)
+#if ($jetty)
<!-- uncomment to use the context configured datasource
#end
<property name="dataSource">${dataSource}</property>
-#if ($embeddedJetty)
+#if ($jetty)
-->
#end
<property name="username">${jdbc.username}</property>
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/pom.xml.vsl
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/pom.xml.vsl 2014-09-03 21:06:58 UTC (rev 15425)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/pom.xml.vsl 2014-09-06 23:09:47 UTC (rev 15426)
@@ -503,7 +503,7 @@
<artifactId>spring-expression</artifactId>
<version>${spring.version}</version>
</dependency>
-#if ($embeddedJetty)
+#if ($jetty || $tomcat)
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
@@ -822,7 +822,7 @@
<artifactId>spring-context-support</artifactId>
<version>${spring.version}</version>
</dependency>
-#if (!$embeddedJetty)
+#if (!$jetty && !$tomcat)
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
@@ -924,7 +924,7 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.31</version>
-#if (!$embeddedJetty)
+#if (!$jetty && !$tomcat)
<scope>test</scope>
#end
</dependency>
@@ -933,7 +933,7 @@
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.3-1101-jdbc41</version>
-#if (!$embeddedJetty)
+#if (!$jetty && !$tomcat)
<scope>test</scope>
#end
</dependency>
@@ -942,7 +942,7 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.9.1.0</version>
-#if (!$embeddedJetty)
+#if (!$jetty && !$tomcat)
<scope>test</scope>
#end
</dependency>
@@ -951,7 +951,7 @@
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.2</version>
-#if (!$embeddedJetty)
+#if (!$jetty && !$tomcat)
<scope>test</scope>
#end
</dependency>
@@ -960,7 +960,7 @@
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.181</version>
-#if (!$embeddedJetty)
+#if (!$jetty && !$tomcat)
<scope>test</scope>
#end
</dependency>
@@ -1031,11 +1031,8 @@
<artifactId>andromdapp-maven-plugin</artifactId>
<version>${andromda.version}</version>
</plugin>
-#if ($embeddedJetty)
+#if ($jetty)
<plugin>
-#else
- <!--plugin>
-#end
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
@@ -1079,8 +1076,43 @@
</execution>
</executions>
#end
- </plugin#if (!$embeddedJetty)--#end>
+ </plugin>
+#elseif ($tomcat)
<plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>${tomcat.version}</version>
+#if ($cxf)
+ <configuration>
+ <contextFile>src/test/resources/context.xml</contextFile>
+ <path>/${project.build.finalName}</path>
+ <port>${service.port}</port>
+ <warDirectory>target/${project.build.finalName}</warDirectory>
+ <ignorePackaging>true</ignorePackaging>
+ </configuration>
+ <executions>
+ <execution>
+ <id>tomcat-run</id>
+ <goals>
+ <goal>run-war</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <fork>true</fork>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tomcat-shutdown</id>
+ <goals>
+ <goal>shutdown</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ </execution>
+ </executions>
+#end
+ </plugin>
+#end
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
<version>1.1</version>
@@ -1122,7 +1154,8 @@
rest=$rest
jbossSeam=$jbossSeam
webserviceStack=$webserviceStack
- embeddedJetty=$embeddedJetty
+ jetty=$jetty
+ tomcat=$tomcat
-->
<module>mda</module>
<module>common</module>
@@ -1333,7 +1366,7 @@
<application.package>$applicationPackage</application.package>
<application.name>$applicationName</application.name>
<application.version>$applicationVersion</application.version>
-#if ($embeddedJetty)
+#if ($jetty || $tomcat)
<!-- uncomment to use the context configured datasource
#end
<dataSource.name>jdbc/${application.id}</dataSource.name>
@@ -1342,7 +1375,7 @@
#else
<dataSource>java:comp/env/${dataSource.name}</dataSource>
#end
-#if ($embeddedJetty)
+#if ($jetty || $tomcat)
-->
#end
#if ($cxf)
@@ -1358,9 +1391,11 @@
<hibernate.version>3.6.9.Final</hibernate.version-->
<hibernate.version>4.3.6.Final</hibernate.version>
#end
-#if ($cxf || $embeddedJetty)
+#if ($jetty)
<!-- v 9.x only supports JDK7 and you cannot configure jetty.port from maven.-->
<jetty.version>8.1.15.v20140411</jetty.version>
+#elseif ($tomcat)
+ <tomcat.version>2.2</tomcat.version>
#end
#if ($cxf)
<spring.version>4.0.6.RELEASE</spring.version>
@@ -1541,7 +1576,7 @@
#elseif ($h2)
jdbc:h2:~/$applicationId
#elseif ($hypersonic)
-#if ($embeddedJetty)
+#if ($jetty || $tomcat)
jdbc:hsqldb:file:database/${applicationId};shutdown=true
#else
jdbc:hsqldb:mem:${applicationId}
@@ -1607,7 +1642,7 @@
<!-- Change this to the host on which your webapp/service will be deployed -->
<service.host>localhost</service.host>
#end
-#if ($cxf || $embeddedJetty)
+#if ($cxf || $jetty || $tomcat)
<!-- Change this the port on which your webapp/service will be deployed -->
<service.port>8080</service.port>
#end
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/context.xml.vsl
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/context.xml.vsl 2014-09-03 21:06:58 UTC (rev 15425)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/context.xml.vsl 2014-09-06 23:09:47 UTC (rev 15426)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Context reloadable="true" antiJARLocking="true" antiResourceLocking="false">
-#if ($embeddedJetty)
+#if ($jetty)
<!-- uncomment to use the context configured datasource
#end
<Resource name="${dataSource.name}" auth="Container" type="javax.sql.DataSource"
@@ -11,7 +11,7 @@
url="${jdbc.url}"
defaultAutoCommit="false" removeAbandoned="true"
removeAbandonedTimeout="60" logAbandoned="true"/>
-#if ($embeddedJetty)
+#if ($jetty)
-->
#end
</Context>
\ No newline at end of file
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/pom.xml.vsl
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/pom.xml.vsl 2014-09-03 21:06:58 UTC (rev 15425)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/web/pom.xml.vsl 2014-09-06 23:09:47 UTC (rev 15426)
@@ -248,7 +248,7 @@
#end
</dependency>
#end
-#if ($embeddedJetty)
+#if ($jetty || $tomcat)
#if ($mysql)
<dependency>
<groupId>mysql</groupId>
@@ -356,11 +356,8 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
-#if ($embeddedJetty)
+#if ($jetty)
<plugin>
-#else
- <!--plugin>
-#end
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
@@ -400,7 +397,38 @@
</goals>
</execution>
</executions>
- </plugin#if (!$embeddedJetty)--#end>
+ </plugin>
+#elseif ($tomcat)
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <configuration>
+ <path>/${project.build.finalName}</path>
+ <port>${service.port}</port>
+ <warDirectory>target/${project.build.finalName}</warDirectory>
+ <ignorePackaging>true</ignorePackaging>
+ </configuration>
+ <executions>
+ <execution>
+ <id>tomcat-run</id>
+ <goals>
+ <goal>run-war</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <fork>true</fork>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tomcat-shutdown</id>
+ <goals>
+ <goal>shutdown</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
+#end
</plugins>
</build>
</project>
\ No newline at end of file
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/webservice/pom.xml.vsl
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/webservice/pom.xml.vsl 2014-09-03 21:06:58 UTC (rev 15425)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/webservice/pom.xml.vsl 2014-09-06 23:09:47 UTC (rev 15426)
@@ -170,15 +170,12 @@
</archive>
</configuration>
</plugin>
+#if ($jetty)
<!-- See http://wiki.eclipse.org/Jetty/Reference and http://www.eclipse.org/jetty/documentation/current/jetty-maven-plugin.html -->
<!-- If you see ClassNotFoundException: org.springframework.web.context.ContextLoaderListener
and are running maven2, switch jetty.version to 7.x. v8 requires maven3 -->
<!-- Jetty v9: Not possible to configure jetty port through maven, doesn't run jetty.xml properly -->
-#if ($embeddedJetty)
<plugin>
-#else
- <!--plugin>
-#end
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
@@ -218,8 +215,40 @@
</goals>
</execution>
</executions>
- </plugin#if (!$embeddedJetty)--#end>
+ </plugin>
+#elseif ($tomcat)
<plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <configuration>
+ <contextFile>src/test/resources/context.xml</contextFile>
+ <path>/${project.build.finalName}</path>
+ <port>8080</port>
+ <warDirectory>target/${project.build.finalName}</warDirectory>
+ <ignorePackaging>true</ignorePackaging>
+ </configuration>
+ <executions>
+ <execution>
+ <id>tomcat-run</id>
+ <goals>
+ <goal>run-war</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <fork>false</fork>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tomcat-shutdown</id>
+ <goals>
+ <goal>shutdown</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
+#end
+ <plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
</plugins>
Modified: trunk/samples/conf/andromdapp/animal-quiz/configuration.xml
===================================================================
--- trunk/samples/conf/andromdapp/animal-quiz/configuration.xml 2014-09-03 21:06:58 UTC (rev 15425)
+++ trunk/samples/conf/andromdapp/animal-quiz/configuration.xml 2014-09-06 23:09:47 UTC (rev 15426)
@@ -15,6 +15,7 @@
<property name="implementationLanguage">java</property>
<property name="web">yes</property>
<property name="webservice">none</property>
+ <property name="embeddedWebServer">tomcat</property>
<property name="model">jar:file:${project.basedir}/src/main/uml/AnimalQuiz.xml.zip!/AnimalQuiz.xml</property>
<property name="configurationUri">${project.basedir}/src/main/config/andromda.xml</property>
<property name="databaseType">hypersonic</property>
Modified: trunk/samples/conf/andromdapp/car-rental-system/configuration.xml
===================================================================
--- trunk/samples/conf/andromdapp/car-rental-system/configuration.xml 2014-09-03 21:06:58 UTC (rev 15425)
+++ trunk/samples/conf/andromdapp/car-rental-system/configuration.xml 2014-09-06 23:09:47 UTC (rev 15426)
@@ -15,7 +15,7 @@
<property name="implementationLanguage">java</property>
<property name="web">yes</property>
<property name="webservice">none</property>
- <property name="embeddedJetty">yes</property>
+ <property name="embeddedWebServer">tomcat</property>
<property name="model">jar:file:${project.basedir}/src/main/uml/CarRentalSystem.xml.zip!/CarRentalSystem.xml</property>
<property name="configurationUri">${project.basedir}/src/main/config/andromda.xml</property>
<property name="databaseType">hypersonic</property>
Modified: trunk/samples/conf/andromdapp/crud/configuration.xml
===================================================================
--- trunk/samples/conf/andromdapp/crud/configuration.xml 2014-09-03 21:06:58 UTC (rev 15425)
+++ trunk/samples/conf/andromdapp/crud/configuration.xml 2014-09-06 23:09:47 UTC (rev 15426)
@@ -15,6 +15,7 @@
<property name="implementationLanguage">java</property>
<property name="web">yes</property>
<property name="webservice">none</property>
+ <property name="embeddedWebServer">tomcat</property>
<property name="model">jar:file:${project.basedir}/src/main/uml/CRUDModel.xml.zip!/CRUDModel.xml</property>
<property name="configurationUri">${project.basedir}/src/main/config/andromda.xml</property>
<property name="databaseType">hypersonic</property>
Modified: trunk/samples/conf/andromdapp/online-store/configuration.xml
===================================================================
--- trunk/samples/conf/andromdapp/online-store/configuration.xml 2014-09-03 21:06:58 UTC (rev 15425)
+++ trunk/samples/conf/andromdapp/online-store/configuration.xml 2014-09-06 23:09:47 UTC (rev 15426)
@@ -13,6 +13,7 @@
<property name="transactionPersistenceType">none</property>
<property name="web">yes</property>
<property name="webservice">none</property>
+ <property name="embeddedWebServer">tomcat</property>
<property name="model">jar:file:${project.basedir}/src/main/uml/online-store.xml.zip!/online-store.xml</property>
<property name="databaseType">h2</property>
<property name="testDatabase">h2</property>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-08-21 18:23:25
|
Revision: 15418
http://sourceforge.net/p/andromda/svn/15418
Author: walterim
Date: 2014-08-21 18:23:22 +0000 (Thu, 21 Aug 2014)
Log Message:
-----------
Added a new namespace property to generate constants with properties names.
Modified Paths:
--------------
trunk/cartridges/andromda-hibernate/src/main/resources/META-INF/andromda/cartridge.xml
trunk/cartridges/andromda-hibernate/src/main/resources/META-INF/andromda/namespace.xml
trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/GlobalMacros.vm
trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/HibernateEntity.vsl
Modified: trunk/cartridges/andromda-hibernate/src/main/resources/META-INF/andromda/cartridge.xml
===================================================================
--- trunk/cartridges/andromda-hibernate/src/main/resources/META-INF/andromda/cartridge.xml 2014-08-21 18:14:53 UTC (rev 15417)
+++ trunk/cartridges/andromda-hibernate/src/main/resources/META-INF/andromda/cartridge.xml 2014-08-21 18:23:22 UTC (rev 15418)
@@ -80,6 +80,8 @@
<property reference="enableAnnotations"/>
<property reference="hibernateEntityAnnotations"/>
<property reference="hibernateJAXBPersistence"/>
+ <property reference="generateAttributeNameConstant"/>
+ <property reference="attributeNameConstantPrefix"/>
<!-- These 6 properties are only relevant for Hibernate 3 -->
<property reference="hibernateQueryFactory"/>
<property reference="hibernateOneToManyNotFoundAction"/>
@@ -96,6 +98,7 @@
<condition name="enableTemplating">$enableTemplating.equalsIgnoreCase("true")</condition>
<condition name="hibernateEntityAnnotations">$hibernateEntityAnnotations.equalsIgnoreCase("true")</condition>
<condition name="dateTimeGeneratedText">$dateTimeGeneratedText.equalsIgnoreCase("true")</condition>
+ <condition name="generateAttributeNameConstant">$generateAttributeNameConstant.equalsIgnoreCase("true")</condition>
<!-- condition merge-point-->
<!-- cartridge-resource merge-point -->
Modified: trunk/cartridges/andromda-hibernate/src/main/resources/META-INF/andromda/namespace.xml
===================================================================
--- trunk/cartridges/andromda-hibernate/src/main/resources/META-INF/andromda/namespace.xml 2014-08-21 18:14:53 UTC (rev 15417)
+++ trunk/cartridges/andromda-hibernate/src/main/resources/META-INF/andromda/namespace.xml 2014-08-21 18:23:22 UTC (rev 15418)
@@ -940,6 +940,19 @@
(This property is only supported for hibernate 3 code generation)
</documentation>
</property>
+ <property name="generateAttributeNameConstant">
+ <default>false</default>
+ <documentation>
+ Indicates whether or not to generate a constant string with the attributes names in entities
+ to easier the references in criteria (and other) queries.
+ </documentation>
+ </property>
+ <property name="attributeNameConstantPrefix">
+ <default>_</default>
+ <documentation>
+ Prefix to be used in the constant name, when generateAttributeNameConstant=true
+ </documentation>
+ </property>
</propertyGroup>
</properties>
</namespace>
\ No newline at end of file
Modified: trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/GlobalMacros.vm
===================================================================
--- trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/GlobalMacros.vm 2014-08-21 18:14:53 UTC (rev 15417)
+++ trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/GlobalMacros.vm 2014-08-21 18:23:22 UTC (rev 15418)
@@ -224,6 +224,10 @@
#set ($visibility="private")
#end
#if (!$entity.compositeIdentifier || ($entity.compositeIdentifier && !$attribute.identifier))
+#if ($generateAttributeNameConstant)
+ public static final String ${attributeNameConstantPrefix}${attribute.name}="${attribute.name}";
+
+#end
$visibility $typeName $attribute.name#if ($attribute.defaultValuePresent) = $attribute.defaultValue#end;
#end
Modified: trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/HibernateEntity.vsl
===================================================================
--- trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/HibernateEntity.vsl 2014-08-21 18:14:53 UTC (rev 15417)
+++ trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/HibernateEntity.vsl 2014-08-21 18:23:22 UTC (rev 15418)
@@ -131,6 +131,10 @@
#if ($hibernateEntityAnnotations)
@javax.persistence.EmbeddedId
#end
+#if ($generateAttributeNameConstant)
+ public static final String ${attributeNameConstantPrefix}${entity.identifierName}="${entity.identifierName}";
+
+#end
private $entity.fullyQualifiedIdentifierTypeName $entity.identifierName;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-08-21 18:14:56
|
Revision: 15417
http://sourceforge.net/p/andromda/svn/15417
Author: walterim
Date: 2014-08-21 18:14:53 +0000 (Thu, 21 Aug 2014)
Log Message:
-----------
Avoid searching using upload-type fields.
Modified Paths:
--------------
trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl
trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/JsfUtils.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudSearchExample.vsl
Modified: trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl 2014-08-21 18:12:15 UTC (rev 15416)
+++ trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl 2014-08-21 18:14:53 UTC (rev 15417)
@@ -302,7 +302,7 @@
final ${manageable.valueObjectClassName} vo = new ${manageable.valueObjectClassName}();
#foreach ($member in $manageable.manageableMembers)
#if ($member.inputFile || $member.needsFileUpload)
- vo.${member.setterName}(form.${member.getterName}()==null?null:org.apache.commons.io.IOUtils.toByteArray(form.${member.getterName}().getInputStream()));
+ vo.${member.setterName}(form.${member.getterName}()==null?null:org.apache.commons.io.IOUtils.toByteArray(form.${member.getterName}().getInputstream()));
#else
vo.${member.setterName}(form.${member.getterName}());
#end
@@ -566,8 +566,10 @@
{
final $searchExampleClassName searchExample = new ${searchExampleClassName}();
#foreach ($member in $manageable.manageableMembers)
- searchExample.${member.setterName}(filter.${member.getterName}());
+#if (!$member.inputFile && !$member.needsFileUpload)
+ searchExample.${member.setterName}(filter.${member.getterName}());
#end
+#end
final java.util.Collection<${manageable.valueObjectClassName}> result = ${manageable.manageableServiceAccessorCall}.searchByExample(searchExample);
return result;
Modified: trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/JsfUtils.java.vsl
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/JsfUtils.java.vsl 2014-08-21 18:12:15 UTC (rev 15416)
+++ trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/JsfUtils.java.vsl 2014-08-21 18:14:53 UTC (rev 15417)
@@ -311,6 +311,16 @@
}
/**
+ * Returns an UIComponent from the current view root
+ *
+ * @param id the id of the component.
+ * @return ParameterValue
+ */
+ public static javax.faces.component.UIComponent getComponent(String id) {
+ return javax.faces.context.FacesContext.getCurrentInstance().getViewRoot().findComponent(id) ;
+ }
+
+ /**
* Force the component to get its value from the backing bean before rendering
*
* @param uic the parent UIComponent.
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudSearchExample.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudSearchExample.vsl 2014-08-21 18:12:15 UTC (rev 15416)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudSearchExample.vsl 2014-08-21 18:14:53 UTC (rev 15417)
@@ -22,6 +22,7 @@
#foreach ($member in $manageable.getAttributes(false))
#set ($visibility = $member.visibility)
+#if (!$member.inputFile && !$member.needsFileUpload)
#if ($visibility.equals("public"))#set ($visibility = "private")#end
#if ($member.type.primitive)
#set ($memberTypeName = ${member.type.wrapperName})
@@ -49,6 +50,7 @@
}
#end
+#end
#foreach ($member in $manageable.manageableAssociationEnds)
#if (!$manageable.generalization.manageableAssociationEnds.contains($member))## do not process associations defined in an ancestor
#if ($member.type.compositeIdentifier)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-06-19 12:14:21
|
Revision: 15407
http://sourceforge.net/p/andromda/svn/15407
Author: walterim
Date: 2014-06-19 12:14:16 +0000 (Thu, 19 Jun 2014)
Log Message:
-----------
Added support to 'dateTimeGeneratedText', so it os possible to turn on/off the date/time generation in generated files.
Modified Paths:
--------------
trunk/cartridges/andromda-spring/src/main/resources/META-INF/andromda/cartridge.xml
trunk/cartridges/andromda-spring/src/main/resources/META-INF/andromda/namespace.xml
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/DefaultServiceException.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringBeanLocator.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringClientExceptionHandlingAdvice.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringDao.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringPrincipalStore.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringService.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringServiceBase.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringServiceLocator.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringWebServiceDelegator.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-dataSource.xml.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-localDataSource.xml.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-server.xml.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-testDataSource.xml.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext.xml.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/beanRefFactory.xml.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDao.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudSearchExample.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudService.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceBase.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceImpl.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceLocator.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudValueObject.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/applicationContext-manageable.xml.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionBean.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionLocal.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionLocalHome.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionRemote.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionRemoteHome.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/applicationContext-localEjb.xml.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/applicationContext-remoteEjb.xml.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/ejb-jar.xml.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/jboss.xml.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/H2.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearch.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearchConfiguration.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearchParameter.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearchProperties.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SearchCriteria.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoBase.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoImpl.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/search/PropertySearch.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/search/Search.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/search/SearchParameter.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/jms/MessageListener.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/jms/applicationContext-jms.xml.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/paging/PaginationResult.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/presentation/hibernate/OpenSessionInViewFilter.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/RemoteDispatcherServlet.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/RemoteWebApplicationContext.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/client/AuthenticatingHttpInvokerRequestExecutor.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/client/SpringClientServiceLocator.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/SpringClientTest.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/SpringServerTest.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/ThisBeanFactory.java.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/applicationContext-server-authentication.xml.vsl
trunk/cartridges/andromda-spring/src/test/expected/cartridge-output.zip
trunk/cartridges/andromda-spring/src/test/expected/cartridge-outputUML2.zip
Modified: trunk/cartridges/andromda-spring/src/main/resources/META-INF/andromda/cartridge.xml
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/META-INF/andromda/cartridge.xml 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/META-INF/andromda/cartridge.xml 2014-06-19 12:14:16 UTC (rev 15407)
@@ -21,6 +21,7 @@
<templateObject name="converter" className="org.andromda.utils.JavaTypeConverter">
<property reference="javaTypeConversionIgnoreList"/>
</templateObject>
+ <templateObject name="javaUtils" className="org.andromda.cartridges.java.JavaUtils"/>
<!-- cartridge-templateObject merge-point-->
<templatePostProcessor className="org.andromda.core.common.ImportBeautifierPostProcessorImpl"/>
@@ -215,6 +216,7 @@
<property reference="recordType"/>
<property reference="xmlConfiguration"/>
<property reference="rooScripts"/>
+ <property reference="dateTimeGeneratedText"/>
<!-- cartridge-property merge-point -->
@@ -242,6 +244,7 @@
<condition name="remoteUsernameAuthenticationEnabled">$stringUtils.isNotBlank($remoteServiceUsername)</condition>
<condition name="xmlConfiguration">$xmlConfiguration.equalsIgnoreCase("true")</condition>
<condition name="rooScripts">$rooScripts.equalsIgnoreCase("true")</condition>
+ <condition name="dateTimeGeneratedText">$dateTimeGeneratedText.equalsIgnoreCase("true")</condition>
<!-- condition merge-point-->
<!-- cartridge-resource merge-point -->
Modified: trunk/cartridges/andromda-spring/src/main/resources/META-INF/andromda/namespace.xml
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/META-INF/andromda/namespace.xml 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/META-INF/andromda/namespace.xml 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1586,6 +1586,12 @@
The name to give the AuthenticatingHttpInvokerRequestExecutor class.
</documentation>
</property>
+ <property name="dateTimeGeneratedText">
+ <default>true</default>
+ <documentation>
+ Adds a comment with the current date and time to the generated file.
+ </documentation>
+ </property>
</propertyGroup>
</properties>
</namespace>
\ No newline at end of file
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/DefaultServiceException.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/DefaultServiceException.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/DefaultServiceException.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,7 +1,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: DefaultServiceException.vsl in andromda-spring-cartridge.
+// Generated by DefaultServiceException.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#set ($generatedFile = "${stringUtils.replace($service.fullyQualifiedDefaultExceptionName,'.','/')}.java")
#if ($stringUtils.isNotBlank($service.packageName))
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringBeanLocator.java.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringBeanLocator.java.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringBeanLocator.java.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,7 +1,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: SpringBeanLocator.java.vsl in andromda-spring-cartridge.
+// Generated by SpringBeanLocator.java.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#set ($className = "BeanLocator")
#set ($generatedFile = "${className}.java")
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringClientExceptionHandlingAdvice.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringClientExceptionHandlingAdvice.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringClientExceptionHandlingAdvice.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,5 +1,5 @@
// license-header java merge-point
-// Generated by SpringClientExceptionHandlingAdvice.vsl
+// Generated by SpringClientExceptionHandlingAdvice.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
/**
* This is only generated once! It will never be overwritten.
* You can (and have to!) safely modify it by hand.
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringDao.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringDao.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringDao.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -3,7 +3,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: SpringDao.vsl in andromda-spring-cartridge.
+// Generated by SpringDao.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#if ($stringUtils.isNotBlank($entity.packageName))
package $entity.packageName;
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringPrincipalStore.java.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringPrincipalStore.java.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringPrincipalStore.java.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -2,7 +2,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: SpringPrincipalStore.vsl in andromda-spring-cartridge.
+// Generated by SpringPrincipalStore.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#set ($generatedFile = "${principalStoreName}.java")
#if($stringUtils.isNotBlank($springTypesPackage))
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringService.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringService.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringService.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,7 +1,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: SpringService.vsl in andromda-spring-cartridge.
+// Generated by SpringService.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
/**
* TEMPLATE: SpringService.vsl in andromda-spring cartridge
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringServiceBase.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringServiceBase.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringServiceBase.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -2,7 +2,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: SpringServiceBase.vsl in andromda-spring-cartridge.
+// Generated by SpringServiceBase.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
/**
* TEMPLATE: SpringServiceBase.vsl in andromda-spring cartridge
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringServiceLocator.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringServiceLocator.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringServiceLocator.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -2,7 +2,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: SpringServiceLocator.vsl in andromda-spring-cartridge.
+// Generated by SpringServiceLocator.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#set ($generatedFile = "${serviceLocatorName}.java")
#if($stringUtils.isNotBlank($springTypesPackage))
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringWebServiceDelegator.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringWebServiceDelegator.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringWebServiceDelegator.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,5 +1,5 @@
// license-header java merge-point
-// Generated by SpringWebServiceDelegator.vsl
+// Generated by SpringWebServiceDelegator.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
#if ($stringUtils.isNotBlank($service.implementationPackageName))
package $service.implementationPackageName;
#end
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-dataSource.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-dataSource.xml.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-dataSource.xml.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,6 +1,6 @@
#if ($stringUtils.isNotBlank($dataSource))
<?xml version="1.0" encoding="$xmlEncoding"?>
-<!-- Generated by: applicationContext-dataSource.xml.vsl in andromda-spring-cartridge. -->
+<!-- Generated by applicationContext-dataSource.xml.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!. -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:lang="http://www.springframework.org/schema/lang"
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-localDataSource.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-localDataSource.xml.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-localDataSource.xml.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,6 +1,6 @@
#if ($stringUtils.isNotBlank($driver))
<?xml version="1.0" encoding="$xmlEncoding"?>
-<!-- Generated by: applicationContext-localDataSource.xml.vsl in andromda-spring-cartridge. -->
+<!-- Generated by applicationContext-localDataSource.xml.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!. -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-server.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-server.xml.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-server.xml.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="$xmlEncoding"?>
-<!-- Generated by: applicationContext-server.xml.vsl in andromda-spring-cartridge. -->
+<!-- Generated by applicationContext-server.xml.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!. -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-testDataSource.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-testDataSource.xml.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext-testDataSource.xml.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,6 +1,6 @@
#if ($stringUtils.isNotBlank($driver))
<?xml version="1.0" encoding="$xmlEncoding"?>
-<!-- Generated by: applicationContext-testDataSource.xml.vsl in andromda-spring-cartridge. -->
+<!-- Generated by applicationContext-testDataSource.xml.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!. -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext.xml.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/applicationContext.xml.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="$xmlEncoding"?>
-<!-- Generated by: applicationContext.xml.vsl in andromda-spring-cartridge. -->
+<!-- Generated by applicationContext.xml.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!. -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:lang="http://www.springframework.org/schema/lang"
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/beanRefFactory.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/beanRefFactory.xml.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/beanRefFactory.xml.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="$xmlEncoding"?>
-<!-- Generated by: beanRefFactory.xml.vsl in andromda-spring-cartridge. -->
+<!-- Generated by beanRefFactory.xml.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!. -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDao.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDao.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDao.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,7 +1,7 @@
#if ($recordType.equalsIgnoreCase("dao"))
#set ($generatedFile = "${manageable.manageableDaoFullPath}.java")
// license-header java merge-point
-// Generated by: crud/SpringCrudDao.vsl in andromda-spring-cartridge.
+// Generated by crud/SpringCrudDao.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
##
package $manageable.manageablePackageName;
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,6 +1,6 @@
#set ($generatedFile = "${manageable.manageableDaoBaseFullPath}.java")
// license-header java merge-point
-// Generated by: crud/SpringCrudDaoBase.vsl in andromda-spring-cartridge.
+// Generated by crud/SpringCrudDaoBase.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
#if ($hibernateVersion.startsWith("4"))
#set ($hibernate4=true)
#else
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudSearchExample.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudSearchExample.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudSearchExample.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -4,7 +4,7 @@
## START TEMPLATE
##
// license-header java merge-point
-// Generated by: crud/SpringCrudSearchExample.vsl in andromda-spring-cartridge.
+// Generated by crud/SpringCrudSearchExample.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
package $manageable.manageablePackageName;
/**
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudService.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudService.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudService.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,6 +1,6 @@
#set ($generatedFile = "${manageable.manageableServiceFullPath}.java")
// license-header java merge-point
-// Generated by: crud/SpringCrudService.vsl in andromda-spring-cartridge.
+// Generated by crud/SpringCrudService.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
##
#set ($memberList = $manageable.listManageableMembers(true))
##
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceBase.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceBase.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceBase.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,6 +1,6 @@
#set ($generatedFile = "${manageable.manageableServiceBaseFullPath}.java")
// license-header java merge-point
-// Generated by: crud/SpringCrudServiceBase.vsl in andromda-spring-cartridge.
+// Generated by crud/SpringCrudServiceBase.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
##
#set ($memberList = $manageable.listManageableMembers(true))
#set ($memberListArguments = $manageable.listManageableMembers(false))
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceImpl.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceImpl.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceImpl.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,6 +1,6 @@
#set ($generatedFile = "${manageable.manageableServiceFullPath}Impl.java")
// license-header java merge-point
-// Generated by: crud/SpringCrudServiceIml.vsl in andromda-spring-cartridge.
+// Generated by crud/SpringCrudServiceImpl.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end.
package $manageable.manageablePackageName;
/**
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceLocator.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceLocator.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceLocator.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -2,7 +2,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: crud/SpringCrudServiceLocator.vsl in andromda-spring-cartridge.
+// Generated by crud/SpringCrudServiceLocator.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#set ($generatedFile = "${manageableServiceLocatorName}.java")
#if($stringUtils.isNotBlank($springTypesPackage))
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudValueObject.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudValueObject.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudValueObject.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -3,7 +3,7 @@
## START TEMPLATE
##
// license-header java merge-point
-// Generated by: crud/SpringCrudValueObject.vsl in andromda-spring-cartridge.
+// Generated by crud/SpringCrudValueObject.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
package $manageable.manageablePackageName;
/**
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/applicationContext-manageable.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/applicationContext-manageable.xml.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/applicationContext-manageable.xml.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="$xmlEncoding"?>
-<!-- Generated by: applicationContext-manageable.xml.vsl in andromda-spring-cartridge. -->
+<!-- Generated by applicationContext-manageable.xml.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!. -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:lang="http://www.springframework.org/schema/lang"
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionBean.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionBean.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionBean.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -2,7 +2,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: ejb/SpringSessionBean.vsl in andromda-spring-cartridge.
+// Generated by ejb/SpringSessionBean.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
package ${service.ejbPackageName};
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionLocal.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionLocal.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionLocal.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -11,7 +11,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: ejb/SpringSessionLocal.vsl in andromda-spring-cartridge.
+// Generated by ejb/SpringSessionLocal.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
package $service.ejbPackageName;
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionLocalHome.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionLocalHome.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionLocalHome.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -11,7 +11,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: ejb/SpringSessionLocalHome.vsl in andromda-spring-cartridge.
+// Generated by ejb/SpringSessionLocalHome.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
package $service.ejbPackageName;
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionRemote.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionRemote.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionRemote.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -7,7 +7,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: ejb/SpringSessionRemote.vsl in andromda-spring-cartridge.
+// Generated by ejb/SpringSessionRemote.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
package $service.ejbPackageName;
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionRemoteHome.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionRemoteHome.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/SpringSessionRemoteHome.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -7,7 +7,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: ejb/SpringSessionRemoteHome.vsl in andromda-spring-cartridge.
+// Generated by ejb/SpringSessionRemoteHome.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
package $service.ejbPackageName;
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/applicationContext-localEjb.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/applicationContext-localEjb.xml.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/applicationContext-localEjb.xml.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,5 +1,6 @@
#if ($ejbsEnabled && $localEjbsPresent)
<?xml version="1.0" encoding="$xmlEncoding"?>
+<!-- Generated by applicationContext-localEjb.xml.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!. -->
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/applicationContext-remoteEjb.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/applicationContext-remoteEjb.xml.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/applicationContext-remoteEjb.xml.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,5 +1,6 @@
#if ($ejbsEnabled && $remoteEjbsPresent)
<?xml version="1.0" encoding="$xmlEncoding"?>
+<!-- Generated by applicationContext-remoteEjb.xml.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!. -->
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/ejb-jar.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/ejb-jar.xml.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/ejb-jar.xml.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="$xmlEncoding"?>
+<!-- Generated by ejb-jar.xml.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!. -->
<!--DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
"http://java.sun.com/dtd/ejb-jar_2_0.dtd"-->
<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee"
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/jboss.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/jboss.xml.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/ejb/jboss.xml.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="$xmlEncoding"?>
+<!-- Generated by jboss.xml.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!. -->
<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN"
"http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/H2.java.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/H2.java.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/H2.java.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,5 +1,5 @@
// license-header java merge-point
-// Generated by: hibernate/H2.java.vsl in andromda-spring-cartridge.
+// Generated by hibernate/H2.java.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end.
/**
* This is only generated once! It will never be overwritten.
* You can (and have to!) safely modify it by hand.
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearch.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearch.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearch.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -2,7 +2,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: hibernate/HibernateSearch.vsl in andromda-spring-cartridge.
+// Generated by hibernate/HibernateSearch.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#set ($generatedFile = "${criteriaSearchBaseName}.java")
#if($stringUtils.isNotBlank($springTypesPackage))
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearchConfiguration.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearchConfiguration.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearchConfiguration.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -2,7 +2,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: hibernate/HibernateSearchConfiguration.vsl in andromda-spring-cartridge.
+// Generated by hibernate/HibernateSearchConfiguration.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#set ($generatedFile = "${criteriaSearchBaseName}Configuration.java")
#if($stringUtils.isNotBlank($springTypesPackage))
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearchParameter.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearchParameter.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearchParameter.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -2,7 +2,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: hibernate/HibernateSearchParameter.vsl in andromda-spring-cartridge.
+// Generated by hibernate/HibernateSearchParameter.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#set ($generatedFile = "${criteriaSearchBaseName}Parameter.java")
#if($stringUtils.isNotBlank($springTypesPackage))
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearchProperties.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearchProperties.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearchProperties.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -2,7 +2,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: hibernate/HibernateSearchProperties.vsl in andromda-spring-cartridge.
+// Generated by hibernate/HibernateSearchProperties.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#set ($generatedFile = "${criteriaSearchBaseName}Properties.java")
#if($stringUtils.isNotBlank($springTypesPackage))
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SearchCriteria.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SearchCriteria.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SearchCriteria.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -6,7 +6,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: hibernate/SearchCriteria.vsl in andromda-spring-cartridge.
+// Generated by hibernate/SearchCriteria.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#if ($stringUtils.isNotBlank($class.packageName))
package $class.packageName;
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoBase.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoBase.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoBase.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -10,7 +10,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand! hibernate4=$hibernate4 hibernateVersion=$hibernateVersion
-// Generated by hibernate/SpringHibernateDaoBase.vsl in andromda-spring-cartridge on $springUtils.date.
+// Generated by hibernate/SpringHibernateDaoBase.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#if ($stringUtils.isNotBlank($entity.packageName))
package $entity.packageName;
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoImpl.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoImpl.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoImpl.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,6 +1,6 @@
#if ($recordType.equalsIgnoreCase("dao"))
#set ($generatedFile = "${entity.packagePath}/${entity.daoImplementationName}")
-// Generated by hibernate/SpringHibernateDaoImpl.vsl in andromda-spring-cartridge on $springUtils.date.
+// Generated by hibernate/SpringHibernateDaoImpl.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end.
#if ($entity.daoImplementationRequired)
#set ($generatedFile = "${generatedFile}.${implementationLanguage}")
// license-header ${implementationLanguage} merge-point
@@ -13,7 +13,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: SpringHibernateDaoImpl.vsl in andromda-spring-cartridge.
+// Generated by SpringHibernateDaoImpl.vsl in andromda-spring-cartridge.
//
#end
#if ($stringUtils.isNotBlank($entity.packageName))
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/search/PropertySearch.java.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/search/PropertySearch.java.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/search/PropertySearch.java.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -2,7 +2,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: hibernate/search/PropertySearch.java.vsl in andromda-spring-cartridge.
+// Generated by hibernate/search/PropertySearch.java.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#set ($className = "PropertySearch")
#set ($generatedFile = "${className}.java")
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/search/Search.java.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/search/Search.java.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/search/Search.java.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -2,7 +2,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: hibernate/search/Search.java.vsl in andromda-spring-cartridge.
+// Generated by hibernate/search/Search.java.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#set ($className = "Search")
#set ($generatedFile = "${className}.java")
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/search/SearchParameter.java.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/search/SearchParameter.java.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/search/SearchParameter.java.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -2,7 +2,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: hibernate/search/SearchParameter.java.vsl in andromda-spring-cartridge.
+// Generated by hibernate/search/SearchParameter.java.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#set ($className = "SearchParameter")
#set ($generatedFile = "${className}.java")
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/jms/MessageListener.java.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/jms/MessageListener.java.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/jms/MessageListener.java.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -2,7 +2,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: MessageListener.java.vsl in andromda-spring-cartridge.
+// Generated by MessageListener.java.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#if ($stringUtils.isNotBlank($operation.owner.packageName))
package $operation.owner.packageName;
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/jms/applicationContext-jms.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/jms/applicationContext-jms.xml.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/jms/applicationContext-jms.xml.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="$xmlEncoding"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!-- Generated by: jms/applicationContext-jms.xml.vsl in andromda-spring-cartridge. -->
+<!-- Generated by jms/applicationContext-jms.xml.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!. -->
<beans>
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/paging/PaginationResult.java.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/paging/PaginationResult.java.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/paging/PaginationResult.java.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,6 +1,6 @@
#if ($recordType.equalsIgnoreCase("dao"))
// license-header java merge-point
-// Generated by: paging/PaginaionResult.java.vsl in andromda-spring-cartridge.
+// Generated by paging/PaginaionResult.java.vsl in andromda-spring-cartridge.
#set ($className = "PaginationResult")
#set ($generatedFile = "${className}.java")
#if($stringUtils.isNotBlank($springCommonTypesPackage))
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/presentation/hibernate/OpenSessionInViewFilter.java.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/presentation/hibernate/OpenSessionInViewFilter.java.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/presentation/hibernate/OpenSessionInViewFilter.java.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,7 +1,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: OpenSessionInViewFilter.java.vsl in andromda-spring-cartridge.
+// Generated by OpenSessionInViewFilter.java.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!.
//
#if($stringUtils.isNotBlank($springPresentationTypesPackage))
package $springPresentationTypesPackage;
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/RemoteDispatcherServlet.java.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/RemoteDispatcherServlet.java.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/RemoteDispatcherServlet.java.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,7 +1,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: remoting/RemoteDispatcherServlet.java.vsl in andromda-spring-cartridge.
+// Generated by remoting/RemoteDispatcherServlet.java.vsl in andromda-spring-cartridge.
//
#set ($className = $remoteDispatcherServletName)
#set ($generatedFile = "${className}.java")
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/RemoteWebApplicationContext.java.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/RemoteWebApplicationContext.java.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/RemoteWebApplicationContext.java.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,7 +1,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: remoting/RemoteWebApplicationContext.java.vsl in andromda-spring-cartridge.
+// Generated by remoting/RemoteWebApplicationContext.java.vsl in andromda-spring-cartridge.
//
#set ($className = $remoteWebApplicationContextName)
#set ($generatedFile = "${className}.java")
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/client/AuthenticatingHttpInvokerRequestExecutor.java.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/client/AuthenticatingHttpInvokerRequestExecutor.java.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/client/AuthenticatingHttpInvokerRequestExecutor.java.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,7 +1,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: /remoting/client/AuthenticatingHttpInvokerRequestExecutor.java.vsl in andromda-spring-cartridge.
+// Generated by /remoting/client/AuthenticatingHttpInvokerRequestExecutor.java.vsl in andromda-spring-cartridge.
//
#set ($className = $remoteAuthenticatingHttpInvokerRequestExecutorName)
#set ($generatedFile = "${className}.java")
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/client/SpringClientServiceLocator.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/client/SpringClientServiceLocator.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/remoting/client/SpringClientServiceLocator.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,7 +1,7 @@
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: remoting/client/SpringClientServiceLocator.vsl in andromda-spring-cartridge.
+// Generated by remoting/client/SpringClientServiceLocator.vsl in andromda-spring-cartridge.
//
#set ($generatedFile = "${clientServiceLocatorName}.java")
#if($stringUtils.isNotBlank($springTypesPackage))
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/SpringClientTest.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/SpringClientTest.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/SpringClientTest.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,6 +1,6 @@
#set ($generatedFile = "${service.packagePath}/${service.name}RemoteTest.java")
// license-header java merge-point
-// Generated by: richclient/SpringClientTest.vsl in andromda-spring-cartridge.
+// Generated by richclient/SpringClientTest.vsl in andromda-spring-cartridge.
/**
* This is only generated once! It will never be overwritten.
* You can (and have to!) safely modify it by hand.
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/SpringServerTest.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/SpringServerTest.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/SpringServerTest.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,6 +1,6 @@
#set ($generatedFile = "${service.packagePath}/${service.name}LocalTest.java")
// license-header java merge-point
-// Generated by: richclient/SpringServerTest.vsl in andromda-spring-cartridge.
+// Generated by richclient/SpringServerTest.vsl in andromda-spring-cartridge.
/**
* This is only generated once! It will never be overwritten.
* You can (and have to!) safely modify it by hand.
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/ThisBeanFactory.java.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/ThisBeanFactory.java.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/ThisBeanFactory.java.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -10,7 +10,7 @@
* the bean was created in. Its purpose is to allow the containing application
* context to be retrieved as a named bean. It is used primarily for exposing the
* application context during unit testing.
- * Generated by: richclient/ThisBeanFactory.java.vsl in andromda-spring-cartridge.
+ * Generated by richclient/ThisBeanFactory.java.vsl in andromda-spring-cartridge.
*/
public class ThisBeanFactory
implements ApplicationContextAware, FactoryBean
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/applicationContext-server-authentication.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/applicationContext-server-authentication.xml.vsl 2014-06-19 11:59:40 UTC (rev 15406)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/richclient/applicationContext-server-authentication.xml.vsl 2014-06-19 12:14:16 UTC (rev 15407)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!-- Generated by richclient/applicationContext-authentication.xml.vsl in andromda-spring-cartridge -->
+<!-- Generated by richclient/applicationContext-authentication.xml.vsl in andromda-spring-cartridge#if($dateTimeGeneratedText) on $javaUtils.date#end. Do not modify by hand!. -->
<beans>
<bean id="basicProcessingFilter" class="org.springframework.security.web.authentication.www.BasicAuthenticationFilter">
<property name="authenticationManager"><ref bean="${securityAuthenticationManager}"/></property>
Modified: trunk/cartridges/andromda-spring/src/test/expected/cartridge-output.zip
===================================================================
(Binary files differ)
Modified: trunk/cartridges/andromda-spring/src/test/expected/cartridge-outputUML2.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-06-19 11:59:48
|
Revision: 15406
http://sourceforge.net/p/andromda/svn/15406
Author: walterim
Date: 2014-06-19 11:59:40 +0000 (Thu, 19 Jun 2014)
Log Message:
-----------
Correction in comment.
Modified Paths:
--------------
trunk/cartridges/andromda-java/src/main/resources/META-INF/andromda/namespace.xml
Modified: trunk/cartridges/andromda-java/src/main/resources/META-INF/andromda/namespace.xml
===================================================================
--- trunk/cartridges/andromda-java/src/main/resources/META-INF/andromda/namespace.xml 2014-04-22 12:19:16 UTC (rev 15405)
+++ trunk/cartridges/andromda-java/src/main/resources/META-INF/andromda/namespace.xml 2014-06-19 11:59:40 UTC (rev 15406)
@@ -118,7 +118,7 @@
<property name="dateTimeGeneratedText">
<default>true</default>
<documentation>
- Adds a comment with the current date and time to the generated.
+ Adds a comment with the current date and time to the generated file.
</documentation>
</property>
<property name="javaVersion">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-04-22 12:19:19
|
Revision: 15405
http://sourceforge.net/p/andromda/svn/15405
Author: walterim
Date: 2014-04-22 12:19:16 +0000 (Tue, 22 Apr 2014)
Log Message:
-----------
Protected service operations should not override.
Modified Paths:
--------------
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringServiceBase.vsl
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringServiceBase.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringServiceBase.vsl 2014-04-22 12:18:06 UTC (rev 15404)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/SpringServiceBase.vsl 2014-04-22 12:19:16 UTC (rev 15405)
@@ -152,7 +152,7 @@
/**
* {@inheritDoc}
*/
-#if ($enableAnnotations && $operation.visibility != "private")
+#if ($enableAnnotations && $operation.visibility != "private" && $operation.visibility != "protected")
@Override
#end
$operation.visibility $operation.getterSetterReturnTypeName $operation.getSignature("final")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-04-22 12:18:09
|
Revision: 15404
http://sourceforge.net/p/andromda/svn/15404
Author: walterim
Date: 2014-04-22 12:18:06 +0000 (Tue, 22 Apr 2014)
Log Message:
-----------
Removing parameters that should go in the context.
Modified Paths:
--------------
trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl
Modified: trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl 2014-04-22 12:17:43 UTC (rev 15403)
+++ trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl 2014-04-22 12:18:06 UTC (rev 15404)
@@ -11,14 +11,6 @@
<distributable/>
#end
-##a ser revisto
- <context-param>
- <description>Project stage for the application (new in 2.0). Expects one of
- the following values: Development, Production, SystemTest, UnitTest
- </description>
- <param-name>javax.faces.PROJECT_STAGE</param-name>
- <param-value>#if($enableMyFacesDevelopmentSupport)Development#else Production#end</param-value>
- </context-param>
#if($trinidad)
<context-param>
<param-name>org.apache.myfaces.trinidad.ENABLE_LIGHTWEIGHT_DIALOGS</param-name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-04-22 12:17:47
|
Revision: 15403
http://sourceforge.net/p/andromda/svn/15403
Author: walterim
Date: 2014-04-22 12:17:43 +0000 (Tue, 22 Apr 2014)
Log Message:
-----------
Removing unused template.
Modified Paths:
--------------
trunk/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml
Removed Paths:
-------------
trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/crud-functions-taglib.xml.vsl
Modified: trunk/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml 2014-02-17 20:41:51 UTC (rev 15402)
+++ trunk/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml 2014-04-22 12:17:43 UTC (rev 15403)
@@ -710,22 +710,6 @@
<!-- manageable -->
<template
- path="templates/jsf2/configuration/crud-functions-taglib.xml.vsl"
- outputPattern="WEB-INF/crud-functions-taglib.xml"
- outlet="configuration"
- overwrite="true"
- outputToSingleFile="true"
- outputOnEmptyElements="false">
- <modelElements>
- <modelElement variable="manageables">
- <type name="org.andromda.cartridges.jsf2.metafacades.JSFManageableEntity">
- <property name="needsUserInterface"/>
- </type>
- </modelElement>
- </modelElements>
- </template>
-
- <template
path="templates/jsf2/flow/crud/ActionForward.java.vsl"
outputPattern="$generatedFile"
outlet="controllers"
Deleted: trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/crud-functions-taglib.xml.vsl
===================================================================
--- trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/crud-functions-taglib.xml.vsl 2014-02-17 20:41:51 UTC (rev 15402)
+++ trunk/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/crud-functions-taglib.xml.vsl 2014-04-22 12:17:43 UTC (rev 15403)
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC
- "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-
-<facelet-taglib>
- <namespace>http://www.andromda.org/cartridges/jsf/crud</namespace>
-#foreach($manageable in $manageables)
-#if ($manageable.compositeIdentifier || !$manageable.identifiers.iterator().next().type.primitive)
-#set($idParamClass = $manageable.fullyQualifiedIdentifierTypeName)
-#else
-#set($idParamClass = $manageable.identifiers.iterator().next().type.wrapperName)
-#if(!$idParamClass.startsWith("java.lang."))
-#set($idParamClass = "java.lang.${idParamClass}")
-#end
-#end
- <function>
- <function-name>load${manageable.name}</function-name>
- <function-class>${manageable.controllerType}</function-class>
- <function-signature>${manageable.manageablePackageName}.${manageable.valueObjectClassName} load($idParamClass)</function-signature>
- </function>
-#end
-</facelet-taglib>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-02-17 20:41:54
|
Revision: 15402
http://sourceforge.net/p/andromda/svn/15402
Author: walterim
Date: 2014-02-17 20:41:51 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
Added a new global property 'shortenSqlNamesMethod' supporting 'trunk' (default) and 'removeVowels' that remove the vowels from the end.
Modified Paths:
--------------
trunk/samples/animal-quiz/mda/src/main/config/andromda.xml
trunk/samples/car-rental-system/mda/src/main/config/andromda.xml
trunk/samples/crud/mda/src/main/config/andromda.xml
Modified: trunk/samples/animal-quiz/mda/src/main/config/andromda.xml
===================================================================
--- trunk/samples/animal-quiz/mda/src/main/config/andromda.xml 2014-02-17 20:41:15 UTC (rev 15401)
+++ trunk/samples/animal-quiz/mda/src/main/config/andromda.xml 2014-02-17 20:41:51 UTC (rev 15402)
@@ -54,6 +54,7 @@
<property name="sqlMappingsUri">${sql.mappings}</property>
<property name="jdbcMappingsUri">JDBC</property>
<property name="maxSqlNameLength">30</property>
+ <property name="shortenSqlNamesMethod">truncate</property>
<property name="foreignKeySuffix">_FK</property>
<property name="ejbJndiNamePrefix">${application.id}-${project.version}</property>
<!-- these masking properties allow you to configure the way
Modified: trunk/samples/car-rental-system/mda/src/main/config/andromda.xml
===================================================================
--- trunk/samples/car-rental-system/mda/src/main/config/andromda.xml 2014-02-17 20:41:15 UTC (rev 15401)
+++ trunk/samples/car-rental-system/mda/src/main/config/andromda.xml 2014-02-17 20:41:51 UTC (rev 15402)
@@ -41,6 +41,7 @@
<property name="sqlMappingsUri">${sql.mappings}</property>
<property name="jdbcMappingsUri">JDBC</property>
<property name="maxSqlNameLength">30</property>
+ <property name="shortenSqlNamesMethod">truncate</property>
<property name="foreignKeySuffix">_FK</property>
<property name="ejbJndiNamePrefix">${application.id}</property>
<property name="hibernateVersion">${hibernate.version}</property>
Modified: trunk/samples/crud/mda/src/main/config/andromda.xml
===================================================================
--- trunk/samples/crud/mda/src/main/config/andromda.xml 2014-02-17 20:41:15 UTC (rev 15401)
+++ trunk/samples/crud/mda/src/main/config/andromda.xml 2014-02-17 20:41:51 UTC (rev 15402)
@@ -35,6 +35,7 @@
<property name="sqlMappingsUri">${sql.mappings}</property>
<property name="jdbcMappingsUri">JDBC</property>
<property name="maxSqlNameLength">30</property>
+ <property name="shortenSqlNamesMethod">truncate</property>
<property name="foreignKeySuffix">_FK</property>
<property name="ejbJndiNamePrefix">${application.id}</property>
<!-- used in both hibernate and spring cartridges -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-02-17 20:41:20
|
Revision: 15401
http://sourceforge.net/p/andromda/svn/15401
Author: walterim
Date: 2014-02-17 20:41:15 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
Removing some warnings.
Modified Paths:
--------------
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearch.vsl
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoBase.vsl
trunk/cartridges/andromda-spring/src/site/resources/howto/springhowto9/mda/src/main/config/andromda.xml
trunk/cartridges/andromda-spring/src/test/expected/cartridge-output.zip
trunk/cartridges/andromda-spring/src/test/expected/cartridge-outputUML2.zip
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearch.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearch.vsl 2014-02-17 20:40:52 UTC (rev 15400)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/HibernateSearch.vsl 2014-02-17 20:41:15 UTC (rev 15401)
@@ -43,9 +43,9 @@
private ${hibernateUtils.basePackage}.Criteria rootCriteria;
private Map#if ($enableTemplating)<String, ${hibernateUtils.basePackage}.Criteria>#end childCriteriaMap;
private List#if ($enableTemplating)<CriteriaSearchParameter>#end orderList;
-##if ($enableTemplating)
-## @SuppressWarnings({ "unchecked", "rawtypes" })
-##end
+#if ($enableTemplating)
+ @SuppressWarnings("rawtypes")
+#end
private Class resultType;
private static final class ParameterComparator
@@ -87,7 +87,7 @@
* @param session The Hibernate session.
* @param resultTypeIn The <code>Class</code> of the result.
*/
- public ${criteriaSearchBaseName}(${hibernateUtils.basePackage}.Session session, Class resultTypeIn)
+ public ${criteriaSearchBaseName}(${hibernateUtils.basePackage}.Session session,#if ($enableTemplating)@SuppressWarnings("rawtypes")#end Class resultTypeIn)
{
this.configuration = new ${criteriaSearchBaseName}Configuration();
this.resultType = resultTypeIn;
@@ -255,6 +255,9 @@
// to traverse to get the right criteria object
childEntityCriteria = this.rootCriteria;
// Evaluating the proper criteria object for the defined parameter
+#if ($enableTemplating)
+ @SuppressWarnings("rawtypes")
+#end
Class type = this.resultType;
for (int index = 0; index < (path.length - 1); index++)
{
@@ -296,6 +299,9 @@
// We have a parameter affecting an attribute of an inner childEntity object so we need
// to traverse to get the correct parameter name
// Evaluating the proper criteria object for the defined parameter
+#if ($enableTemplating)
+ @SuppressWarnings("rawtypes")
+#end
Class type = this.resultType;
for (int index = 0; index < (path.length - 1); index++)
{
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoBase.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoBase.vsl 2014-02-17 20:40:52 UTC (rev 15400)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/hibernate/SpringHibernateDaoBase.vsl 2014-02-17 20:41:15 UTC (rev 15401)
@@ -1824,6 +1824,9 @@
queryObject.setMaxResults(pageSize);
}
// Unchecked transformation because Set object is reused, cannot be strongly typed.
+#if ($enableTemplating)
+ @SuppressWarnings("rawtypes")
+#end
java.util.Collection results = new java.util.ArrayList(queryObject.list());
transformEntities(transform, results);
return new ${fullyQualifiedPagingResultName}(results.toArray(new Object[results.size()]), totalCount);
Modified: trunk/cartridges/andromda-spring/src/site/resources/howto/springhowto9/mda/src/main/config/andromda.xml
===================================================================
--- trunk/cartridges/andromda-spring/src/site/resources/howto/springhowto9/mda/src/main/config/andromda.xml 2014-02-17 20:40:52 UTC (rev 15400)
+++ trunk/cartridges/andromda-spring/src/site/resources/howto/springhowto9/mda/src/main/config/andromda.xml 2014-02-17 20:41:15 UTC (rev 15401)
@@ -80,6 +80,7 @@
<property name="sqlMappingsUri">${sql.mappings}</property>
<property name="jdbcMappingsUri">JDBC</property>
<property name="maxSqlNameLength">30</property>
+ <property name="shortenSqlNamesMethod">truncate</property>
<property name="foreignKeySuffix">_FK</property>
<property name="ejbJndiNamePrefix">${application.id}-${project.version}</property>
<!-- masking properties configure the way your model element names are generated -->
Modified: trunk/cartridges/andromda-spring/src/test/expected/cartridge-output.zip
===================================================================
(Binary files differ)
Modified: trunk/cartridges/andromda-spring/src/test/expected/cartridge-outputUML2.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-02-17 20:40:59
|
Revision: 15400
http://sourceforge.net/p/andromda/svn/15400
Author: walterim
Date: 2014-02-17 20:40:52 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
Correction in xml dtds location.
Modified Paths:
--------------
trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/applicationContext-manageable.xml.vsl
Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/applicationContext-manageable.xml.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/applicationContext-manageable.xml.vsl 2014-02-17 20:40:17 UTC (rev 15399)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/applicationContext-manageable.xml.vsl 2014-02-17 20:40:52 UTC (rev 15400)
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="$xmlEncoding"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!-- Generated by: applicationContext-manageable.xml.vsl in andromda-spring-cartridge. -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:lang="http://www.springframework.org/schema/lang"
+ xmlns:tx="http://www.springframework.org/schema/tx"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
-<beans>
-
<!-- CRUD Service Transactional Interceptor. Generated by Spring crud/applicationContext-manageable.xml.vsl -->
<bean id="manageableServiceTransactionInterceptor" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<property name="transactionManager"><ref bean="transactionManager"/></property>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wal...@us...> - 2014-02-17 20:40:21
|
Revision: 15399
http://sourceforge.net/p/andromda/svn/15399
Author: walterim
Date: 2014-02-17 20:40:17 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
Added a new global property 'shortenSqlNamesMethod' supporting 'trunk' (default) and 'removeVowels' that remove the vowels from the end.
Modified Paths:
--------------
trunk/andromda-documentation/samples/timetracker-ejb3/mda/src/main/config/andromda.xml
Modified: trunk/andromda-documentation/samples/timetracker-ejb3/mda/src/main/config/andromda.xml
===================================================================
--- trunk/andromda-documentation/samples/timetracker-ejb3/mda/src/main/config/andromda.xml 2014-02-17 20:39:45 UTC (rev 15398)
+++ trunk/andromda-documentation/samples/timetracker-ejb3/mda/src/main/config/andromda.xml 2014-02-17 20:40:17 UTC (rev 15399)
@@ -78,6 +78,7 @@
<property name="sqlMappingsUri">${sql.mappings}</property>
<property name="jdbcMappingsUri">JDBC</property>
<property name="maxSqlNameLength">30</property>
+ <property name="shortenSqlNamesMethod">truncate</property>
<property name="foreignKeySuffix">_FK</property>
<property name="ejbJndiNamePrefix">${application.id}-${project.version}</property>
<!-- masking properties configure the way your model element names are generated>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
