Changeset 2994


Ignore:
Timestamp:
Dec 1, 2006, 3:41:48 PM (16 years ago)
Author:
Nicklas Nordborg
Message:

Fixed bug when web.xml wansn't found in config/local

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r2983 r2994  
    211211    description="Build web client application for local use"
    212212    >
    213     <copy file="${config.local}/web.xml" todir="${config}/.." description="Local web.xml" />
    214     <copy file="${config.dist}/web.xml" todir="${config}/.."  description="Default web.xml" />
    215213  </target>
    216214 
    … …  
    309307      </fileset>
    310308    </copy>
     309    <copy todir="${config}/.."  description="Default web.xml">
     310      <fileset dir="${config.dist}">
     311        <include name="web.xml" />
     312        <present present="srconly" targetdir="${config}/.." />
     313      </fileset>
     314    </copy>
    311315  </target>
    312316 
    … …  
    319323      <fileset dir="${config.local}">
    320324        <patternset refid="config.files" />
     325      </fileset>
     326    </copy>
     327    <copy todir="${config}/.."  description="Local web.xml">
     328      <fileset dir="${config.local}">
     329        <include name="web.xml" />
    321330      </fileset>
    322331    </copy>

  • trunk/config/dist/web.xml

    r2959 r2994  
    149149    <init-param>
    150150      <param-name>characterEncoding</param-name>
    151       <param-value>ISO-8859-1</param-value>
    152       <!--
    153151      <param-value>UTF-8</param-value>
    154       -->
    155152    </init-param>
    156153  </filter>
Note: See TracChangeset for help on using the changeset viewer.