Changeset 1541:ed28b7d643b9

Show
Ignore:
Timestamp:
10/26/10 17:22:06 (3 years ago)
Author:
Jean-Guilhem Rouel <jean-gui@…>
Branch:
default
Message:

Added a task to build a command-line version of Unicorn (related to tickets #147 and #150)

Files:
9 added
4 modified

Legend:

Unmodified
Added
Removed
  • WebContent/META-INF/MANIFEST.MF

    r1491 r1541  
    11Manifest-Version: 1.0 
     2Ant-Version: Apache Ant 1.8.0 
     3Created-By: 1.6.0_22-b04 (Sun Microsystems Inc.) 
    24Main-Class: org.w3c.unicorn.UnicornClient 
     5Class-Path: conf/  
     6 lib/activation-1.1.jar  
     7 lib/ant-1.6.jar  
     8 lib/antlr-2.7.2.jar  
     9 lib/avalon-framework-4.1.3.jar  
     10 lib/commons-beanutils-1.7.0.jar  
     11 lib/commons-chain-1.1.jar  
     12 lib/commons-collections-3.2.1.jar  
     13 lib/commons-digester-1.8.jar  
     14 lib/commons-fileupload-1.2.1.jar  
     15 lib/commons-io-1.4.jar  
     16 lib/commons-lang-2.5.jar  
     17 lib/commons-logging-1.1.1.jar  
     18 lib/commons-validator-1.3.1.jar  
     19 lib/dom4j-1.1.jar  
     20 lib/icu4j-4_4_1_1.jar  
     21 lib/jdom-1.0.jar  
     22 lib/log4j-1.2.12.jar  
     23 lib/logkit-2.0.jar  
     24 lib/mail-1.4.1.jar  
     25 lib/oro-2.0.8.jar  
     26 lib/portlet-api-1.0.jar  
     27 lib/servlet-api-2.5.jar  
     28 lib/sslext-1.2-0.jar  
     29 lib/stax-api-1.0.1.jar  
     30 lib/struts-core-1.3.8.jar  
     31 lib/struts-taglib-1.3.8.jar  
     32 lib/struts-tiles-1.3.8.jar  
     33 lib/unicorn-response.jar  
     34 lib/unicorn-tasklist.jar  
     35 lib/velocity-1.6.4.jar  
     36 lib/velocity-tools-2.0.jar  
     37 lib/werken-xpath-0.9.4.jar  
     38 lib/xmlbeans-2.4.0.jar  
     39 lib/yuicompressor-2.3.6.jar 
  • WebContent/WEB-INF/conf/unicorn.properties.default

    • Property exe deleted
  • WebContent/WEB-INF/resources/tasklist/tasklist.xml

    r1532 r1541  
    55 
    66        <task id="conformance" default="true"> 
     7                <conds> 
     8                  <cond id="is_input_uri" result="passed" type="method"> 
     9                    <value>uri</value> 
     10                  </cond> 
     11                </conds> 
    712 
    813                <routine> 
     
    1318                        <exec id="css1" value="css1-validator" type="observation" /> 
    1419                        <exec id="feed" value="feed" type="observation" /> 
     20                        <if test="is_input_uri"> 
     21                          <then><exec id="http" value="http" type="observation" /></then> 
     22                        </if> 
    1523                </routine> 
    1624 
     
    3947                        <group> 
    4048                                <observation>feed</observation> 
     49        <observation>http</observation> 
    4150                        </group> 
    4251                </output> 
     
    333342                </output> 
    334343        </task> 
    335  
     344  <!-- 
    336345        <task id="i18n"> 
    337346                <routine> 
     
    348357                </output> 
    349358        </task> 
    350  
     359  --> 
    351360        <!-- This task allows developers to test their Unicorn output easily. It should removed in production. --> 
    352361        <task id="test"> 
  • build.xml

    r1527 r1541  
    7474        </target> 
    7575         
     76        <target name="cli" depends="jar" description="--> use configuration files to run Unicorn from the command line"> 
     77    <mkdir dir="${dist.dir}/cli"/> 
     78    <mkdir dir="${dist.dir}/cli/conf"/> 
     79    <mkdir dir="${dist.dir}/cli/tmp"/> 
     80 
     81                <copy todir="${dist.dir}/cli/conf"> 
     82                        <fileset dir="WebContent/WEB-INF/conf/cli"/> 
     83                </copy> 
     84     
     85    <copy todir="${dist.dir}/cli"> 
     86      <fileset dir="."> 
     87        <include name="lib/*"/> 
     88      </fileset> 
     89      <fileset dir="WebContent/WEB-INF"> 
     90        <include name="languages/**"/> 
     91        <include name="resources/**"/> 
     92      </fileset> 
     93      <fileset dir="${dist.dir}" includes="unicorn.jar"/> 
     94    </copy> 
     95 
     96        </target> 
     97 
    7698        <target name="jar" depends="compile" description="--> compile and package Unicorn as a jar"> 
    7799                <mkdir dir="${dist.dir}"/>