beehive-commits@incubator.apache.org
[Top] [All Lists]

svn commit: r231444 [2/2] - in /beehive/trunk/controls: ./ test/ test/co

Subject: svn commit: r231444 [2/2] - in /beehive/trunk/controls: ./ test/ test/common/ test/dist-test/ test/dist-test/common/ test/infra/gtlf/xsl/ test/infra/tch/ test/infra/tch/runtime/ test/webapps/
From:
Date: Thu, 11 Aug 2005 13:09:36 -0000
Modified: beehive/trunk/controls/test/infra/gtlf/xsl/build.xml
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/gtlf/xsl/build.xml?rev=231444&r1=231443&r2=231444&view=diff
==============================================================================
--- beehive/trunk/controls/test/infra/gtlf/xsl/build.xml (original)
+++ beehive/trunk/controls/test/infra/gtlf/xsl/build.xml Thu Aug 11 06:09:28 
2005
@@ -1,339 +1,354 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="test" basedir=".">
-
- <!--import file="../../../../../beehive-imports.xml"/-->
- <property file="../../../common/path.properties"/>
-
-  <!-- properties for customizing to diff environment -->
-  <property name="xsl.root.dir" value="${controls.test.infra.dir}/gtlf/xsl"/>
-  <property name="tch.dtd.dir"
-            value="${xsl.root.dir}/gtlf-config-2-0.dtd"/>
-
-
-  <!-- +++++++++++++++++++++++ Test Report targets +++++++++++++++++++++++- -->
-
-  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-  <target name="test.report.help">
-    <description>
-      help for target [test.report]
-    </description>
-    <echo>
-    ===============================================================
-
-     Target [test.report] generates a html report from
-     the gtlf file of a coconut test run.
-
-      Options:
-     ===========
-     - feature        : feature for which the report is
-                        being generated. If we don't specify one
-                        the report will not include commands for
-                        running failed tests and other feature
-                        specific sections. To get the supported
-                        features, invoke target [features]
-     - gtlf.file      :  gtlf file of the coconut test. The
-                         default is myrun.gtlf.xml
-     - base.file      : Base file name. The value is computed.
-                        from gtlf by stripping any .gtlf, .xml
-                        and .gtlf.xml suffix. Thus, if the
-                        suffix is different, then specify the
-                         base.file name. It is used to
-                        generate links to the test log, out
-                        and td files
-     - output.file    : output name of the report. If no name
-                        is specified, then it defaults to
-                        ${base.file}.html
-     - find.files     : Search files generated by the test and
-                        list them in the files section. Also,
-                        add links for Infra run files. The
-                        default is true.
-
-                        Note: Setting it to false, will turn
-                        of all archive feature, as they rely
-                        on getting the file list to archive.
-
-     Archive Options  : No archiving is done by default. The
-     ----------------   user can zip the file and/or backup
-                        the files in a directory by date time
-                        stamp. The test filest are identified
-                        using the 'first.file' property.
-
-                        Note: find.files should be set to true
-                        (which is the default) to perform
-                        archiving.
-
-     Archive file identification:
-     ****************************
-
-     - first.file     : Name of the first file that gets generated
-                        in the test. The default is
-                        ${wltestantwrapper.properties}. This
-                        property is used to identify the files
-                        modified/created by the test.
-     - first.file.dir : The directory under which the search is
-                        done of the generated test files. The
-                        default is '.'.
-
-     Archive zip file information:
-     *****************************
-
-     - zip.files      : Zips all the files modified/created by the
-                        test. The generated file is
-                        'output.file'.zip. The files are
-                        identified using the 'first.file' property.
-                        To enable, set this property to true.
-                        By default, the files are not zipped.
-     - zip.file.name  : Name of the zip file. It defaults to
-                        ${base.file}_time.zip, where time is
-                        the time stamp when this command is issued.
-                        The time stamp format is
-                        dd_MMMM_yyyy_hh_mm_aa.
-
-     Archive backup dir information:
-     *******************************
-
-     - backup.files   : Backup's the files generated by the test
-                        in directory specified by property
-                        'backup.dir'. The default, is false.
-                        The files are identified using the
-                        'first.file' property.
-     - backup.dir     : directory where the files are backed up.
-                        The default is 'results/${feature}'.
-
-
-    Advanced Options:
-    -----------------
-
-     - hyperlink.files: Creates hyperlink of the files displayed
-                        in the 'files modified/created by test'
-                        section. Default is true.
-     - hyperlink.zip.file.name
-                      : zip file name that will be used in
-                        files section of the report. It's useful
-                        when this name is different from
-                        ${zip.file.name} option. It defaults to
-                        the value of ${zip.file.name}.
-
-     Report Formatting:
-     ------------------
-
-     Let's the user control the content of the report
-
-     -report.sections
-            : sections of the report that should be generated
-              It defaults to 'all'. You can specify a comma
-              separated list of the sections that should show up.
-
-              The sections are:
-
-              all - all the sections are displayed
-              report-summary - report summary section
-              result-summary - result summary section
-              result-detail - result detail section
-              error-summary - error summary section
-              error-detail - error detail section
-              setup - setup section
-              help  - help section
-
-     -report.section.order
-           : The following canned order display the sections
-             specified by 'report.sections':
-
-             result-focus
-               : The order is report-summary->result-summary
-                 ->result-detail->error-summary->files->help/info
-                 ->setup->error-detail
-             error-focus
-               : The order is report-summary->result-summary->
-               error-detail->->error-summary->result-detail->
-               files->help/info->setup
-
-             result-focus is the default.
-
-     -show.success.in.error.summary
-           : controls the display of successful test results in
-             error summary section. It's set to false by default.
-
-     -show.filters
-           : Display the filters in each setion. It's set to
-             true by default.
-
-     -report.navigation.tools
-           : controls the navigation tools that will be available
-             in the report. You can specify a comma separated list
-             of the navigation tools
-
-             The navigation tools are:
-
-             all      - all the tools are displayed
-             menu     - menu of the report
-             toolbar  - toolbar of the report
-             top      - top link displayed in different report
-                        sections
-
-     -report.skin
-           : Controls the report skin that will be used. The skin
-             is applied by a cascading style sheet (css). The
-             currently supported skins are:
-             classic - original default skin
-             junit   - same format as the JUnit reports
-             none    - no skin is applied
-
-             junit is the default skin.
-
-
-    Examples:
-    =========
-
-    ----------------------------------------------------------
-    ant -f build-Test.xml test.report
-
-    generates the test report for myrun.gtlf.xml file.
-
-    ----------------------------------------------------------
-    ant -f build-Test.xml test.report -Dfeature=oam
-
-    generates the test report for myrun.gtlf.xml file. The
-    report now contains commands to rerun the test.
-
-    ----------------------------------------------------------
-    ant -f build-Test.xml test.report \
-     -Dgtlf.file=srcW2KServerNativeIO-oam-load.gtlf.xml
-
-     generates test report for the specified gtfl file.
-
-    ----------------------------------------------------------
-    ant -f build-Test.xml test.report \
-     -Dgtlf.file=srcW2KServerNativeIO-oam-load.gtlf.xml \
-     -Dreport.sections=report-summary,report-detail,error-detail \
-     -Dreport.navigation.tools=toolbar,top
-
-     generates test report for the specified gtfl file. The
-     report only displays report summary, report detail and
-     error detail. Only the toolbar and top navigation tool
-     are present in the report.
-    ----------------------------------------------------------
-    'ant -f build-Test.xml test.report -Dfeature=oam \
-     -Dgtlf.file=srcW2KServerNativeIO-oam-load.gtlf.xml'
-
-     generates test report for the specified gtfl file. The
-     report now contains commands to rerun the test
-
-    ----------------------------------------------------------
-    'ant -f build-Test.xml test.report -Dfind.files=false'
-
-    generates the test report for myrun.gtlf.xml file. The files
-    generated by the test are not listed in the files section.
-
-    This option is usually specified, when we have not run the
-    test locally and want to generate report from a gtlf file got
-    from BT or any othe machine.
-
-    ----------------------------------------------------------
-    'ant -f build-Test.xml test.report -Dzip.file=true
-
-     generates the test report and creates a zip of all the
-     test files
-
-    ----------------------------------------------------------
-    'ant -f build-Test.xml test.report -Dbackup.files=true
-
-     generates the test report and then backup the test files in
-     'results' directory.
-
-    ===============================================================
-    </echo>
-  </target>
-
-  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
-  <target name="test.report">
-    <description>
-      generates test report. For help, use tgt. [test.report.help]
-    </description>
-
-     <!-- get/set the target properties -->
-    <property name="gtlf.file" value="myrun.gtlf.xml"/>
-    <basename property="base.file.temp" file="${gtlf.file}" suffix=".xml"/>
-    <basename property="base.file" file="${base.file.temp}" suffix=".gtlf"/>
-    <property name="output.file" value="${base.file}.html"/>
-    <property name="hyperlink.files" value="true"/>
-    <property name="report.sections" value="all"/>
-    <property name="report.section.order" value="result-focus"/>
-    <property name="report.navigation.tools" value="all"/>
-    <property name="report.skin" value="junit"/>
-
-    <touch file="${output.file}"/>
-
-    <tstamp>
-      <format property="time" pattern="dd_MMMM_yyyy_hh_mm_aa"/>
-    </tstamp>
-    <property name="zip.file.name" value="${base.file}_${time}.zip"/>
-    <property name="hyperlink.zip.file.name" value="${zip.file.name}"/>
-
-    <delete file="${output.file}"/>
-    <delete file="${output.file}.zip"/>
-
-    <condition property="show.feature.info" value="1">
-      <isset property="feature"/>
-    </condition>
-    <condition property="show.test.files" value="1">
-      <isset property="find.the.files"/>
-    </condition>
-
-    <!-- show the filter -->
-    <property name="show.filters" value="true"/>
-    <condition property="show.the.filters" value="1">
-      <istrue value="${show.filters}"/>
-    </condition>
-    <property name="show.the.filters" value="0"/>
-
-    <property name="show.success.in.error.summary" value="false"/>
-    <condition property="show.success.in.error.summary.section" value="1">
-      <istrue value="${show.success.in.error.summary}"/>
-    </condition>
-
-    <!-- load the report skin css -->
-    <loadfile property="css.file"
-              srcfile="${xsl.root.dir}/${report.skin}.css"
-              failonerror="false" />
-
-    <!-- create the test report -->
-    <!-- xsl transform on the gtlf -->
-    <xslt in="${gtlf.file}" out="${output.file}"
-          style="${xsl.root.dir}/TestReport.xsl">
-      <param name="filebasename" expression="${base.file}"/>
-      <param name="feature" expression="${feature}"/>
-      <param name="showFeatureInfo" expression="${show.feature.info}"/>
-      <param name="showTestfiles" expression="${show.test.files}"/>
-      <param name="zipFiles" expression="${zip.files}"/>
-      <param name="zipFileName" expression="${hyperlink.zip.file.name}"/>
-      <param name="gtlfFileName" expression="${gtlf.file}"/>
-      <param name="testFiles" expression="${test.files}"/>
-      <param name="showTheFilters" expression="${show.the.filters}"/>
-      <param name="sections" expression="${report.sections}"/>
-      <param name="navigationTools" expression="${report.navigation.tools}"/>
-      <param name="cssFile" expression="${css.file}"/>
-      <param name="showSuccessInErrorSummary"
-             expression="${show.success.in.error.summary.section}"/>
-      <param name="reportSectionOrder" expression="${report.section.order}"/>
-      <xmlcatalog>
-       <dtd
-         publicId="-//BEA Systems, Inc.//DTD GTLF 1.0//EN"
-         location="${tch.dtd.dir}"/>
-      </xmlcatalog>
-      <outputproperty name="method" value="html"/>
-      <outputproperty name="indent" value="yes"/>
-      <outputproperty name="standalone" value="yes"/>
-    </xslt>
-    <delete file="${xsl.root.dir}/generatedTestReport.xsl"/>
-    <echo message=""/>
-    <echo message="****************************************************"/>
-      <echo message="Generated report [${output.file}]"/>
-    <echo message="*****************************************************"/>
-  </target>
-
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   Copyright 2004 The Apache Software Foundation.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+   
+       http://www.apache.org/licenses/LICENSE-2.0
+   
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  
+   $Header:$
+ -->
+<project name="Beehive/Controls/Test/Infra/Gtlf" basedir=".">
+
+ <property file="../../../common/path.properties"/>
+
+  <!-- properties for customizing to diff environment -->
+  <property name="xsl.root.dir" location="${basedir}"/>
+  <property name="tch.dtd.dir" location="${basedir}/gtlf-config-2-0.dtd"/>
+
+  <!-- +++++++++++++++++++++++ Test Report targets +++++++++++++++++++++++- -->
+
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  <target name="test.report.help">
+    <description>
+      help for target [test.report]
+    </description>
+    <echo>
+    ===============================================================
+
+     Target [test.report] generates a html report from
+     the gtlf file of a coconut test run.
+
+      Options:
+     ===========
+     - feature        : feature for which the report is
+                        being generated. If we don't specify one
+                        the report will not include commands for
+                        running failed tests and other feature
+                        specific sections. To get the supported
+                        features, invoke target [features]
+     - gtlf.file      :  gtlf file of the coconut test. The
+                         default is myrun.gtlf.xml
+     - base.file      : Base file name. The value is computed.
+                        from gtlf by stripping any .gtlf, .xml
+                        and .gtlf.xml suffix. Thus, if the
+                        suffix is different, then specify the
+                         base.file name. It is used to
+                        generate links to the test log, out
+                        and td files
+     - output.file    : output name of the report. If no name
+                        is specified, then it defaults to
+                        ${base.file}.html
+     - find.files     : Search files generated by the test and
+                        list them in the files section. Also,
+                        add links for Infra run files. The
+                        default is true.
+
+                        Note: Setting it to false, will turn
+                        of all archive feature, as they rely
+                        on getting the file list to archive.
+
+     Archive Options  : No archiving is done by default. The
+     ----------------   user can zip the file and/or backup
+                        the files in a directory by date time
+                        stamp. The test filest are identified
+                        using the 'first.file' property.
+
+                        Note: find.files should be set to true
+                        (which is the default) to perform
+                        archiving.
+
+     Archive file identification:
+     ****************************
+
+     - first.file     : Name of the first file that gets generated
+                        in the test. The default is
+                        ${wltestantwrapper.properties}. This
+                        property is used to identify the files
+                        modified/created by the test.
+     - first.file.dir : The directory under which the search is
+                        done of the generated test files. The
+                        default is '.'.
+
+     Archive zip file information:
+     *****************************
+
+     - zip.files      : Zips all the files modified/created by the
+                        test. The generated file is
+                        'output.file'.zip. The files are
+                        identified using the 'first.file' property.
+                        To enable, set this property to true.
+                        By default, the files are not zipped.
+     - zip.file.name  : Name of the zip file. It defaults to
+                        ${base.file}_time.zip, where time is
+                        the time stamp when this command is issued.
+                        The time stamp format is
+                        dd_MMMM_yyyy_hh_mm_aa.
+
+     Archive backup dir information:
+     *******************************
+
+     - backup.files   : Backup's the files generated by the test
+                        in directory specified by property
+                        'backup.dir'. The default, is false.
+                        The files are identified using the
+                        'first.file' property.
+     - backup.dir     : directory where the files are backed up.
+                        The default is 'results/${feature}'.
+
+
+    Advanced Options:
+    -----------------
+
+     - hyperlink.files: Creates hyperlink of the files displayed
+                        in the 'files modified/created by test'
+                        section. Default is true.
+     - hyperlink.zip.file.name
+                      : zip file name that will be used in
+                        files section of the report. It's useful
+                        when this name is different from
+                        ${zip.file.name} option. It defaults to
+                        the value of ${zip.file.name}.
+
+     Report Formatting:
+     ------------------
+
+     Let's the user control the content of the report
+
+     -report.sections
+            : sections of the report that should be generated
+              It defaults to 'all'. You can specify a comma
+              separated list of the sections that should show up.
+
+              The sections are:
+
+              all - all the sections are displayed
+              report-summary - report summary section
+              result-summary - result summary section
+              result-detail - result detail section
+              error-summary - error summary section
+              error-detail - error detail section
+              setup - setup section
+              help  - help section
+
+     -report.section.order
+           : The following canned order display the sections
+             specified by 'report.sections':
+
+             result-focus
+               : The order is report-summary->result-summary
+                 ->result-detail->error-summary->files->help/info
+                 ->setup->error-detail
+             error-focus
+               : The order is report-summary->result-summary->
+               error-detail->->error-summary->result-detail->
+               files->help/info->setup
+
+             result-focus is the default.
+
+     -show.success.in.error.summary
+           : controls the display of successful test results in
+             error summary section. It's set to false by default.
+
+     -show.filters
+           : Display the filters in each setion. It's set to
+             true by default.
+
+     -report.navigation.tools
+           : controls the navigation tools that will be available
+             in the report. You can specify a comma separated list
+             of the navigation tools
+
+             The navigation tools are:
+
+             all      - all the tools are displayed
+             menu     - menu of the report
+             toolbar  - toolbar of the report
+             top      - top link displayed in different report
+                        sections
+
+     -report.skin
+           : Controls the report skin that will be used. The skin
+             is applied by a cascading style sheet (css). The
+             currently supported skins are:
+             classic - original default skin
+             junit   - same format as the JUnit reports
+             none    - no skin is applied
+
+             junit is the default skin.
+
+
+    Examples:
+    =========
+
+    ----------------------------------------------------------
+    ant -f build-Test.xml test.report
+
+    generates the test report for myrun.gtlf.xml file.
+
+    ----------------------------------------------------------
+    ant -f build-Test.xml test.report -Dfeature=oam
+
+    generates the test report for myrun.gtlf.xml file. The
+    report now contains commands to rerun the test.
+
+    ----------------------------------------------------------
+    ant -f build-Test.xml test.report \
+     -Dgtlf.file=srcW2KServerNativeIO-oam-load.gtlf.xml
+
+     generates test report for the specified gtfl file.
+
+    ----------------------------------------------------------
+    ant -f build-Test.xml test.report \
+     -Dgtlf.file=srcW2KServerNativeIO-oam-load.gtlf.xml \
+     -Dreport.sections=report-summary,report-detail,error-detail \
+     -Dreport.navigation.tools=toolbar,top
+
+     generates test report for the specified gtfl file. The
+     report only displays report summary, report detail and
+     error detail. Only the toolbar and top navigation tool
+     are present in the report.
+    ----------------------------------------------------------
+    'ant -f build-Test.xml test.report -Dfeature=oam \
+     -Dgtlf.file=srcW2KServerNativeIO-oam-load.gtlf.xml'
+
+     generates test report for the specified gtfl file. The
+     report now contains commands to rerun the test
+
+    ----------------------------------------------------------
+    'ant -f build-Test.xml test.report -Dfind.files=false'
+
+    generates the test report for myrun.gtlf.xml file. The files
+    generated by the test are not listed in the files section.
+
+    This option is usually specified, when we have not run the
+    test locally and want to generate report from a gtlf file got
+    from BT or any othe machine.
+
+    ----------------------------------------------------------
+    'ant -f build-Test.xml test.report -Dzip.file=true
+
+     generates the test report and creates a zip of all the
+     test files
+
+    ----------------------------------------------------------
+    'ant -f build-Test.xml test.report -Dbackup.files=true
+
+     generates the test report and then backup the test files in
+     'results' directory.
+
+    ===============================================================
+    </echo>
+  </target>
+
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+  <target name="test.report">
+    <description>
+      generates test report. For help, use tgt. [test.report.help]
+    </description>
+
+     <!-- get/set the target properties -->
+    <property name="gtlf.file" value="myrun.gtlf.xml"/>
+    <basename property="base.file.temp" file="${gtlf.file}" suffix=".xml"/>
+    <basename property="base.file" file="${base.file.temp}" suffix=".gtlf"/>
+    <property name="output.file" value="${base.file}.html"/>
+    <property name="hyperlink.files" value="true"/>
+    <property name="report.sections" value="all"/>
+    <property name="report.section.order" value="result-focus"/>
+    <property name="report.navigation.tools" value="all"/>
+    <property name="report.skin" value="junit"/>
+
+    <touch file="${output.file}"/>
+
+    <tstamp>
+      <format property="time" pattern="dd_MMMM_yyyy_hh_mm_aa"/>
+    </tstamp>
+    <property name="zip.file.name" value="${base.file}_${time}.zip"/>
+    <property name="hyperlink.zip.file.name" value="${zip.file.name}"/>
+
+    <delete file="${output.file}"/>
+    <delete file="${output.file}.zip"/>
+
+    <condition property="show.feature.info" value="1">
+      <isset property="feature"/>
+    </condition>
+    <condition property="show.test.files" value="1">
+      <isset property="find.the.files"/>
+    </condition>
+
+    <!-- show the filter -->
+    <property name="show.filters" value="true"/>
+    <condition property="show.the.filters" value="1">
+      <istrue value="${show.filters}"/>
+    </condition>
+    <property name="show.the.filters" value="0"/>
+
+    <property name="show.success.in.error.summary" value="false"/>
+    <condition property="show.success.in.error.summary.section" value="1">
+      <istrue value="${show.success.in.error.summary}"/>
+    </condition>
+
+    <!-- load the report skin css -->
+    <loadfile property="css.file"
+              srcfile="${xsl.root.dir}/${report.skin}.css"
+              failonerror="false" />
+
+    <!-- create the test report -->
+    <!-- xsl transform on the gtlf -->
+    <xslt in="${gtlf.file}" 
+          out="${output.file}"
+          style="${xsl.root.dir}/TestReport.xsl">
+      <param name="filebasename" expression="${base.file}"/>
+      <param name="feature" expression="${feature}"/>
+      <param name="showFeatureInfo" expression="${show.feature.info}"/>
+      <param name="showTestfiles" expression="${show.test.files}"/>
+      <param name="zipFiles" expression="${zip.files}"/>
+      <param name="zipFileName" expression="${hyperlink.zip.file.name}"/>
+      <param name="gtlfFileName" expression="${gtlf.file}"/>
+      <param name="testFiles" expression="${test.files}"/>
+      <param name="showTheFilters" expression="${show.the.filters}"/>
+      <param name="sections" expression="${report.sections}"/>
+      <param name="navigationTools" expression="${report.navigation.tools}"/>
+      <param name="cssFile" expression="${css.file}"/>
+      <param name="showSuccessInErrorSummary"
+             expression="${show.success.in.error.summary.section}"/>
+      <param name="reportSectionOrder" expression="${report.section.order}"/>
+      <xmlcatalog>
+       <dtd
+         publicId="-//BEA Systems, Inc.//DTD GTLF 1.0//EN"
+         location="${tch.dtd.dir}"/>
+      </xmlcatalog>
+      <outputproperty name="method" value="html"/>
+      <outputproperty name="indent" value="yes"/>
+      <outputproperty name="standalone" value="yes"/>
+    </xslt>
+    <delete file="${xsl.root.dir}/generatedTestReport.xsl"/>
+    <echo message=""/>
+    <echo message="****************************************************"/>
+      <echo message="Generated report [${output.file}]"/>
+    <echo message="*****************************************************"/>
+  </target>
+
+</project>

