Author: ekoneil
Date: Sat Aug 7 12:41:18 2004
New Revision: 36073
Added:
incubator/beehive/trunk/netui/docs/external/
incubator/beehive/trunk/netui/docs/external/xalan-241.jar
- copied unchanged from rev 36068,
incubator/beehive/trunk/netui/test/external/xalan-241.jar
Removed:
incubator/beehive/trunk/netui/test/external/xalan-241.jar
Modified:
incubator/beehive/trunk/netui/ant/javadoc.xml
incubator/beehive/trunk/netui/build.xml
incubator/beehive/trunk/netui/test/ant/junit.xml
incubator/beehive/trunk/netui/test/ant/junitReport.xml
incubator/beehive/trunk/netui/test/ant/test.properties
Log:
JUnit DRT fixup related to Xalan 2.4.1.
This JAR was used by the NetUI DRT infrastructure when the XSLT classes moved
from the JDK 1.4 package to the JDK 1.5 package. Ant supports these in the
ant-xalan1.jar file. Thus, the extra <java> call in the junitReport.xml file
is no longer needed.
The xalan-241.jar file has moved into netui/docs/external because the NetUI
Javadoc / tag doc infrastructure needs it to process .xslt files.
This change also wires-up the "ant docs" target from the
$BEEHIVE_HOME/netui/build.xml. To generate Javadoc and tag doc for NetUI, run:
ant docs
in $BEEHIVE_HOME/netui. The docs are produced in
$BEEHIVE_HOME/netui/build/docs.
- move xalan-241.jar from netui/test/external to netui/docs/external
- remove unused targets from junit.xml
- re-wire the junitReport.xml file for the Xalan move. This is just a partial
fix -- the file can be collapsed into a single build file with changes to the
test recordder.
- wire-up the "docs" target in netui/build.xml
- remove the xalan-241.jar property from netui/test/ant/test.properties
BB: self
DRT: NetUI pass
Controls pass
Modified: incubator/beehive/trunk/netui/ant/javadoc.xml
==============================================================================
--- incubator/beehive/trunk/netui/ant/javadoc.xml (original)
+++ incubator/beehive/trunk/netui/ant/javadoc.xml Sat Aug 7 12:41:18 2004
@@ -9,6 +9,7 @@
<property name="docs.temp" value="${docs.dir}/temp"/>
<property name="docs.build.dir" value="${build.dir}/docs"/>
+ <property name="xalan-241.jar"
location="${docs.dir}/external/xalan-241.jar"/>
<path id="javadoc.classpath">
<fileset dir="${struts.dir}" includes="*.jar"/>
@@ -174,7 +175,7 @@
<xslt in="${docs.dir}/temp/xml/tagref/overview.xml"
out="${docs.build.dir}/taglib/taglib-frame-ignore.html"
style="${docs.dir}/tools/xslt/taglib-frame.xslt"
- classpath="${os.BEEHIVE_HOME}/netui/test/external/xalan-241.jar">
+ classpath="${xalan-241.jar}">
<param name="taglibLocation" expression="${docs.build.dir}/taglib"/>
</xslt>
<!-- ... the taglib-summary pages (displayed in right-hand frame when 'tag
library' links in the tag topics are clicked) -->
@@ -182,7 +183,7 @@
<xslt in="${docs.dir}/temp/xml/tagref/overview.xml"
out="${docs.build.dir}/taglib/taglib-summary-ignore.html"
style="${docs.dir}/tools/xslt/taglib-summary.xslt"
- classpath="${os.BEEHIVE_HOME}/netui/test/external/xalan-241.jar">
+ classpath="${xalan-241.jar}">
<param name="taglibLocation" expression="${docs.build.dir}/taglib"/>
</xslt>
<!-- ... the individual tag topics -->
Modified: incubator/beehive/trunk/netui/build.xml
==============================================================================
--- incubator/beehive/trunk/netui/build.xml (original)
+++ incubator/beehive/trunk/netui/build.xml Sat Aug 7 12:41:18 2004
@@ -8,9 +8,9 @@
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <target name="docs" description="No-op"/>
-
- <target name="minprod" depends="deploy"/>
+ <target name="docs" description="Generate NetUI Javadoc and JSP tag doc.">
+ <ant dir="ant" target="build"
antfile="${os.BEEHIVE_HOME}/netui/ant/javadoc.xml"/>
+ </target>
<target name="build" description="Compiles and builds the server bits of
NetUI.">
<ant dir="ant" target="build" inheritAll="false"/>
@@ -46,9 +46,5 @@
<echo message="--------------------------------------------------"/>
<echo message="| NetUI DRT ending |"/>
<echo message="--------------------------------------------------"/>
- </target>
-
- <target name="server.bvt" description="Run the NetUI Server BVTs">
- <echo>NYI</echo>
</target>
</project>
Modified: incubator/beehive/trunk/netui/test/ant/junit.xml
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/junit.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/junit.xml Sat Aug 7 12:41:18 2004
@@ -284,32 +284,4 @@
</java>
</target>
- <target name="xbean.junit.test">
- <echo>junit.jar: ${junit.jar}</echo>
- <taskdef name="junit"
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
- <classpath>
- <pathelement path="${junit.jar}"/>
- <pathelement path="${ant-junit.jar}"/>
- <pathelement path="${apache-xbean.jar}"/>
- </classpath>
- </taskdef>
-
- <junit dir="." showoutput="true" fork="true">
- <classpath>
- <pathelement path="c:\java\sandbox\"/>
- <pathelement path="${java.class.path}"/>
- <pathelement path="${apache-xbean.jar}"/>
- <pathelement path="${jsr173.jar}"/>
- <pathelement path="${junit.jar}"/>
- <pathelement path="${ant-junit.jar}"/>
- <pathelement path="${test-recorder.jar}"/>
- <pathelement path="${test.recorder.classpath}"/>
- <pathelement
path="c:\dev\src\wlw\beehive\netui\build\testRecorder\scratch\netui-server-drt-config"/>
- </classpath>
- <formatter type="plain" usefile="false"/>
-<!-- <test
name="org.apache.beehive.netui.tools.testrecorder.client.MasterTestRecorderJUnitTest"/>-->
- <test name="foo.AnXMLBeanTest"/>
- </junit>
- </target>
-
</project>
Modified: incubator/beehive/trunk/netui/test/ant/junitReport.xml
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/junitReport.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/junitReport.xml Sat Aug 7
12:41:18 2004
@@ -3,12 +3,13 @@
<project name="Beehive/NetUI/JUnitReportGenerator" default="usage" basedir=".">
<property environment="os"/>
- <property file="../../../beehive.properties"/>
- <property file="../../ant/bootstrap.properties"/>
- <property file="../../ant/common.properties"/>
- <property file="test.properties"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/bootstrap.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/common.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/test/ant/test.properties"/>
- <property name="ant-launch.jar"
location="${ant.home}/lib/ant-launcher.jar"/>
+ <property name="ant-launcher.jar"
location="${ant.home}/lib/ant-launcher.jar"/>
+ <property name="junitreport.classpath"
location="${ant.jar};${ant-junit.jar};${ant-launcher.jar};${junit.jar}"/>
<!--
test.report.dir == the directory in which the test results are stored
@@ -25,38 +26,7 @@
</junitreport>
</target>
- <!--
- Params:
- test.report.dir ==
- type ==
- -->
- <target name="run">
- <property name="junitreport.classpath"
location="${ant.jar};${ant-junit.jar};${ant-launch.jar};${junit.jar};${deployed.xalan.jar}"/>
-
- <echo>junitreport.classpath: ${junitreport.classpath}</echo>
-
- <!-- launch Ant directly since we've got to add onto the classpath to
pickup Xalan -->
- <java classname="org.apache.tools.ant.Main" fork="true"
classpath="${junitreport.classpath}">
- <arg line="-f junitReport.xml create.report.${type}
-Dtest.report.dir=${test.report.dir}"/>
- </java>
- </target>
-
- <target name="usage">
- <echo>
-Build file used to launch the "junitreport" task under JDK 1.5. Because
"junitreport" does
-not take advantage of JAXP to find an XSLT engine, it fails since Xalan has
been
-namespaced into the com.sun package in rt.jar. So, without putting Xalan on
the
-classpath used to launch Ant, this file is used to launch Ant with Xalan in the
-classpath.
-
-This is not a file to take a dependency on as we'd like for it to go away at
some point. :)
-
[EMAIL PROTECTED]
-3/12/2004
- </echo>
- </target>
-
- <!-- @todo: patrick, this needs to go away -->
+ <!-- @todo: the test recorder needs to start using the above, generic
JUnit report target -->
<target name="create.report.testrecorder">
<property name="html.report.dir" location="${test.report.dir}/html"/>
@@ -67,5 +37,18 @@
<report format="noframes" todir="${html.report.dir}"
styledir="${webui.home}/test/ant/junitStyles"/>
</junitreport>
</target>
-
+
+ <!--
+ Params:
+ test.report.dir ==
+ type ==
+ -->
+ <target name="run">
+ <echo>junitreport.classpath: ${junitreport.classpath}</echo>
+ <echo>target: create.report.${type}</echo>
+
+ <antcall target="create.report.${type}">
+ <param name="test.report.dir" location="${test.report.dir}"/>
+ </antcall>
+ </target>
</project>
Modified: incubator/beehive/trunk/netui/test/ant/test.properties
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/test.properties (original)
+++ incubator/beehive/trunk/netui/test/ant/test.properties Sat Aug 7
12:41:18 2004
@@ -14,7 +14,6 @@
# External JAR dependencies
#
deployed.httpClient.jar=${test.external.dir}/commons-httpclient-2.0.jar
-deployed.xalan.jar=${test.external.dir}/xalan-241.jar
ant-junit.jar=${ant.home}/lib/ant-junit.jar
#
---------------------------------------------------------------------------------
