Changeset 77:bb3716cbef9e in iovar


Ignore:
Timestamp:
Jan 30, 2017, 2:06:06 AM (17 months ago)
Author:
Shawn Wilson <shawn@…>
Branch:
default
Phase:
public
Message:

saw_013017_1 - All JARs now removed from the repository! New Ant task 'project.update' created to

handle updating the binary dependencies. Tag 'jars_included' set to mark the
previous commit as the last one where jars were still included.

Files:
16 added
15 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • .hgignore

    r59 r77  
    2323
    2424WEB-INF/classes
    25 WEB-INF/lib/*.jar
     25WEB-INF/lib/**/*.jar
     26WEB-INF/tmp
     27
    2628WEB-INF/iovar.war
    27 WEB-INF/tmp
    2829WEB-INF/app.properties
    2930WEB-INF/build.properties
     
    3132WEB-INF/web.xml
    3233
     34
  • .hgtags

    r0 r77  
     1f79ac63c28c29d276775544c789dab3f9265993f jars_included
  • CHANGELOG

    r75 r77  
    22Copyright (C) 2011-2015 Lannocc Technologies
    33@%@~LICENSE~@%@
     4
     5saw_013017_1 - All JARs now removed from the repository! New Ant task 'project.update' created to
     6               handle updating the binary dependencies. Tag 'jars_included' set to mark the
     7               previous commit as the last one where jars were still included.
    48
    59saw_012017_1 - Working on proper session propagation through local loopback.
  • bin/redirect

    r38 r77  
    11#!/bin/iosh
    22#
    3 # Copyright (C) 2016 Virgo Venture, Inc.
     3# Copyright (C) 2016-2017 Virgo Venture, Inc.
    44# Copyright (C) 2015 Lannocc Technologies
    55# @%@~LICENSE~@%@
    66
     7set redirect_uri
     8test "$@" = '' || set redirect_uri="$@"
     9
    710test "$VIEW" = 'text' && {
    811
    9     echo ' >> GO TO >>>>' $@
     12    echo ' >> GO TO >>>>' $redirect_uri
    1013
    1114} || {
     
    2427            if (inparent && window.parent)
    2528            {
    26                 window.parent.location.href = '\'$@\'';
     29                window.parent.location.href = '\'$redirect_uri\'';
    2730            }
    2831            else if (!self && window.parent.loadInPopup && window.parent.get ("popup"))
    2932            {
    30                 //alert ("redirecting: '$@'");
    31                 window.parent.loadInPopup (null, '\'$@\'');
     33                //alert ("redirecting: '$redirect_uri'");
     34                window.parent.loadInPopup (null, '\'$redirect_uri\'');
    3235            }
    3336            else
    3437            {
    35                 //alert ("redirecting: '$@'");
    36                 window.location.href = '\'$@\'';
     38                //alert ("redirecting: '$redirect_uri'");
     39                window.location.href = '\'$redirect_uri\'';
    3740            }
    3841        </script>
    3942        <noscript>
    40             <meta http-equiv="refresh" content="0;URL='$@'">
     43            <meta http-equiv="refresh" content="0;URL='$redirect_uri'">
    4144        </noscript>
    4245    </head>
    4346    <body>
    44         Redirecting to <a href="'$@'">'$@'</a>
     47        Redirecting to <a href="'$redirect_uri'">'$redirect_uri'</a>
    4548    </body>
    4649</html>'
     
    4952
    5053}
     54
  • build.xml

    r57 r77  
    5858    <path id="jars.servlet-api">
    5959        <fileset file="${jars.servlet-api.file}"/>
    60     </path>
    61     <path id="jars.iovar">
    62         <fileset file="${jars.dir}/idfree-*.jar"/>
    6360    </path>
    6461
     
    7976        <path refid="jars.run"/>
    8077        <path refid="jars.servlet-api"/>
    81         <path refid="jars.iovar"/>
    8278        <dirset dir="${code.dir}"/>
    8379    </path>
     
    8783        <path refid="jars.common"/>
    8884        <path refid="jars.servlet-api"/>
    89         <path refid="jars.iovar"/>
    9085    </path>
    9186    <property name="code.tests" value="${code} Unit Tests"/>
     
    124119        <path refid="tasks.classpath"/>
    125120        <path refid="jars.code.tests"/>
    126         <path refid="jars.iovar"/>
    127121    </path>
    128122    <path id="tasks.classpath">
     
    130124        <path refid="tasks.classpath.build"/>
    131125        <dirset dir="${code.dir}"/>
    132         <path refid="jars.iovar"/>
    133126    </path>
    134127    <path id="tasks.classpath.build">
     
    190183    <!-- Ant Task Definitions (3rd party / custom)               -->
    191184    <!-- ======================================================= -->
     185
     186    <!-- loads the ant-contrib tasks... needed for 'foreach' -->
     187    <target name="ant.task.contrib">
     188        <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="tasks.classpath"/>
     189    </target>
    192190   
    193191    <target name="ant.task.WebBuilder">
     
    260258        </copy>
    261259
     260        <!-- because project.update requires ant-contrib and it may not have been downloaded
     261             yet, we first try to get it now (however, the user could already have it their classpath) -->
     262        <loadfile property="ant.contrib.url" srcFile="${jars.build.dir}/ant-contrib.url"/>
     263        <get dest="${jars.build.dir}" src="${ant.contrib.url}" skipexisting="true"/>
     264
     265        <antcall target="project.update"/>
     266
    262267        <echo>Project Installed</echo>
    263268        <echo>Edit etc/build.properties as necessary and then run 'app.install' to set up a working application</echo>
     
    286291        -->
    287292        <delete file="${project.dir}/etc/build.properties" verbose="true"/>
     293    </target>
     294
     295    <target name="project.update" description="Download updated or missing project jars" depends="ant.task.contrib">
     296        <echo>Downloading any missing/update project JAR files</echo>
     297        <foreach target="project.update.build" param="project.update.file">
     298            <fileset dir="${jars.build.dir}" includes="*.url"/>
     299        </foreach>
     300        <foreach target="project.update.code" param="project.update.file">
     301            <fileset dir="${jars.code.dir}" includes="*.url"/>
     302        </foreach>
     303        <foreach target="project.update.common" param="project.update.file">
     304            <fileset dir="${jars.common.dir}" includes="*.url"/>
     305        </foreach>
     306        <foreach target="project.update.run" param="project.update.file">
     307            <fileset dir="${jars.run.dir}" includes="*.url"/>
     308        </foreach>
     309    </target>
     310    <target name="project.update.build">
     311        <loadfile property="project.update.url" srcFile="${project.update.file}"/>
     312        <get dest="${jars.build.dir}" src="${project.update.url}" verbose="on" usetimestamp="true"/>
     313    </target>
     314    <target name="project.update.code">
     315        <loadfile property="project.update.url" srcFile="${project.update.file}"/>
     316        <get dest="${jars.code.dir}" src="${project.update.url}" verbose="on" usetimestamp="true"/>
     317    </target>
     318    <target name="project.update.common">
     319        <loadfile property="project.update.url" srcFile="${project.update.file}"/>
     320        <get dest="${jars.common.dir}" src="${project.update.url}" verbose="on" usetimestamp="true"/>
     321    </target>
     322    <target name="project.update.run">
     323        <loadfile property="project.update.url" srcFile="${project.update.file}"/>
     324        <get dest="${jars.run.dir}" src="${project.update.url}" verbose="on" usetimestamp="true"/>
    288325    </target>
    289326
     
    445482            <fileset dir="${jars.code.dir}" includes="*.jar"/>
    446483            <fileset dir="${jars.run.dir}" includes="*.jar"/>
    447             <path refid="jars.iovar"/>
    448484            <regexpmapper from="^(.+)(-[0-9].*)\.jar$$" to="\1.jar" handledirsep="true"/>
    449485        </copy>
Note: See TracChangeset for help on using the changeset viewer.