Modified: beehive/trunk/controls/test/infra/tch/build.xml
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/tch/build.xml?rev=231444&r1=231443&r2=231444&view=diff
==============================================================================
--- beehive/trunk/controls/test/infra/tch/build.xml (original)
+++ beehive/trunk/controls/test/infra/tch/build.xml Thu Aug 11 06:09:28 2005
@@ -1,42 +1,42 @@
-<project name="tch-project" default="usage">
-  <taskdef name="tch" classname="org.apache.beehive.test.tools.tch.TchVMTask"/>
-  <property name="tch.verbose" value="false"/>
-  <property name="test-suite" value="test/regression.xml"/>
-  <property file="../buildenv.properties"/>
-  
-  <property name="tch.home" value="${basedir}"/>
-  <target name="usage" depends="version">
-    <loadfile property="helpfile" srcfile="help/helpfile"/>
-    <echo message="${helpfile}"/>
-  </target>
-
-  <target name="version">
-    <java classname="org.apache.beehive.test.tools.tch.core.version"/>
-  </target>    
-
-  <target name="run" depends="set-java-opts">
-    <tch 
-      testfile="${test-suite}"
-      tchHome="${tch.home}"
-      failOnError="true"
-      verbose="${tch.verbose}"
-    >
-      <arg value="-emacs"/>
-    </tch>
-  </target>
-
-  <target name="set-java-opts">
-     <condition property="javaopts" value="">
-       <not>
-         <isset property="javaopts"/>
-       </not>
-     </condition>    
-     <condition property="tch.javaopts" value="">
-       <not>
-         <isset property="tch.javaopts"/>
-       </not>
-     </condition>    
-  </target>
-
-</project>
-
+<project name="tch-project" default="usage">
+  <taskdef name="tch" classname="org.apache.beehive.test.tools.tch.TchVMTask"/>
+  <property name="tch.verbose" value="false"/>
+  <property name="test-suite" value="test/regression.xml"/>
+  <property file="../buildenv.properties"/>
+  
+  <property name="tch.home" value="${basedir}"/>
+  <target name="usage" depends="version">
+    <loadfile property="helpfile" srcfile="help/helpfile"/>
+    <echo message="${helpfile}"/>
+  </target>
+
+  <target name="version">
+    <java classname="org.apache.beehive.test.tools.tch.core.version"/>
+  </target>    
+
+  <target name="run" depends="set-java-opts">
+    <tch 
+      testfile="${test-suite}"
+      tchHome="${tch.home}"
+      failOnError="true"
+      verbose="${tch.verbose}"
+    >
+      <arg value="-emacs"/>
+    </tch>
+  </target>
+
+  <target name="set-java-opts">
+     <condition property="javaopts" value="">
+       <not>
+         <isset property="javaopts"/>
+       </not>
+     </condition>    
+     <condition property="tch.javaopts" value="">
+       <not>
+         <isset property="tch.javaopts"/>
+       </not>
+     </condition>    
+  </target>
+
+</project>
+

