From: Leif J. <le...@us...> - 2006-12-19 09:15:19
|
User: leifj Date: 06/12/19 01:15:15 Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration faces-config.xml.vsl Log: ugly fix - need to refer to message bundle Revision Changes Path 1.3 +1 -1 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.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- faces-config.xml.vsl 11 Dec 2006 13:43:57 -0000 1.2 +++ faces-config.xml.vsl 19 Dec 2006 09:15:15 -0000 1.3 @@ -69,7 +69,7 @@ <managed-bean-scope>application</managed-bean-scope> <managed-property> <property-name>label</property-name> - <value>$useCase.titleKey</value> + <value>$useCase.titleValue</value> </managed-property> <managed-property> <property-name>viewId</property-name> |
From: Walter M. <wal...@us...> - 2007-01-18 12:37:13
|
User: walterim Date: 07/01/18 04:37:14 Modified: andromda-jsf2/src/main/resources/templates/jsf2/views renderActionFormInput.vm andromda-jsf2/src/main/resources/templates/jsf2/configuration faces-config.xml.vsl Log: Reverting a wrong enumeration code. Correcting a menu text. Revision Changes Path 1.4 +1 -2 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.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- renderActionFormInput.vm 18 Jan 2007 10:11:07 -0000 1.3 +++ renderActionFormInput.vm 18 Jan 2007 12:37:13 -0000 1.4 @@ -32,7 +32,7 @@ #end #elseif ($parameter.inputCheckbox) <tr:selectBooleanCheckbox id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required" readOnly="$parameter.readOnly"/> -#elseif ($parameter.inputSelect) +#elseif ($parameter.inputSelect || $parameter.type.enumeration) #set ($multiSelect = $parameter.type.collectionType || $parameter.type.arrayType) #set ($selectBoxType = "selectOneChoice") #if ($multiSelect) @@ -74,7 +74,6 @@ #set ($selectBoxType = "selectManyListbox") #end <tr:$selectBoxType id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required" readOnly="$parameter.readOnly"#if ($multiSelect) size="$defaultMultiSelectSize"#else unselectedLabel=""#end> - <f:converter converterId="${parameter.type.fullyQualifiedName}"/> #foreach ($literal in $field.type.literals) #if ($literal.type.stringType)#set ($quote = '')#else#set ($quote = '"')#end #set($literalKey = $literal.name) 1.4 +1 -1 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.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- faces-config.xml.vsl 19 Dec 2006 09:15:15 -0000 1.3 +++ faces-config.xml.vsl 18 Jan 2007 12:37:13 -0000 1.4 @@ -69,7 +69,7 @@ <managed-bean-scope>application</managed-bean-scope> <managed-property> <property-name>label</property-name> - <value>$useCase.titleValue</value> + <value>$useCase.titleKey</value> </managed-property> <managed-property> <property-name>viewId</property-name> |
From: Leif J. <le...@us...> - 2007-02-01 19:47:00
|
User: leifj Date: 07/02/01 11:46:51 Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration faces-config.xml.vsl Log: of course its the titleValue Revision Changes Path 1.5 +1 -1 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.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- faces-config.xml.vsl 18 Jan 2007 12:37:13 -0000 1.4 +++ faces-config.xml.vsl 1 Feb 2007 19:46:51 -0000 1.5 @@ -69,7 +69,7 @@ <managed-bean-scope>application</managed-bean-scope> <managed-property> <property-name>label</property-name> - <value>$useCase.titleKey</value> + <value>$useCase.titleValue</value> </managed-property> <managed-property> <property-name>viewId</property-name> |
From: Walter M. <wal...@us...> - 2007-07-01 19:17:48
|
User: walterim Date: 07/07/01 12:17:49 Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration faces-config.xml.vsl Log: Correct JSF-34 Revision Changes Path 1.10 +1 -1 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.9 retrieving revision 1.10 diff -u -w -r1.9 -r1.10 --- faces-config.xml.vsl 21 Feb 2007 19:41:22 -0000 1.9 +++ faces-config.xml.vsl 1 Jul 2007 19:17:49 -0000 1.10 @@ -69,7 +69,7 @@ <managed-bean-scope>application</managed-bean-scope> <managed-property> <property-name>label</property-name> - <value>$useCase.titleValue</value> + <value>$useCase.titleKey</value> </managed-property> <managed-property> <property-name>viewId</property-name> |
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: Chad B. <cwb...@us...> - 2008-03-28 21:30:33
|
User: cwbrandon Date: 08/03/28 14:30:33 Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration faces-config.xml.vsl Log: minor spacing fix Revision Changes Path 1.15 +1 -1 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.14 retrieving revision 1.15 diff -u -w -r1.14 -r1.15 |
From: Chad B. <cwb...@us...> - 2008-05-19 20:17:00
|
User: cwbrandon Date: 08/05/19 13:17:07 Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration faces-config.xml.vsl Log: controllers should be request scoped Revision Changes Path 1.17 +2 -2 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.16 retrieving revision 1.17 diff -u -w -r1.16 -r1.17 --- faces-config.xml.vsl 29 Mar 2008 00:05:32 -0000 1.16 +++ faces-config.xml.vsl 19 May 2008 20:17:06 -0000 1.17 @@ -60,7 +60,7 @@ <managed-bean> <managed-bean-name>$controller.beanName</managed-bean-name> <managed-bean-class>$controller.fullyQualifiedImplementationName</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> + <managed-bean-scope>request</managed-bean-scope> </managed-bean> #end @@ -70,7 +70,7 @@ <managed-bean> <managed-bean-name>${manageable.controllerBeanName}</managed-bean-name> <managed-bean-class>${manageable.controllerType}Impl</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> + <managed-bean-scope>request</managed-bean-scope> </managed-bean> #end ##Helpers |
From: Walter M. <wal...@us...> - 2008-06-16 19:33:04
|
User: walterim Date: 08/06/16 12:33:11 Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration faces-config.xml.vsl Log: Menu model and controllers using request scope Revision Changes Path 1.18 +7 -7 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.17 retrieving revision 1.18 diff -u -w -r1.17 -r1.18 --- faces-config.xml.vsl 19 May 2008 20:17:06 -0000 1.17 +++ faces-config.xml.vsl 16 Jun 2008 19:33:11 -0000 1.18 @@ -78,7 +78,7 @@ <managed-bean> <managed-bean-name>autocompleteHelper</managed-bean-name> <managed-bean-class>${managedBeansPackage}.AutocompleteHelper</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> + <managed-bean-scope>request</managed-bean-scope> </managed-bean> #end @@ -89,7 +89,7 @@ <managed-bean> <managed-bean-name>navItem_$stringUtils.replace($useCase.forwardName, '-', '_')</managed-bean-name> <managed-bean-class>${managedBeansPackage}.NavigationItem</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> + <managed-bean-scope>request</managed-bean-scope> <managed-property> <property-name>label</property-name> <value>$useCase.titleKey</value> @@ -137,7 +137,7 @@ <managed-bean> <managed-bean-name>navItem_$manageable.actionClassName</managed-bean-name> <managed-bean-class>${managedBeansPackage}.NavigationItem</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> + <managed-bean-scope>request</managed-bean-scope> <managed-property> <property-name>label</property-name> <value>$manageable.viewTitleKey</value> @@ -176,7 +176,7 @@ <managed-bean-class> java.util.ArrayList </managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> + <managed-bean-scope>request</managed-bean-scope> <list-entries> <value-class>${managedBeansPackage}.NavigationItem</value-class> #foreach ($useCase in $useCases) @@ -194,7 +194,7 @@ <managed-bean> <managed-bean-name>navTreeModel</managed-bean-name> <managed-bean-class>org.apache.myfaces.trinidad.model.ChildPropertyTreeModel</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> + <managed-bean-scope>request</managed-bean-scope> <managed-property> <property-name>childProperty</property-name> <value>children</value> @@ -210,7 +210,7 @@ <managed-bean> <managed-bean-name>viewIdMenuModel</managed-bean-name> <managed-bean-class>org.apache.myfaces.trinidad.model.ViewIdPropertyMenuModel</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> + <managed-bean-scope>request</managed-bean-scope> <managed-property> <property-name>viewIdProperty</property-name> <value>viewId</value> @@ -224,7 +224,7 @@ <managed-bean> <managed-bean-name>menuModel</managed-bean-name> <managed-bean-class>${managedBeansPackage}.MenuModelAdapter</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> + <managed-bean-scope>request</managed-bean-scope> <managed-property> <property-name>model</property-name> <value>#{viewIdMenuModel}</value> |