[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration web.xml.vsl

[Walter M. <wal...@us...>]

  User: walterim
  Date: 07/01/11 09:35:19

  Modified:    andromda-jsf2/src/main/resources/META-INF/andromda
                        cartridge.xml
               andromda-jsf2/src/main/resources/templates/jsf2/configuration
                        web.xml.vsl
  Removed:     andromda-jsf2/src/main/resources/templates/jsf2/flow/crud
                        ActionForward.java.vsl
  Log:
  Removing the crud action forward.
  
  Revision  Changes    Path
  1.3       +13 -12    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.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- cartridge.xml	11 Dec 2006 13:43:58 -0000	1.2
  +++ cartridge.xml	11 Jan 2007 17:35:19 -0000	1.3
  @@ -933,18 +933,6 @@
       <!-- manageable -->
   
       <template
  -        path="templates/jsf2/flow/crud/ActionForward.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"
  @@ -993,6 +981,19 @@
       </template>
       
       <template
  +        path="templates/jsf2/views/facelets/crud/crud-index.xhtml.vsl"
  +        outputPattern="crud-index.xhtml"
  +        outlet="views"
  +        overwrite="true"
  +        outputToSingleFile="true">
  +        <modelElements>
  +            <modelElement variable="manageables">
  +                <type name="org.andromda.cartridges.jsf2.metafacades.JSFManageableEntity"/>
  +            </modelElement>
  +        </modelElements>         
  +    </template>
  +    
  +    <template
           path="templates/jsf2/views/facelets/crud/view.xhtml.vsl"
           outputPattern="$generatedFile"
           outlet="views"
  
  
  
  1.4       +0 -12     cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl
  
  Index: web.xml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- web.xml.vsl	19 Dec 2006 09:15:41 -0000	1.3
  +++ web.xml.vsl	11 Jan 2007 17:35:19 -0000	1.4
  @@ -279,12 +279,6 @@
           <servlet-class>$useCase.fullyQualifiedActionClassName</servlet-class>
       </servlet>
   #end
  -#foreach ($manageable in $manageables)
  -    <servlet>
  -        <servlet-name>$manageable.actionType</servlet-name>
  -        <servlet-class>$manageable.actionType</servlet-class>
  -    </servlet>
  -#end
       <servlet>
           <servlet-name>AndroMDA JSF Servlet</servlet-name>
           <servlet-class>org.andromda.cartridges.jsf2.JSFServlet</servlet-class>
  @@ -317,12 +311,6 @@
           <url-pattern>${useCase.path}.${facesServletExtension}</url-pattern>
       </servlet-mapping>
   #end
  -#foreach ($manageable in $manageables)
  -    <servlet-mapping>
  -        <servlet-name>$manageable.actionType</servlet-name>
  -        <url-pattern>${manageable.actionFullPath}.${facesServletExtension}</url-pattern>
  -    </servlet-mapping>
  -#end
       <!-- servlet-mapping merge-point -->
       <session-config>
           <session-timeout>$sessionTimeout</session-timeout>