Modified: beehive/trunk/controls/test/infra/tch/runtime/build.xml
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/tch/runtime/build.xml?rev=231444&r1=231443&r2=231444&view=diff
==============================================================================
--- beehive/trunk/controls/test/infra/tch/runtime/build.xml (original)
+++ beehive/trunk/controls/test/infra/tch/runtime/build.xml Thu Aug 11 06:09:28 
2005
@@ -1,7 +1,27 @@
+<?xml version="1.0" ?>
+
+<!--
+   Copyright 2004 The Apache Software Foundation.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+   
+       http://www.apache.org/licenses/LICENSE-2.0
+   
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  
+   $Header:$
+ -->
+
 <project name="tch-project" default="usage">
 
   <property environment="os"/>
-  <!--import file="../../../../../beehive-imports.xml"/-->
+
   <property file="../../../common/path.properties"/>
   
   <!-- the default base name for the logfiles Blackhawk generates -->
@@ -11,32 +31,24 @@
   <property name="log.basedir.default" location="${controls.test.root}"/>
 
   <!-- the tch logs go into the dir ant is run from -->
-  <property name="tch.log.basedir" value="${log.basedir.default}"/>
+  <property name="tch.log.basedir" location="${log.basedir.default}"/>
 
-  <!-- may be overridden from the top, a single (lame) system property that -->
-  <!-- should be set -->
+  <!-- may be overridden from the top, a single (lame) system property that 
should be set -->
   <property name="test.sysproperty.name" value=""/>
   <property name="test.sysproperty.value" value=""/>
 
