[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/components pom.xml

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

  User: walterim
  Date: 08/09/18 05:56:53

  Modified:    andromda-jsf2/src/main/resources/META-INF/andromda
                        cartridge.xml
               andromda-jsf2/src/main/resources/templates/jsf2/configuration
                        web.xml.vsl
               andromda-jsf2/components pom.xml
  Removed:     andromda-jsf2/src/main/resources/resources/lib/myfaces
                        tomahawk-1.1.7-SNAPSHOT.jar
  Log:
  Using Tomahawk 1.1.7 final
  
  Revision  Changes    Path
  1.34      +0 -7      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.33
  retrieving revision 1.34
  diff -u -w -r1.33 -r1.34
  --- cartridge.xml	24 Jul 2008 14:38:50 -0000	1.33
  +++ cartridge.xml	18 Sep 2008 12:56:51 -0000	1.34
  @@ -177,13 +177,6 @@
           lastModifiedCheck="true"
           outputCondition="portlet"/>
   
  -    <resource
  -        path="resources/lib/myfaces/*.*"
  -        outputPattern="WEB-INF/lib/{0}"
  -        outlet="libraries"
  -        overwrite="true"
  -        lastModifiedCheck="true"/>
  -
       <!-- process templates on model elements -->
       <template
           path="templates/jsf2/configuration/web.xml.vsl"
  
  
  
  1.19      +10 -0     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.18
  retrieving revision 1.19
  diff -u -w -r1.18 -r1.19
  --- web.xml.vsl	4 Jul 2008 12:17:51 -0000	1.18
  +++ web.xml.vsl	18 Sep 2008 12:56:53 -0000	1.19
  @@ -158,6 +158,16 @@
           <param-value>true</param-value>
       </context-param>
   
  +    <context-param>
  +        <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
  +        <param-value>false</param-value>
  +    </context-param>
  +
  +    <context-param>
  +        <param-name>org.apache.myfaces.DISABLE_TOMAHAWK_FACES_CONTEXT_WRAPPER</param-name>
  +        <param-value>true</param-value>
  +    </context-param>
  +
   #if ($liferayPortlet)
       <context-param>
       <param-name>portlet_properties</param-name>
  
  
  
  1.6       +1 -2      cartridges/andromda-jsf2/components/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/components/pom.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- pom.xml	24 Jul 2008 18:07:44 -0000	1.5
  +++ pom.xml	18 Sep 2008 12:56:53 -0000	1.6
  @@ -23,8 +23,7 @@
           <dependency>
               <groupId>org.apache.myfaces.tomahawk</groupId>
               <artifactId>tomahawk</artifactId>
  -            <version>1.1.7-SNAPSHOT</version>
  -            <scope>provided</scope>
  +            <version>1.1.7</version>
               <exclusions>
                   <exclusion>
                       <groupId>commons-collections</groupId>