Changeset 8:b30329bebc2f in iobaby


Ignore:
Timestamp:
Jan 30, 2017, 3:31:05 AM (19 months ago)
Author:
Shawn Wilson <shawn@…>
Branch:
default
Phase:
public
Message:

saw_013017_1 - No more jars! New Ant task 'project.update' takes care of it. Tag 'jars_included'

set to mark the previous commit as the last one where jars were still included.

Files:
11 added
10 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • .hgignore

    r3 r8  
    2424
    2525WEB-INF/classes
    26 WEB-INF/lib/*.jar
     26WEB-INF/lib/**/*.jar
    2727WEB-INF/tmp
     28
    2829WEB-INF/web.xml
    2930
  • CHANGELOG

    r5 r8  
    1 Copyright (C) 2016 Virgo Venture, Inc.
     1Copyright (C) 2016-2017 Virgo Venture, Inc.
    22@%@~LICENSE~@%@
     3
     4saw_013017_1 - No more jars! New Ant task 'project.update' takes care of it. Tag 'jars_included'
     5               set to mark the previous commit as the last one where jars were still included.
    36
    47saw_120616_1 - Upgrade jars: iovar-1.0-dev (saw_120616_1) and idfree-1.0-dev (saw_120616_2).
  • build.xml

    r6 r8  
    11<!--
    2 Copyright (C) 2016 Virgo Venture, Inc.
     2Copyright (C) 2016-2017 Virgo Venture, Inc.
    33@%@~LICENSE~@%@
    44-->
     
    1111    <property name="project.name" value="iobaby"/>
    1212    <property name="project.copyright" value="Virgo Venture, Inc."/>
    13     <property name="project.copyright.year" value="2016"/>
     13    <property name="project.copyright.year" value="2016-2017"/>
    1414    <property name="project.dir" location="${basedir}"/>
    1515
     
    6161        <fileset file="${jars.servlet-api.file}"/>
    6262    </path>
    63     <path id="jars.iovar">
    64         <fileset file="${jars.dir}/iovar-*.jar"/>
    65         <fileset file="${jars.dir}/idfree-*.jar"/>
    66     </path>
    6763
    6864    <!-- main code -->
     
    7571        <path refid="jars.run"/>
    7672        <path refid="jars.servlet-api"/>
    77         <path refid="jars.iovar"/>
    7873        <dirset dir="${code.dir}"/>
    7974    </path>
     
    8378        <path refid="jars.common"/>
    8479        <path refid="jars.servlet-api"/>
    85         <path refid="jars.iovar"/>
    8680    </path>
    8781    <property name="code.tests" value="${code} Unit Tests"/>
     
    188182    <!-- Ant Task Definitions (3rd party / custom)               -->
    189183    <!-- ======================================================= -->
    190    
     184   
     185    <!-- loads the ant-contrib tasks... needed for 'foreach' -->
     186    <target name="ant.task.contrib">
     187        <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="tasks.classpath"/>
     188    </target>
     189 
    191190    <target name="ant.task.WebBuilder">
    192191        <taskdef name="web-build" classname="${iovar.tasks.pkg}.WebBuilder" classpathref="tasks.classpath"/>
     
    258257        </copy>
    259258
     259        <!-- because project.update requires ant-contrib and it may not have been downloaded
     260             yet, we first try to get it now (however, the user could already have it their classpath) -->
     261        <loadfile property="ant.contrib.url" srcFile="${jars.build.dir}/ant-contrib.url"/>
     262        <get dest="${jars.build.dir}" src="${ant.contrib.url}" skipexisting="true"/>
     263
     264        <antcall target="project.update"/>
     265
    260266        <echo>Project Installed</echo>
    261267        <echo>Edit etc/build.properties as necessary and then run 'app.install' to set up a working application</echo>
     
    284290        -->
    285291        <delete file="${project.dir}/etc/build.properties" verbose="true"/>
     292    </target>
     293
     294    <target name="project.update" description="Download updated or missing project jars" depends="ant.task.contrib">
     295        <echo>Downloading any missing/update project JAR files</echo>
     296        <foreach target="project.update.build" param="project.update.file">
     297            <fileset dir="${jars.build.dir}" includes="*.url"/>
     298        </foreach>
     299        <foreach target="project.update.code" param="project.update.file">
     300            <fileset dir="${jars.code.dir}" includes="*.url"/>
     301        </foreach>
     302        <foreach target="project.update.common" param="project.update.file">
     303            <fileset dir="${jars.common.dir}" includes="*.url"/>
     304        </foreach>
     305        <foreach target="project.update.run" param="project.update.file">
     306            <fileset dir="${jars.run.dir}" includes="*.url"/>
     307        </foreach>
     308    </target>
     309    <target name="project.update.build">
     310        <loadfile property="project.update.url" srcFile="${project.update.file}"/>
     311        <get dest="${jars.build.dir}" src="${project.update.url}" verbose="on" usetimestamp="true"/>
     312    </target>
     313    <target name="project.update.code">
     314        <loadfile property="project.update.url" srcFile="${project.update.file}"/>
     315        <get dest="${jars.code.dir}" src="${project.update.url}" verbose="on" usetimestamp="true"/>
     316    </target>
     317    <target name="project.update.common">
     318        <loadfile property="project.update.url" srcFile="${project.update.file}"/>
     319        <get dest="${jars.common.dir}" src="${project.update.url}" verbose="on" usetimestamp="true"/>
     320    </target>
     321    <target name="project.update.run">
     322        <loadfile property="project.update.url" srcFile="${project.update.file}"/>
     323        <get dest="${jars.run.dir}" src="${project.update.url}" verbose="on" usetimestamp="true"/>
    286324    </target>
    287325
     
    444482            <fileset dir="${jars.code.dir}" includes="*.jar"/>
    445483            <fileset dir="${jars.run.dir}" includes="*.jar"/>
    446             <path refid="jars.iovar"/>
    447484            <regexpmapper from="^(.+)(-[0-9].*)\.jar$$" to="\1.jar" handledirsep="true"/>
    448485        </copy>
  • etc/iovar.web.xml

    r5 r8  
    1111    <servlet-mapping><servlet-name>win.iovar.web.usr.bin.XML2Java</servlet-name><url-pattern>/bin/xml2java</url-pattern></servlet-mapping>
    1212    <servlet-mapping><servlet-name>win.iovar.web.usr.bin.XML2Java</servlet-name><url-pattern>/bin/xml2java/*</url-pattern></servlet-mapping>
     13    <servlet><servlet-name>win.iovar.web.bin.Redirect</servlet-name><servlet-class>win.iovar.web.bin.Redirect</servlet-class></servlet>
     14    <servlet-mapping><servlet-name>win.iovar.web.bin.Redirect</servlet-name><url-pattern>/bin/redirect.testing</url-pattern></servlet-mapping>
     15    <servlet-mapping><servlet-name>win.iovar.web.bin.Redirect</servlet-name><url-pattern>/bin/redirect.testing/*</url-pattern></servlet-mapping>
    1316    <servlet><servlet-name>win.iovar.web.bin.Sleep</servlet-name><servlet-class>win.iovar.web.bin.Sleep</servlet-class></servlet>
    1417    <servlet-mapping><servlet-name>win.iovar.web.bin.Sleep</servlet-name><url-pattern>/bin/sleep</url-pattern></servlet-mapping>
     
    170173    <servlet-mapping><servlet-name>win.iovar.web.dev.Buffer</servlet-name><url-pattern>/dev/buffer</url-pattern></servlet-mapping>
    171174    <servlet-mapping><servlet-name>win.iovar.web.dev.Buffer</servlet-name><url-pattern>/dev/buffer/*</url-pattern></servlet-mapping>
     175    <servlet><servlet-name>win.iovar.web.bin.shell.Print</servlet-name><servlet-class>win.iovar.web.bin.shell.Print</servlet-class></servlet>
     176    <servlet-mapping><servlet-name>win.iovar.web.bin.shell.Print</servlet-name><url-pattern>/bin/print</url-pattern></servlet-mapping>
     177    <servlet-mapping><servlet-name>win.iovar.web.bin.shell.Print</servlet-name><url-pattern>/bin/print/*</url-pattern></servlet-mapping>
    172178    <servlet><servlet-name>win.iovar.web.usr.bin.Expression</servlet-name><servlet-class>win.iovar.web.usr.bin.Expression</servlet-class></servlet>
    173179    <servlet-mapping><servlet-name>win.iovar.web.usr.bin.Expression</servlet-name><url-pattern>/bin/expr</url-pattern></servlet-mapping>
Note: See TracChangeset for help on using the changeset viewer.