-  <!-- if enabled, at the end of the run, generated an html file -->
-  <!-- from the GTLF log -->
+  <!-- if enabled, at the end of the run, generated an html file from the GTLF 
log -->
   <property name="gtlf.transform" value="false"/>
 
   <!-- if true, generates a valid GTLF header, as far as that's possible -->
   <property name="gtlf.prepare" value="false"/>
 
-
   <!-- default for html log file generation, may be overridden from the top -->
-  <property 
-    name="gtlf.base.file" 
-    location="${tch.log.basedir}/${tch.base-logfile-name}"
-  />
+  <property name="gtlf.base.file" 
location="${tch.log.basedir}/${tch.base-logfile-name}"/>
 
   <!-- A few defaults for GTLF -->
   <property name="gtlf.headerfile" value="gtlf-header-values.txt"/>
 
-  
-
   <!-- public generate html target -->
   <target name="generate-html-log">
     <antcall target="-generate-html-log">
@@ -49,11 +61,12 @@
     <property name="gtlf.file" value="${gtlf.base.file}.xml"/>
     <property name="output.file" value="${gtlf.base.file}.html"/>
     
-    <echo message="gtlf.file: ${gtlf.file}"/>
-    <!-- fork Ant because I could not find a more elegant way to get --> 
-    <!-- reportutils.jar onto the classpath -->
-    <property name="beehive.home" value="${test.home}" />
-    <java classname="org.apache.tools.ant.Main" fork="true">
+    <echo>Generating Controls Test Report with GTLF</echo>
+    <echo>beehive.home: ${beehive.home}</echo>
+    <echo>gtlf.file: ${gtlf.file}</echo>
+
+    <!-- fork Ant because I could not find a more elegant way to 
getreportutils.jar onto the classpath -->
+    <java classname="org.apache.tools.ant.Main" fork="true" failOnError="true">
       <classpath>
         <pathelement path="${java.class.path}"/>
        <pathelement 
