Changeset 3937

Show
Ignore:
Timestamp:
11/17/08 10:42:38 (2 months ago)
Author:
mtld
Message:

only create DispatcherServlet? mappings and Factory listener in web.xml if context-xml-service entry is present

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/pfixcore/projects/core/build/create_webxml.xsl

    r3936 r3937  
    3838            <xsl:copy-of select="@*"/> 
    3939            <xsl:apply-templates select="jee:icon|jee:display-name|jee:description|jee:distributable|jee:context-param|jee:filter|jee:filter-mapping"/> 
    40             <xsl:call-template name="create-listeners"/> 
     40            <xsl:if test="$tree/p:project-config/p:application/p:context-xml-service"> 
     41              <xsl:call-template name="create-listeners"/> 
     42            </xsl:if> 
    4143            <xsl:apply-templates select="jee:listener"/> 
    4244            <xsl:if test="$tree/p:project-config/p:application/p:context-xml-service"> 
    …… 
    4446            </xsl:if> 
    4547            <xsl:apply-templates select="jee:servlet"/> 
    46             <xsl:call-template name="create-servlet-mappings"> 
    47               <xsl:with-param name="tree" select="$tree"/> 
    48             </xsl:call-template> 
     48            <xsl:if test="$tree/p:project-config/p:application/p:context-xml-service"> 
     49              <xsl:call-template name="create-servlet-mappings"> 
     50                <xsl:with-param name="tree" select="$tree"/> 
     51              </xsl:call-template> 
     52            </xsl:if> 
    4953            <xsl:apply-templates select="jee:servlet-mapping"/> 
    5054            <xsl:choose> 
    …… 
    6771      <xsl:otherwise> 
    6872        <web-app> 
    69           <xsl:call-template name="create-listeners"/> 
    70           <xsl:call-template name="create-servlet-definitions"/> 
    71           <xsl:call-template name="create-servlet-mappings"> 
    72             <xsl:with-param name="tree" select="$tree"/> 
    73           </xsl:call-template> 
     73          <xsl:if test="$tree/p:project-config/p:application/p:context-xml-service"> 
     74            <xsl:call-template name="create-listeners"/> 
     75            <xsl:call-template name="create-servlet-definitions"/> 
     76            <xsl:call-template name="create-servlet-mappings"> 
     77              <xsl:with-param name="tree" select="$tree"/> 
     78            </xsl:call-template> 
     79          </xsl:if> 
    7480          <xsl:call-template name="create-session-config"/> 
    7581          <xsl:call-template name="create-error-pages">