Changeset 1956

Show
Ignore:
Timestamp:
11/07/08 22:51:07
Author:
johnsa
Message:

adding jquery to build

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/config/bwbuild/default/cal.properties

    r1944 r1956  
    5959org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed 
    6060 
    61 # Where we keep the dojo stuff in deployment/resources/javascript 
     61# Where we keep the javascript libraries in deployment/resources/javascript 
    6262org.bedework.dojo.dir=dojo-0.4.1-ajax 
     63org.bedework.jquery.dir=jquery 
    6364 
    6465# A place to put extra jars and files, e.g. jdbc drivers. 

  • trunk/config/bwbuild/jboss/democal.properties

    r1944 r1956  
    6868org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed 
    6969 
    70 # Where we keep the dojo stuff in deployment/resources/javascript 
     70# Where we keep the javascript libraries in deployment/resources/javascript 
    7171org.bedework.dojo.dir=dojo-0.4.1-ajax 
     72org.bedework.jquery.dir=jquery 
    7273 
    7374# A place to put extra jars and files, e.g. jdbc drivers. 

  • trunk/config/bwbuild/liferay5/cal.properties

    r1944 r1956  
    6161org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed 
    6262 
    63 # Where we keep the dojo stuff in deployment/resources/javascript 
     63# Where we keep the javascript libraries in deployment/resources/javascript 
    6464org.bedework.dojo.dir=dojo-0.4.1-ajax 
     65org.bedework.jquery.dir=jquery 
    6566 
    6667# A place to put extra jars and files, e.g. jdbc drivers. 

  • trunk/config/configs/democal.properties

    r1944 r1956  
    5959org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed 
    6060 
    61 # Where we keep the dojo stuff in deployment/resources/javascript 
     61# Where we keep the javascript libraries in deployment/resources/javascript 
    6262org.bedework.dojo.dir=dojo-0.4.1-ajax 
     63org.bedework.jquery.dir=jquery 
    6364 
    6465# A place to put extra jars and files, e.g. jdbc drivers. 

  • trunk/deployment/resources/build.xml

    r1938 r1956  
    2424 
    2525    <property name="org.bedework.use.dojo" value="true" /> 
     26 
     27    <property name="org.bedework.use.jquery" value="true" /> 
    2628 
    2729    <property name="common.war.name" 
    …… 
    6062            <copy todir="${common.dest.war}/javascript/dojo"> 
    6163              <fileset dir="${common.resources.dir}/javascript/${org.bedework.dojo.dir}" /> 
     64            </copy> 
     65          </then> 
     66        </if> 
     67 
     68        <if> 
     69          <isset property="org.bedework.use.jquery" /> 
     70          <then> 
     71            <!-- Add jquery --> 
     72            <copy todir="${common.dest.war}/javascript/jquery"> 
     73              <fileset dir="${common.resources.dir}/javascript/${org.bedework.jquery.dir}" /> 
    6274            </copy> 
    6375          </then> 

  • trunk/deployment/webadmin/webapp/build.xml

    r1938 r1956  
    2121 
    2222    <property name="org.bedework.use.dojo" value="true" /> 
     23 
     24    <property name="org.bedework.use.jquery" value="true" /> 
    2325 
    2426    <!-- Flag as struts --> 

  • trunk/deployment/webconfig/webapp/build.xml

    r1938 r1956  
    2121 
    2222    <property name="org.bedework.use.dojo" value="true" /> 
     23 
     24    <property name="org.bedework.use.jquery" value="true" /> 
    2325 
    2426    <!-- Flag as struts --> 

  • trunk/deployment/webpublic/webapp/build.xml

    r1938 r1956  
    2121 
    2222    <property name="org.bedework.use.dojo" value="true" /> 
     23 
     24    <property name="org.bedework.use.jquery" value="true" /> 
    2325 
    2426    <!-- Flag as struts --> 

  • trunk/deployment/websubmit/webapp/build.xml

    r1938 r1956  
    2121 
    2222    <property name="org.bedework.use.dojo" value="true" /> 
     23 
     24    <property name="org.bedework.use.jquery" value="true" /> 
    2325 
    2426    <!-- Flag as struts --> 

  • trunk/deployment/webuser/webapp/build.xml

    r1938 r1956  
    2121 
    2222    <property name="org.bedework.use.dojo" value="true" /> 
     23 
     24    <property name="org.bedework.use.jquery" value="true" /> 
    2325 
    2426    <!-- Flag as struts -->