location="${controls.test.infra.dir}/gtlf/xsl/reportutils.jar"/>
@@ -63,59 +76,39 @@
  
       <!-- html customization -->
       <sysproperty key="show.success.in.error.summary" value="false"/>
-      <sysproperty 
-        key="report.sections" 
-        value="result-summary,result-detail,error-summary,error-detail"
-      />
+      <sysproperty key="report.sections" 
value="result-summary,result-detail,error-summary,error-detail"/>
+
       <!--sysproperty key="report.section.order" value="error-focus"/ -->
+
       <sysproperty key="report.navigation.tools" value="toolbar,top"/>
       <sysproperty key="show.filters" value="false"/>
-      <arg value="-f"/>
-      <arg value="${controls.test.infra.dir}/gtlf/xsl/build.xml"/>
-      <arg value="test.report"/>
-      <arg value="-Dbeehive.home=${beehive.home}"/>
-      <arg value="-Dtest.home=${test.home}"/>
-      <arg value="-emacs"/>
+      <arg line="-f ${controls.test.infra.dir}/gtlf/xsl/build.xml test.report 
-Dbeehive.home=${beehive.home} -emacs"/>
     </java>      
   </target>
 
   <target name="-init" unless="_init.complete">
 
     <!-- set up system prop that my be passed from top-->
