| 
      
      
      From: Walter M. <wal...@us...> - 2007-02-20 10:10:32
      
     | 
|   User: walterim
  Date: 07/02/20 02:10:32
  Modified:    andromda-jsf2/src/main/resources/META-INF/andromda
                        cartridge.xml metafacades.xml namespace.xml
               andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2
                        JSFGlobals.java
  Log:
  Added the "crudValueObjectSuffix" property. The suffix to append to the class names of CRUD value objects.
  
  Revision  Changes    Path
  1.4       +13 -19    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.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- cartridge.xml	11 Jan 2007 17:35:19 -0000	1.3
  +++ cartridge.xml	20 Feb 2007 10:10:32 -0000	1.4
  @@ -70,6 +70,7 @@
       <property reference="manageableFormName"/>
       <property reference="manageableFieldMaxLength"/>
       <property reference="manageableReferenceParameterPrefix"/>
  +    <property reference="crudValueObjectSuffix"/>
   
       <!-- cartridge-property merge-point -->
       
  @@ -610,25 +611,6 @@
           outputCondition="viewTypeIsFacelets"/>
       
       <template
  -        path="templates/jsf2/views/facelets/layout/menu.xhtml.vsl"
  -        outputPattern="layout/menu.xhtml"
  -        outlet="views"
  -        overwrite="true"
  -        outputToSingleFile="true"
  -        outputCondition="viewTypeIsFacelets">
  -        <modelElements>
  -            <modelElement variable="useCases">
  -                <type name="org.andromda.metafacades.uml.FrontEndUseCase">
  -                    <property name="registrationUseCase">false</property>
  -                </type>
  -            </modelElement>
  -            <modelElement variable="manageables">
  -                <type name="org.andromda.cartridges.jsf2.metafacades.JSFManageableEntity"/>
  -            </modelElement>
  -        </modelElements>        
  -    </template>
  -   
  -    <template
           path="templates/jsf2/views/facelets/layout/footer.xhtml.vsl"
           outputPattern="layout/footer.xhtml"
           outlet="views"
  @@ -945,6 +927,18 @@
       </template>
       
       <template
  +        path="templates/jsf2/controllers/crud/ControllerImpl.java.vsl"
  +        outputPattern="$generatedFile"
  +        outlet="controller-impls"
  +        overwrite="false">
  +        <modelElements variable="manageable">
  +            <modelElement>
  +                <type name="org.andromda.cartridges.jsf2.metafacades.JSFManageableEntity"/>
  +            </modelElement>
  +        </modelElements>
  +    </template>
  +    
  +    <template
           path="templates/jsf2/forms/crud/Form.java.vsl"
           outputPattern="$generatedFile"
           outlet="forms"
  
  
  
  1.3       +1 -0      cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/metafacades.xml
  
  Index: metafacades.xml
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/metafacades.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- metafacades.xml	11 Dec 2006 13:43:58 -0000	1.2
  +++ metafacades.xml	20 Feb 2007 10:10:32 -0000	1.3
  @@ -129,6 +129,7 @@
               <stereotype>ENTITY</stereotype>
               <stereotype>MANAGEABLE</stereotype>
           </mapping>
  +        <property reference="crudValueObjectSuffix"/>
           <property reference="defaultTableExportTypes"/>
           <property reference="viewPopulatorPattern"/>
           <property reference="actionFormKey"/>
  
  
  
  1.3       +6 -0      cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/namespace.xml
  
  Index: namespace.xml
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/namespace.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- namespace.xml	11 Dec 2006 13:43:58 -0000	1.2
  +++ namespace.xml	20 Feb 2007 10:10:32 -0000	1.3
  @@ -69,6 +69,12 @@
                       The forms to which input is stored are output here.
                   </documentation>
               </property>
  +            <property name="crudValueObjectSuffix">
  +                <default>ValueObject</default>
  +                <documentation>
  +                    The suffix to append to the names of generated value objects used in CRUD (manageable entities).
  +                </documentation>
  +            </property>
           </propertyGroup>
           <propertyGroup name="Configuration">
               <documentation>
  
  
  
  1.3       +4 -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.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- JSFGlobals.java	11 Dec 2006 13:43:58 -0000	1.2
  +++ JSFGlobals.java	20 Feb 2007 10:10:32 -0000	1.3
  @@ -9,6 +9,10 @@
   {
       
       /**
  +     * The suffix to append to the class names of CRUD value objects.
  +     */
  +    public static final String CRUD_VALUE_OBJECT_SUFFIX = "crudValueObjectSuffix";
  +    /**
        * A space-separated list of types to which displaytag table are to be exported by default.
        */
       public static final String PROPERTY_DEFAULT_TABLE_EXPORT_TYPES = "defaultTableExportTypes";
  
  
  
 |