Author: jsong
Date: Tue Aug 10 17:04:42 2004
New Revision: 36199
Added:
incubator/beehive/trunk/controls/test/infra/tch/xbean-1.0.2.jar (contents,
props changed)
incubator/beehive/trunk/controls/test/tools/tch/3rdparty/xbean-1.0.2.jar
(contents, props changed)
Removed:
incubator/beehive/trunk/external/xerces/
Modified:
incubator/beehive/trunk/controls/test/build.xml
incubator/beehive/trunk/controls/test/common/path.properties
incubator/beehive/trunk/controls/test/infra/tch/setenv.sh
incubator/beehive/trunk/controls/test/infra/tch/tchx.jar
incubator/beehive/trunk/controls/test/tools/tch/deploy/setenv.sh
incubator/beehive/trunk/controls/test/webapps/controlsWeb/resources/milton/jsp/miltonResultsTemplate.jsp
Log:
Check-in Joe Pemberton's update for tch.
Modified: incubator/beehive/trunk/controls/test/build.xml
==============================================================================
--- incubator/beehive/trunk/controls/test/build.xml (original)
+++ incubator/beehive/trunk/controls/test/build.xml Tue Aug 10 17:04:42 2004
@@ -34,6 +34,8 @@
<path id="tch.run.classpath">
<pathelement location="${tch.jar}"/>
+ <pathelement location="${tch.schema.jar}"/>
+ <pathelement location="${tch.xbean.jar}"/>
<pathelement location="${milton.jar}"/>
<pathelement location="${ant.jar}"/>
<pathelement path="${os.ANT_HOME}/lib/ant-launcher.jar"/>
@@ -50,7 +52,6 @@
<pathelement location="${build.tests}" />
<pathelement location="${jakarta.jar}"/>
- <pathelement location="${xerces.jar}"/>
</path>
Modified: incubator/beehive/trunk/controls/test/common/path.properties
==============================================================================
--- incubator/beehive/trunk/controls/test/common/path.properties
(original)
+++ incubator/beehive/trunk/controls/test/common/path.properties Tue Aug
10 17:04:42 2004
@@ -13,6 +13,8 @@
#locations of built tools
tch.home=${controls.test.infra.dir}/tch
tch.jar=${tch.home}/tchx.jar
+tch.schema.jar=${tch.home}/schema.jar
+tch.xbean.jar=${tch.home}/xbean-1.0.2.jar
milton.jar=${controls.test.infra.dir}/milton/milton.jar
@@ -20,3 +22,4 @@
jakarta.jar=${external.dir}/jakarta/jakarta-regexp-1.2.jar
jaxp.jar=${external.dir}/jaxp/jaxp.jar
xerces.jar=${external.dir}/xerces/xerces-1.4.4.jar
+xbean.jar=${external.dir}/xmlbeans/apache-xbeans.jar
\ No newline at end of file
Modified: incubator/beehive/trunk/controls/test/infra/tch/setenv.sh
==============================================================================
--- incubator/beehive/trunk/controls/test/infra/tch/setenv.sh (original)
+++ incubator/beehive/trunk/controls/test/infra/tch/setenv.sh Tue Aug 10
17:04:42 2004
@@ -33,10 +33,13 @@
echo Adding ${ANT_JAR} to CLASSPATH
CLASSPATH="${ANT_JAR}${PATHSEP}${CLASSPATH}"
-XERCES_JAR=${EXTERNAL_DIR}/xerces/xerces-1.4.4.jar
-echo Adding ${XERCES_JAR} to CLASSPATH
-CLASSPATH="${XERCES_JAR}${PATHSEP}${CLASSPATH}"
+XBEAN_JAR=${TCH_HOME}/xbean-1.0.2.jar
+echo Adding ${XBEAN_JAR} to CLASSPATH
+CLASSPATH="${XBEAN_JAR}${PATHSEP}${CLASSPATH}"
+SCHEMA_JAR=${TCH_HOME}/schema.jar
+echo Adding ${SCHEMA_JAR} to CLASSPATH
+CLASSPATH="${SCHEMA_JAR}${PATHSEP}${CLASSPATH}"
export CLASSPATH
export TCH_HOME
Modified: incubator/beehive/trunk/controls/test/infra/tch/tchx.jar
==============================================================================
Binary files. No diff available.
Added: incubator/beehive/trunk/controls/test/infra/tch/xbean-1.0.2.jar
==============================================================================
Binary file. No diff available.
Added: incubator/beehive/trunk/controls/test/tools/tch/3rdparty/xbean-1.0.2.jar
==============================================================================
Binary file. No diff available.
Modified: incubator/beehive/trunk/controls/test/tools/tch/deploy/setenv.sh
==============================================================================
--- incubator/beehive/trunk/controls/test/tools/tch/deploy/setenv.sh
(original)
+++ incubator/beehive/trunk/controls/test/tools/tch/deploy/setenv.sh Tue Aug
10 17:04:42 2004
@@ -33,10 +33,13 @@
echo Adding ${ANT_JAR} to CLASSPATH
CLASSPATH="${ANT_JAR}${PATHSEP}${CLASSPATH}"
-XERCES_JAR=${EXTERNAL_DIR}/xerces/xerces-1.4.4.jar
-echo Adding ${XERCES_JAR} to CLASSPATH
-CLASSPATH="${XERCES_JAR}${PATHSEP}${CLASSPATH}"
+XBEAN_JAR=${TCH_HOME}/../3rdparty/xbean-1.0.2.jar
+echo Adding ${XBEAN_JAR} to CLASSPATH
+CLASSPATH="${XBEAN_JAR}${PATHSEP}${CLASSPATH}"
+SCHEMA_JAR=${TCH_HOME}/schema.jar
+echo Adding ${SCHEMA_JAR} to CLASSPATH
+CLASSPATH="${SCHEMA_JAR}${PATHSEP}${CLASSPATH}"
export CLASSPATH
export TCH_HOME
Modified:
incubator/beehive/trunk/controls/test/webapps/controlsWeb/resources/milton/jsp/miltonResultsTemplate.jsp
==============================================================================
---
incubator/beehive/trunk/controls/test/webapps/controlsWeb/resources/milton/jsp/miltonResultsTemplate.jsp
(original)
+++
incubator/beehive/trunk/controls/test/webapps/controlsWeb/resources/milton/jsp/miltonResultsTemplate.jsp
Tue Aug 10 17:04:42 2004
@@ -5,7 +5,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ page import="import org.apache.beehive.test.tools.milton.common.Report;"%>
+<%@ page import="org.apache.beehive.test.tools.milton.common.Report;"%>
<%@ page import="org.apache.beehive.netui.pageflow.PageFlowUtils"%>
<% Report report = (Report)PageFlowUtils.getPageInput(Report.KEY, request); %>