-    <condition 
-      property="_test.sysproperty.line"
-      value="${test.sysproperty.name}=${test.sysproperty.value}"
-    >
+    <condition property="_test.sysproperty.line" 
value="${test.sysproperty.name}=${test.sysproperty.value}">
       <not><equals arg1="${test.sysproperty.name}" arg2=""/></not>
     </condition>
+
     <!-- else set it to empty string -->
     <property name="_test.sysproperty.line" value=""/>
 
     <!-- for the message at the end of run, only print dir of logs
          if it has been reset -->
     <condition property="_logs.dir" value="${tch.log.basedir}/">
-      <not><equals 
-        arg1="${tch.log.basedir}"
-        arg2="${log.basedir.default}"
-        casesensitive="false"
-      /></not>
+      <not><equals arg1="${tch.log.basedir}" arg2="${log.basedir.default}" 
casesensitive="false"/></not>
     </condition>
     <!-- else empty string -->
     <property name="_logs.dir" value=""/>
 
     <condition property="_gtlf.transform">
       <and>
-        <equals  
-          arg1="${gtlf.transform}"  
-          arg2="true"
-          casesensitive="false"
-        />      
+        <equals arg1="${gtlf.transform}" arg2="true" casesensitive="false"/>   
   
         <!-- don't generate html log if init-mode-only is on -->
