Menu
▾
▴
andromdaplugins-cvs — Each commit to the project CVS repository posts a message to this mailing list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(178) |
Feb
(169) |
Mar
(286) |
Apr
(117) |
May
(98) |
Jun
(68) |
Jul
(63) |
Aug
(121) |
Sep
(88) |
Oct
(124) |
Nov
(2) |
Dec
(111) |
| 2007 |
Jan
(224) |
Feb
(69) |
Mar
(10) |
Apr
(72) |
May
(7) |
Jun
(21) |
Jul
(33) |
Aug
(35) |
Sep
(12) |
Oct
(22) |
Nov
(5) |
Dec
(6) |
| 2008 |
Jan
(2) |
Feb
(10) |
Mar
(39) |
Apr
(58) |
May
(34) |
Jun
(9) |
Jul
(27) |
Aug
(10) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
|
From: Vance K. <va...@us...> - 2007-11-07 12:57:31
|
User: vancek
Date: 07/11/07 04:57:34
Modified: andromda-ejb3/src/site changes.xml
andromda-ejb3/src/test/expected cartridge-output.zip
andromda-ejb3/src/test/uml EJB3CartridgeTestModel.xml.zip
andromda-ejb3/src/site/axdoc howto1.xml
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityAttributeFacadeLogicImpl.java
Log:
EJB-89 - attributes of type boolean/Boolean should have the getter starting with is instead of get
Revision Changes Path
1.28 +4 -0 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -w -r1.27 -r1.28
--- changes.xml 27 Aug 2007 14:19:07 -0000 1.27
+++ changes.xml 7 Nov 2007 12:57:31 -0000 1.28
@@ -528,6 +528,10 @@
EJB3ValueObjectFacade metafacade for the cartridge and modifying the components.xml generation to
account for the new type Seam component.
</action>
+ <action dev="vancek" due-to="aabdelaziz" type="fix">
+ JIRA EJB-89 - Fixed prefix for getter methods of type boolean by using the (is) keyword rather than
+ (get).
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.17 +554 -540 cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
<<Binary file>>
1.12 +268 -294 cartridges/andromda-ejb3/src/test/uml/EJB3CartridgeTestModel.xml.zip
<<Binary file>>
1.3 +5 -5 cartridges/andromda-ejb3/src/site/axdoc/howto1.xml
Index: howto1.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/axdoc/howto1.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- howto1.xml 19 Jan 2007 14:35:42 -0000 1.2
+++ howto1.xml 7 Nov 2007 12:57:34 -0000 1.3
@@ -450,11 +450,11 @@
</p>
<p>
<ul>
- <li class="gen"><a class="changed" href="howto/org/andromda/test/howto1/g/Car.java"><code>Car.java</code></a></li>
- <li class="gen"><a href="howto/org/andromda/test/howto1/g/CarDao.java"><code>CarDao.java</code></a></li>
- <li class="gen"><a href="howto/org/andromda/test/howto1/g/CarDaoBase.java"><code>CarDaoBase.java</code></a></li>
- <li class="gen"><a href="howto/org/andromda/test/howto1/g/CarDaoImpl.java"><code>CarDaoImpl.java</code></a></li>
- <li class="gen"><a href="howto/org/andromda/test/howto1/g/CarDaoException.java"><code>CarDaoException.java</code></a></li>
+ <li class="gen"><a class="changed" href="howto/org/andromda/test/howto1/hg/Car.java"><code>Car.java</code></a></li>
+ <li class="gen"><a href="howto/org/andromda/test/howto1/h/CarDao.java"><code>CarDao.java</code></a></li>
+ <li class="gen"><a href="howto/org/andromda/test/howto1/hg/CarDaoBase.java"><code>CarDaoBase.java</code></a></li>
+ <li class="gen"><a href="howto/org/andromda/test/howto1/h/CarDaoImpl.java"><code>CarDaoImpl.java</code></a></li>
+ <li class="gen"><a href="howto/org/andromda/test/howto1/h/CarDaoException.java"><code>CarDaoException.java</code></a></li>
</ul>
</p>
<p>
1.21 +0 -8 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityAttributeFacadeLogicImpl.java
Index: EJB3EntityAttributeFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityAttributeFacadeLogicImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- EJB3EntityAttributeFacadeLogicImpl.java 23 Jun 2007 08:06:45 -0000 1.20
+++ EJB3EntityAttributeFacadeLogicImpl.java 7 Nov 2007 12:57:34 -0000 1.21
@@ -54,14 +54,6 @@
// --------------- methods ---------------------
/**
- * @see org.andromda.metafacades.uml.AttributeFacade#getGetterName()
- */
- public String getGetterName()
- {
- return "get" + StringUtils.capitalize(super.getName());
- }
-
- /**
* Overridden to provide handling of inheritance.
*
* @see org.andromda.metafacades.uml.AttributeFacade#isRequired()
|
|
From: Walter M. <wal...@us...> - 2007-11-02 18:14:04
|
User: walterim Date: 07/11/02 11:13:23 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/converters/crud - New directory |
|
From: Walter M. <wal...@us...> - 2007-11-02 18:13:31
|
User: walterim
Date: 07/11/02 11:13:33
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud
view.xhtml.vsl
andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
JSFManageableEntityLogicImpl.java
andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2
JSFGlobals.java
andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml
andromda-jsf2/src/main/uml JSFMetafacadeModel.xml.zip
andromda-jsf2/src/main/resources/templates/jsf2/configuration
faces-config.xml.vsl
Added: andromda-jsf2/src/main/resources/templates/jsf2/converters/crud
EntityConverter.java.vsl
Log:
Added the generation of manageable entity converters (JSF) to get the descriptive value of entity instances.
Revision Changes Path
1.1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/converters/crud/EntityConverter.java.vsl
Index: EntityConverter.java.vsl
===================================================================
#set ($generatedFile = "${manageable.converterFullPath}.java")
// license-header java merge-point
package $manageable.manageablePackageName;
/**
* Handles conversion of the entity id to a String.
*/
public class $manageable.converterClassName
implements javax.faces.convert.Converter
{
/**
* @see javax.faces.convert.Converter#getAsString(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object)
*/
public String getAsString(
javax.faces.context.FacesContext context,
javax.faces.component.UIComponent component,
java.lang.Object value)
throws javax.faces.convert.ConverterException
{
final ${manageable.valueObjectClassName} vo;
try {
vo = ${manageable.manageableServiceAccessorCall}.readById((${manageable.manageableIdentifier.type.name})value);
} catch (Exception e) {
e.printStackTrace();
return ("Id "+value+" not found.");
}
#if($manageable.displayAttribute.type.stringType)
return vo.get$stringUtils.upperCamelCaseName($manageable.displayAttribute.name)();
#else
return String.valueOf(vo.get$stringUtils.upperCamelCaseName($manageable.displayAttribute.name)());
#end
}
/**
* @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String)
*/
public Object getAsObject(
javax.faces.context.FacesContext context,
javax.faces.component.UIComponent component,
java.lang.String value)
throws javax.faces.convert.ConverterException
{
return null;
}
}
1.11 +10 -0 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl
Index: view.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- view.xhtml.vsl 9 Sep 2007 11:01:09 -0000 1.10
+++ view.xhtml.vsl 2 Nov 2007 18:13:32 -0000 1.11
@@ -159,6 +159,16 @@
</tr:column>
#end
#end
+#foreach ($field in $manageable.manageableSearchAssociationEnds)
+#if(!$field.many)
+ <tr:column sortable="false">
+ <f:facet name="header">
+ <tr:outputText value="#{messages['$field.type.viewTitleKey']}"/>
+ </f:facet>
+ <tr:outputText value="#{row.${field.name}}" converter="$field.type.converterType"/>
+ </tr:column>
+#end
+#end
</tr:table>
</tr:form>
<tr:group rendered="#{${formName}.editState}">
1.5 +21 -0 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityLogicImpl.java
Index: JSFManageableEntityLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityLogicImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- JSFManageableEntityLogicImpl.java 4 Mar 2007 19:08:31 -0000 1.4
+++ JSFManageableEntityLogicImpl.java 2 Nov 2007 18:13:32 -0000 1.5
@@ -599,4 +599,25 @@
return false;
}
+ /**
+ * @see org.andromda.cartridges.jsf2.metafacades.JSFManageableEntity#converterClassName
+ */
+ public java.lang.String handleGetConverterClassName(){
+ return this.getName() + JSFGlobals.CONVERTER_SUFFIX;
+ }
+
+ /**
+ * @see org.andromda.cartridges.jsf2.metafacades.JSFManageableEntity#converterType
+ */
+ public java.lang.String handleGetConverterType(){
+ return this.getManageablePackageName() + this.getNamespaceProperty() + this.getConverterClassName();
+ }
+
+ /**
+ * @see org.andromda.cartridges.jsf2.metafacades.JSFManageableEntity#converterFullPath
+ */
+ public java.lang.String handleGetConverterFullPath(){
+ return StringUtils.replace(this.getConverterType(), this.getNamespaceProperty(), "/");
+ }
+
}
\ No newline at end of file
1.4 +5 -0 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/JSFGlobals.java
Index: JSFGlobals.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/JSFGlobals.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- JSFGlobals.java 20 Feb 2007 10:10:32 -0000 1.3
+++ JSFGlobals.java 2 Nov 2007 18:13:32 -0000 1.4
@@ -67,6 +67,11 @@
public static final String FORM_SUFFIX = "Form";
/**
+ * The suffix for converter names.
+ */
+ public static final String CONVERTER_SUFFIX = "Converter";
+
+ /**
* Stores the default form scope which can be overriden with a tagged value.
*/
public static final String FORM_SCOPE = "formScope";
1.11 +12 -0 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- cartridge.xml 30 Aug 2007 20:05:35 -0000 1.10
+++ cartridge.xml 2 Nov 2007 18:13:33 -0000 1.11
@@ -893,6 +893,18 @@
<!-- manageable -->
<template
+ path="templates/jsf2/converters/crud/EntityConverter.java.vsl"
+ outputPattern="$generatedFile"
+ outlet="controllers"
+ overwrite="true">
+ <modelElements variable="manageable">
+ <modelElement>
+ <type name="org.andromda.cartridges.jsf2.metafacades.JSFManageableEntity"/>
+ </modelElement>
+ </modelElements>
+ </template>
+
+ <template
path="templates/jsf2/controllers/crud/Controller.java.vsl"
outputPattern="$generatedFile"
outlet="controllers"
1.9 +230 -194 cartridges/andromda-jsf2/src/main/uml/JSFMetafacadeModel.xml.zip
<<Binary file>>
1.12 +7 -0 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl
Index: faces-config.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- faces-config.xml.vsl 19 Jul 2007 17:11:06 -0000 1.11
+++ faces-config.xml.vsl 2 Nov 2007 18:13:33 -0000 1.12
@@ -303,5 +303,12 @@
</converter>
#end
+#foreach ($manageable in $manageables)
+ <converter>
+ <converter-id>$manageable.ConverterType</converter-id>
+ <converter-class>$manageable.converterType</converter-class>
+ </converter>
+#end
+
<!-- faces-config merge-point -->
</faces-config>
|
|
From: Walter M. <wal...@us...> - 2007-10-31 11:12:07
|
User: walterim
Date: 07/10/31 04:10:58
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views
renderActionFormInput.vm
Log:
Avoiding the automatic Trinidad conversion in <selectOneChoice/> since it does not work with the andromda generated populator.
Revision Changes Path
1.7 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm
Index: renderActionFormInput.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- renderActionFormInput.vm 19 Jul 2007 18:09:32 -0000 1.6
+++ renderActionFormInput.vm 31 Oct 2007 11:10:58 -0000 1.7
@@ -38,7 +38,7 @@
#if ($multiSelect)
#set ($selectBoxType = "selectManyListbox")
#end
- <tr:$selectBoxType id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required" readOnly="$parameter.readOnly"#if ($multiSelect) size="$defaultMultiSelectSize"#end>
+ <tr:$selectBoxType id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required" readOnly="$parameter.readOnly" valuePassThru="true"#if ($multiSelect) size="$defaultMultiSelectSize"#end>
<c:if test="${!empty ${backingListName}}">
<f:selectItems value="#{${backingListName}}" />
</c:if>
|
|
From: Walter M. <wal...@us...> - 2007-10-21 20:06:56
|
User: walterim
Date: 07/10/21 13:06:59
Modified: andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud
Controller.java.vsl
Log:
Avoid compilation error when using fileUpload
Revision Changes Path
1.10 +2 -0 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl
Index: Controller.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- Controller.java.vsl 9 Sep 2007 11:01:06 -0000 1.9
+++ Controller.java.vsl 21 Oct 2007 20:06:59 -0000 1.10
@@ -98,8 +98,10 @@
${manageable.manageableServiceAccessorCall}.readById(${manageable.manageableIdentifier.name});
#foreach ($member in $manageable.attributes)
+#if(!${member.inputFile})
form.${member.setterName}(vo.${member.getterName}());
#end
+#end
#foreach ($member in $manageable.manageableAssociationEnds)
form.${member.setterName}(vo.${member.getterName}());
#end
|
|
From: Chris M. <cm...@us...> - 2007-10-20 21:13:23
|
User: cmicali
Date: 07/10/20 14:13:25
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AndroMDA.VS80AddIn.csproj
WizardSolutionProcessor.cs
Log:
Revision Changes Path
1.23 +5 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj
Index: AndroMDA.VS80AddIn.csproj
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -r1.22 -r1.23
--- AndroMDA.VS80AddIn.csproj 1 Aug 2007 05:10:37 -0000 1.22
+++ AndroMDA.VS80AddIn.csproj 20 Oct 2007 21:13:25 -0000 1.23
@@ -457,6 +457,11 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="Solution Wizard Files\mda\resources\templates\cs\" />
+ <Folder Include="Solution Wizard Files\mda\resources\templates\nhibernate\" />
+ <Folder Include="Solution Wizard Files\mda\resources\templates\nspring\" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup>
<PreBuildEvent>
1.20 +16 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs
Index: WizardSolutionProcessor.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- WizardSolutionProcessor.cs 7 Aug 2007 02:29:41 -0000 1.19
+++ WizardSolutionProcessor.cs 20 Oct 2007 21:13:25 -0000 1.20
@@ -170,6 +170,22 @@
// Render /mda/conf/mappings/NHibernateTypeMappings.xml (Required for NHibernate 1.2)
WriteFile("mda/conf/mappings/NHibernateTypeMappings.xml");
+
+ // Create mda/resources
+ CreateDirectory("mda/resources");
+
+ // Create mda/resources
+ CreateDirectory("mda/resources/templates");
+
+ // Create mda/resources
+ CreateDirectory("mda/resources/templates/cs");
+
+ // Create mda/resources
+ CreateDirectory("mda/resources/templates/nspring");
+
+ // Create mda/resources
+ CreateDirectory("mda/resources/templates/nhibernate");
+
}
// Write mda/cvsignore
|
|
From: Chris M. <cm...@us...> - 2007-10-11 14:24:50
|
User: cmicali
Date: 07/10/11 07:24:55
Modified: andromda-cs/src/main/resources/templates/cs ValueObject.vsl
Log:
Revision Changes Path
1.13 +4 -0 cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl
Index: ValueObject.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- ValueObject.vsl 10 Oct 2007 20:48:23 -0000 1.12
+++ ValueObject.vsl 11 Oct 2007 14:24:55 -0000 1.13
@@ -8,8 +8,12 @@
using System;
using System.IO;
+#if($enableXmlInclude.equalsIgnoreCase('true'))
using System.Xml.Serialization;
+#end
+#if($enableIClonableImplementation.equalsIgnoreCase('true'))
using System.Runtime.Serialization.Formatters.Binary;
+#end
#endregion
|
|
From: Chris M. <cm...@us...> - 2007-10-10 20:48:18
|
User: cmicali
Date: 07/10/10 13:48:23
Modified: andromda-cs/src/main/resources/templates/cs ValueObject.vsl
Log:
- Added properties enableXmlInclude and enableICloneableImplementation to toggle output of the XmlInclude attributes and serialization-based implementation of Clone() method
Revision Changes Path
1.12 +5 -1 cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl
Index: ValueObject.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- ValueObject.vsl 8 Oct 2007 19:16:44 -0000 1.11
+++ ValueObject.vsl 10 Oct 2007 20:48:23 -0000 1.12
@@ -21,15 +21,19 @@
$class.getDocumentation(" /// ")
/// </summary>
[Serializable]
+#if($enableXmlInclude.equalsIgnoreCase('true'))
#foreach ($subentity in $class.specializations)
[XmlInclude(typeof(${subentity.fullyQualifiedName}))]
#end
+#end
public#if($class.abstract) abstract#end class $class.name
#if($class.generalization)
- : ${class.generalization.fullyQualifiedName} , ICloneable
+ : ${class.generalization.fullyQualifiedName}#if($enableIClonableImplementation.equalsIgnoreCase('true')), ICloneable#end
#else
+#if($enableIClonableImplementation.equalsIgnoreCase('true'))
: ICloneable
#end
+#end
{
#region Attributes and Associations
|
|
From: Chris M. <cm...@us...> - 2007-10-10 20:48:16
|
User: cmicali
Date: 07/10/10 13:48:19
Modified: andromda-cs/src/main/resources/META-INF/andromda
cartridge.xml namespace.xml
Log:
- Added properties enableXmlInclude and enableICloneableImplementation to toggle output of the XmlInclude attributes and serialization-based implementation of Clone() method
Revision Changes Path
1.4 +2 -0 cartridges/andromda-cs/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- cartridge.xml 5 Oct 2007 14:06:59 -0000 1.3
+++ cartridge.xml 10 Oct 2007 20:48:19 -0000 1.4
@@ -6,6 +6,8 @@
<property reference="serializable"/>
<property reference="enablePropertyConstructors"/>
<property reference="attributeNamePrefix"/>
+ <property reference="enableXmlInclude"/>
+ <property reference="enableIClonableImplementation"/>
<!-- cartridge-property merge-point-->
1.5 +15 -0 cartridges/andromda-cs/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- namespace.xml 5 Oct 2007 14:07:00 -0000 1.4
+++ namespace.xml 10 Oct 2007 20:48:19 -0000 1.5
@@ -54,6 +54,21 @@
(does not affect the generated property names).
</documentation>
</property>
+ <property name="enableXmlInclude">
+ <default>true</default>
+ <documentation>
+ Enabled [XmlInclude()] attributes for child classes
+ in base class value objects. If set to false these
+ statements will not be output.
+ </documentation>
+ </property>
+ <property name="enableIClonableImplementation">
+ <default>true</default>
+ <documentation>
+ Enable a simple binary serialization-based implementation
+ of ICloneable for valueobjects
+ </documentation>
+ </property>
</propertyGroup>
</properties>
</namespace>
\ No newline at end of file
|
|
From: Chris M. <cm...@us...> - 2007-10-08 19:16:44
|
User: cmicali
Date: 07/10/08 12:16:44
Modified: andromda-cs/src/main/resources/templates/cs ValueObject.vsl
Log:
- Last try
Revision Changes Path
1.11 +2 -4 cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl
Index: ValueObject.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- ValueObject.vsl 8 Oct 2007 19:06:03 -0000 1.10
+++ ValueObject.vsl 8 Oct 2007 19:16:44 -0000 1.11
@@ -50,15 +50,13 @@
#region Constructors
-##if (!$class.properties.empty)
public ${class.name}()
{
}
-##end
-#if ($enablePropertyConstructors.equalsIgnoreCase('true'))
+#if ($enablePropertyConstructors.equalsIgnoreCase('true') && !$class.allProperties.empty)
#set ($propertiesNumber = $class.allProperties.size())
-#if ($propertiesNumber == 0 || $propertiesNumber != 1 || !$class.allProperties.iterator().next().getterSetterTypeName.equals($class.fullyQualifiedName))
+#if ($propertiesNumber != 1 || !$class.allProperties.iterator().next().getterSetterTypeName.equals($class.fullyQualifiedName))
/// <summary>
/// Constructor taking all properties.
/// </summary>
|
|
From: Chris M. <cm...@us...> - 2007-10-08 19:06:02
|
User: cmicali
Date: 07/10/08 12:06:05
Modified: andromda-cs/src/main/resources/templates/cs ValueObject.vsl
Log:
- Always supply default constructor
Revision Changes Path
1.10 +2 -2 cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl
Index: ValueObject.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- ValueObject.vsl 8 Oct 2007 19:04:14 -0000 1.9
+++ ValueObject.vsl 8 Oct 2007 19:06:03 -0000 1.10
@@ -50,12 +50,12 @@
#region Constructors
-#if (!$class.properties.empty)
+##if (!$class.properties.empty)
public ${class.name}()
{
}
-#end
+##end
#if ($enablePropertyConstructors.equalsIgnoreCase('true'))
#set ($propertiesNumber = $class.allProperties.size())
#if ($propertiesNumber == 0 || $propertiesNumber != 1 || !$class.allProperties.iterator().next().getterSetterTypeName.equals($class.fullyQualifiedName))
|
|
From: Chris M. <cm...@us...> - 2007-10-08 19:04:16
|
User: cmicali
Date: 07/10/08 12:04:19
Modified: andromda-cs/src/main/resources/templates/cs ValueObject.vsl
Log:
- Another shot
Revision Changes Path
1.9 +1 -1 cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl
Index: ValueObject.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- ValueObject.vsl 8 Oct 2007 18:59:36 -0000 1.8
+++ ValueObject.vsl 8 Oct 2007 19:04:14 -0000 1.9
@@ -75,7 +75,7 @@
#if($class.generalization)
: base(#set ($comma = "")
#foreach ($property in $class.generalization.allProperties)
-${comma}${stringUtils.upperCamelCaseName($property.name)}## no newline
+${comma}${property.name}## no newline
#set ($comma = ", ")
#end
)
|
|
From: Chris M. <cm...@us...> - 2007-10-08 18:59:58
|
User: cmicali
Date: 07/10/08 11:59:37
Modified: andromda-cs/src/main/resources/templates/cs ValueObject.vsl
Log:
- Fixed bug output property names when calling base constructors
Revision Changes Path
1.8 +2 -2 cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl
Index: ValueObject.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- ValueObject.vsl 5 Oct 2007 15:55:34 -0000 1.7
+++ ValueObject.vsl 8 Oct 2007 18:59:36 -0000 1.8
@@ -75,7 +75,7 @@
#if($class.generalization)
: base(#set ($comma = "")
#foreach ($property in $class.generalization.allProperties)
-${comma}${property.name}## no newline
+${comma}${stringUtils.upperCamelCaseName($property.name)}## no newline
#set ($comma = ", ")
#end
)
@@ -95,7 +95,7 @@
#if($class.generalization)
: base(#set ($comma = "")
#foreach ($property in $class.generalization.allProperties)
-${comma}other${class.name}.${property.name}## no newline
+${comma}other${class.name}.${stringUtils.upperCamelCaseName($property.name)}## no newline
#set ($comma = ", ")
#end
)
|
|
From: Chris M. <cm...@us...> - 2007-10-05 20:18:17
|
User: cmicali Date: 07/10/05 13:18:13 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution Wizard Files/mda/resources/templates/nspring - New directory |
|
From: Chris M. <cm...@us...> - 2007-10-05 20:18:17
|
User: cmicali Date: 07/10/05 13:18:13 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution Wizard Files/mda/resources/templates/nhibernate - New directory |
|
From: Chris M. <cm...@us...> - 2007-10-05 20:18:16
|
User: cmicali Date: 07/10/05 13:18:13 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution Wizard Files/mda/resources/templates/cs - New directory |
|
From: Chris M. <cm...@us...> - 2007-10-05 20:18:05
|
User: cmicali Date: 07/10/05 13:18:09 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution Wizard Files/mda/resources/templates - New directory |
|
From: Chris M. <cm...@us...> - 2007-10-05 20:18:02
|
User: cmicali Date: 07/10/05 13:18:05 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution Wizard Files/mda/resources - New directory |
|
From: Chris M. <cm...@us...> - 2007-10-05 15:55:32
|
User: cmicali
Date: 07/10/05 08:55:35
Modified: andromda-cs/src/main/resources/templates/cs ValueObject.vsl
Log:
Fix for [NETCART-5]
- Modified constructors in ValueObject.vsl to call parent constructors if there is a parent class
Revision Changes Path
1.7 +21 -5 cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl
Index: ValueObject.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- ValueObject.vsl 5 Oct 2007 14:07:04 -0000 1.6
+++ ValueObject.vsl 5 Oct 2007 15:55:34 -0000 1.7
@@ -57,21 +57,29 @@
#end
#if ($enablePropertyConstructors.equalsIgnoreCase('true'))
-#set ($propertiesNumber = $class.properties.size())
-#if ($propertiesNumber == 0 || $propertiesNumber != 1 || !$class.properties.iterator().next().getterSetterTypeName.equals($class.fullyQualifiedName))
+#set ($propertiesNumber = $class.allProperties.size())
+#if ($propertiesNumber == 0 || $propertiesNumber != 1 || !$class.allProperties.iterator().next().getterSetterTypeName.equals($class.fullyQualifiedName))
/// <summary>
/// Constructor taking all properties.
/// </summary>
#set ($parenthesis = "(")
-#if ($class.properties.empty)
+#if ($class.allProperties.empty)
#set ($parenthesis = "()")
#end
public ${class.name}${parenthesis}
-#foreach ($property in $class.properties)
- $property.getterSetterTypeName ${property.name}#if($velocityCount != $class.properties.size()),#else)
+#foreach ($property in $class.allProperties)
+ $property.getterSetterTypeName ${property.name}#if($velocityCount != $class.allProperties.size()),#else)
#end
#end
+#if($class.generalization)
+ : base(#set ($comma = "")
+#foreach ($property in $class.generalization.allProperties)
+${comma}${property.name}## no newline
+#set ($comma = ", ")
+#end
+)
+#end
{
#foreach ($property in $class.properties)
this.${attributeNamePrefix}${property.name} = ${property.name};
@@ -84,6 +92,14 @@
/// Copy constructor
/// </summary>
public ${class.name}(${class.name} other${class.name})
+#if($class.generalization)
+ : base(#set ($comma = "")
+#foreach ($property in $class.generalization.allProperties)
+${comma}other${class.name}.${property.name}## no newline
+#set ($comma = ", ")
+#end
+)
+#end
{
if (other${class.name} != null)
{
|
|
From: Chris M. <cm...@us...> - 2007-10-05 15:32:15
|
User: cmicali
Date: 07/10/05 08:32:17
Modified: andromda-nhibernate/src/main/resources/templates/nhibernate
NHibernateEntity.vsl
Log:
Added attribute name prefix namespace parameter
Revision Changes Path
1.11 +10 -10 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl
Index: NHibernateEntity.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- NHibernateEntity.vsl 7 Aug 2007 02:31:18 -0000 1.10
+++ NHibernateEntity.vsl 5 Oct 2007 15:32:16 -0000 1.11
@@ -32,12 +32,12 @@
/// <summary>
/// Version property managed by Hibernate.
/// </summary>
- private int _$versionProperty;
+ private int ${attributeNamePrefix}$versionProperty;
public virtual int ${stringUtils.upperCamelCaseName($versionProperty)}
{
- get { return _$versionProperty; }
- set { this._$versionProperty = value; }
+ get { return ${attributeNamePrefix}$versionProperty; }
+ set { this.${attributeNamePrefix}$versionProperty = value; }
}
#endregion
@@ -51,16 +51,16 @@
#if ($attribute.containsEmbeddedObject)
#set ($typeName = $attribute.type.fullyQualifiedEntityName)
#end
- private $typeName _$attribute.name;
+ private $typeName ${attributeNamePrefix}$attribute.name;
#end
## **** Generate associations ****
#foreach ($associationEnd in $entity.associationEnds)
#set ($target = $associationEnd.otherEnd)
#if ($target.navigable || ($associationEnd.child && $entity.foreignHibernateGeneratorClass))
#if ($target.many)
- private $target.getterSetterTypeName _$target.name = $target.collectionTypeImplementation;
+ private $target.getterSetterTypeName ${attributeNamePrefix}$target.name = $target.collectionTypeImplementation;
#else
- private $target.getterSetterTypeName _$target.name;
+ private $target.getterSetterTypeName ${attributeNamePrefix}$target.name;
#end
#end
#end
@@ -80,8 +80,8 @@
/// </summary>
$attribute.visibility virtual $typeName ${stringUtils.upperCamelCaseName($attribute.name)}
{
- get { return _$attribute.name; }
- set { this._$attribute.name = value; }
+ get { return ${attributeNamePrefix}$attribute.name; }
+ set { this.${attributeNamePrefix}$attribute.name = value; }
}
#end
@@ -94,8 +94,8 @@
/// </summary>
public virtual $target.getterSetterTypeName ${stringUtils.upperCamelCaseName($target.name)}
{
- get { return _$target.name; }
- set { this._$target.name = value; }
+ get { return ${attributeNamePrefix}$target.name; }
+ set { this.${attributeNamePrefix}$target.name = value; }
}
#end
|
|
From: Chris M. <cm...@us...> - 2007-10-05 15:32:04
|
User: cmicali
Date: 07/10/05 08:32:05
Modified: andromda-nhibernate/src/main/resources/META-INF/andromda
cartridge.xml namespace.xml
Log:
Added attribute name prefix namespace parameter
Revision Changes Path
1.2 +2 -0 cartridges/andromda-nhibernate/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- cartridge.xml 8 Mar 2006 04:15:40 -0000 1.1
+++ cartridge.xml 5 Oct 2007 15:32:04 -0000 1.2
@@ -13,6 +13,8 @@
</templateObject>
<!-- cartridge-templateObject merge-point-->
+ <property reference="attributeNamePrefix"/>
+
<property reference="securityRealm"/>
<property reference="customTypesPackage"/>
<!-- contains the package for the Hibernate user types -->
1.2 +7 -0 cartridges/andromda-nhibernate/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- namespace.xml 8 Mar 2006 04:15:40 -0000 1.1
+++ namespace.xml 5 Oct 2007 15:32:05 -0000 1.2
@@ -355,6 +355,13 @@
</property>
</propertyGroup>
<propertyGroup name="Other">
+ <property name="attributeNamePrefix">
+ <default>m_</default>
+ <documentation>
+ The prefix leading each attribute and association name for generated entity classes
+ (does not affect the generated property names).
+ </documentation>
+ </property>
<property name="visualStudioVersion">
<default>2</default>
<documentation>
|
|
From: Chris M. <cm...@us...> - 2007-10-05 14:07:01
|
User: cmicali
Date: 07/10/05 07:07:04
Modified: andromda-cs/src/main/resources/templates/cs ValueObject.vsl
Log:
[NETCART-17] Applied Jens' patch to enable attribute to set prefix on value object member variable names.
Revision Changes Path
1.6 +8 -8 cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl
Index: ValueObject.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- ValueObject.vsl 3 Oct 2007 15:06:34 -0000 1.5
+++ ValueObject.vsl 5 Oct 2007 14:07:04 -0000 1.6
@@ -36,13 +36,13 @@
## **** Generate attribute ****
#foreach ($attribute in $class.attributes)
- private $attribute.getterSetterTypeName _$attribute.name;
+ private $attribute.getterSetterTypeName ${attributeNamePrefix}${attribute.name};
#end
## **** Generate associations ****
#foreach ($associationEnd in $class.associationEnds)
#set ($target = $associationEnd.otherEnd)
#if ($target.navigable)
- private $target.getterSetterTypeName _$target.name;
+ private $target.getterSetterTypeName ${attributeNamePrefix}${target.name};
#end
#end
@@ -74,7 +74,7 @@
#end
{
#foreach ($property in $class.properties)
- this._${property.name} = ${property.name};
+ this.${attributeNamePrefix}${property.name} = ${property.name};
#end
}
@@ -88,7 +88,7 @@
if (other${class.name} != null)
{
#foreach ( $property in $class.properties)
- this._${property.name} = other${class.name}.${stringUtils.upperCamelCaseName($property.name)};
+ this.${attributeNamePrefix}${property.name} = other${class.name}.${stringUtils.upperCamelCaseName($property.name)};
#end
}
}
@@ -104,8 +104,8 @@
/// </summary>
$attribute.visibility $attribute.getterSetterTypeName ${stringUtils.upperCamelCaseName($attribute.name)}
{
- get { return _$attribute.name; }
- set { this._$attribute.name = value; }
+ get { return ${attributeNamePrefix}${attribute.name}; }
+ set { this.${attributeNamePrefix}${attribute.name} = value; }
}
#end
@@ -118,8 +118,8 @@
/// </summary>
public $target.getterSetterTypeName ${stringUtils.upperCamelCaseName($target.name)}
{
- get { return _$target.name; }
- set { this._$target.name = value; }
+ get { return ${attributeNamePrefix}${target.name}; }
+ set { this.${attributeNamePrefix}${target.name} = value; }
}
#end
|
|
From: Chris M. <cm...@us...> - 2007-10-05 14:06:56
|
User: cmicali
Date: 07/10/05 07:07:00
Modified: andromda-cs/src/main/resources/META-INF/andromda
cartridge.xml namespace.xml
Log:
[NETCART-17] Applied Jens' patch to enable attribute to set prefix on value object member variable names.
Revision Changes Path
1.3 +2 -0 cartridges/andromda-cs/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- cartridge.xml 15 Aug 2006 22:48:43 -0000 1.2
+++ cartridge.xml 5 Oct 2007 14:06:59 -0000 1.3
@@ -5,6 +5,8 @@
<property reference="serializable"/>
<property reference="enablePropertyConstructors"/>
+ <property reference="attributeNamePrefix"/>
+
<!-- cartridge-property merge-point-->
<!-- cartridge-resource merge-point -->
1.4 +7 -0 cartridges/andromda-cs/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- namespace.xml 15 Aug 2006 22:48:43 -0000 1.3
+++ namespace.xml 5 Oct 2007 14:07:00 -0000 1.4
@@ -47,6 +47,13 @@
be generated or not (on the value object for example).
</documentation>
</property>
+ <property name="attributeNamePrefix">
+ <default>m_</default>
+ <documentation>
+ The prefix leading each attribute and association name for generated value objects
+ (does not affect the generated property names).
+ </documentation>
+ </property>
</propertyGroup>
</properties>
</namespace>
\ No newline at end of file
|
|
From: Chris M. <cm...@us...> - 2007-10-05 13:32:01
|
User: cmicali
Date: 07/10/05 06:32:04
Modified: andromda-nspring/src/main/resources/templates/nspring
NSpringServiceInterface.vsl
Log:
Revision Changes Path
1.3 +1 -1 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceInterface.vsl
Index: NSpringServiceInterface.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceInterface.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NSpringServiceInterface.vsl 18 Oct 2006 12:44:46 -0000 1.2
+++ NSpringServiceInterface.vsl 5 Oct 2007 13:32:00 -0000 1.3
@@ -22,7 +22,7 @@
#end
#else
#if (!$service.interfaceAbstractions.empty)
- , $service.implementedInterfaceList
+ : $service.implementedInterfaceList
#end
#end
{
|
|
From: Chris M. <cm...@us...> - 2007-10-03 15:06:36
|
User: cmicali
Date: 07/10/03 08:06:35
Modified: andromda-cs/src/main/resources/templates/cs ValueObject.vsl
Log:
Revision Changes Path
1.5 +1 -1 cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl
Index: ValueObject.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- ValueObject.vsl 25 Sep 2007 22:47:32 -0000 1.4
+++ ValueObject.vsl 3 Oct 2007 15:06:34 -0000 1.5
@@ -22,7 +22,7 @@
/// </summary>
[Serializable]
#foreach ($subentity in $class.specializations)
- [XmlInclude(typeof(${subentity.name}))]
+ [XmlInclude(typeof(${subentity.fullyQualifiedName}))]
#end
public#if($class.abstract) abstract#end class $class.name
#if($class.generalization)
|