-        <equals
-          arg1="${tch.init-mode-only}"
-          arg2="false"
-          casesensitive="false"
-        />
+        <equals arg1="${tch.init-mode-only}" arg2="false" 
casesensitive="false"/>
       </and>
     </condition>
 
@@ -126,37 +119,21 @@
     <condition property="_gtlf.prepare">
       <and>
         <or>
-          <equals  
-            arg1="${gtlf.upload}"  
-            arg2="true"
-            casesensitive="false"
-          /> 
-          <equals  
-            arg1="${gtlf.prepare}"  
-            arg2="true"
-            casesensitive="false"
+          <equals arg1="${gtlf.upload}" arg2="true" casesensitive="false"/> 
+          <equals arg1="${gtlf.prepare}" arg2="true" casesensitive="false"
           />
         </or> 
         <not>     
-          <equals  
-            arg1="${tch.log-gtlf}"  
-            arg2="false"
-            casesensitive="false"
-          />      
+          <equals arg1="${tch.log-gtlf}" arg2="false" casesensitive="false"/>  
    
         </not>
       </and>
     </condition>
 
     <condition property="_gtlf.upload">
-      <equals  
-        arg1="${gtlf.upload}"  
-        arg2="true"
-        casesensitive="false"
-      />      
+      <equals arg1="${gtlf.upload}" arg2="true" casesensitive="false"/>      
     </condition>
 
     <property name="_init.complete" value="true"/>
-
   </target>
 
   <target name="-write-gtlf-header" if="_gtlf.prepare">

Modified: beehive/trunk/controls/test/webapps/build.xml
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/build.xml?rev=231444&r1=231443&r2=231444&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/build.xml (original)
+++ beehive/trunk/controls/test/webapps/build.xml Thu Aug 11 06:09:28 2005
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+<!--
+   Copyright 2004 The Apache Software Foundation.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+   
+       http://www.apache.org/licenses/LICENSE-2.0
+   
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  
+   $Header:$
+ -->
+
 <!-- 
 ===========================================================================
 
@@ -8,9 +26,10 @@
   
 ============================================================================ 
 -->
-<project name="Beehive/Controls/TestControls-webapp" default="usage" 
basedir=".">
+<project name="Beehive/Controls/Test" default="usage" basedir=".">
 
     <import file="../../../beehive-imports.xml"/>
+
     <property file="../common/path.properties"/>
     
     <property name="server.root.url" value="http://localhost:8080"/>
@@ -38,7 +57,7 @@
    </target>
 
     <target name="-init">
-        <property name="webapp.build.dir" 
value="${build.dir}/${controls.webapp.dir.name}"/>
+        <property name="webapp.build.dir" 
location="${build.dir}/${controls.webapp.dir.name}"/>
         <property name="webapp.dir" 
location="${webapp.build.dir}/${controls.test.webapp.name}"/>
        
         <available file="${webapp.dir}" property="webapp.dir.present"/>


<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: r231444 [2/2] - in /beehive/trunk/controls: ./ test/ test/common/ test/dist-test/ test/dist-test/common/ test/infra/gtlf/xsl/ test/infra/tch/ test/infra/tch/runtime/ test/webapps/, ekoneil <=